review of needstranslation() pagespec

[git.ikiwiki.info.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 84175d68c48890b6d140687f22a2241a826d7c79..4c8621f1cad4ca58cba6de91ce90898478a0fb8b 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,54 +1,14 @@
-This is the SandBox, a page anyone can edit to try out this fab ikiwiki.
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-# Table of Contents
-testhead
-sandbox
-
-
-<h2>testhead</h2>
-----
-Do re me fa so la te... git?
-
-i see. i see. lalala hmmmmmmmm.
-
-## sandbox
-[[sandbox]] does that work? yep. yay!
-
-# テスト。
-
-Test. Korean. 나는 한국인, 백두산,동해
-
-Test. Chinese. 我是中国人，泰山、黄河。
-
-testing openid ... ignore.
-
-Test. Проверка. Тэстенг. テスト ığüşöçİ ทดสอบ éphémère
-
-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
-
-Testing it in a comment...
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
-
-OpenID test. It works!!
-
-Hupple hupple hupple hupple snork.
-
-Exactly my point!
-
-Test..
-
-A [[nonexistingpage]]
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+<<<<<<< HEAD
+Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
 
 # Header
 
-## Subheader
+## Subheader2
 
 > This is a blockquote.
 >
@@ -56,7 +16,7 @@ There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
@@ -69,9 +29,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
-  3. baz
-   4. qux
-    5. quux
 
 Bulleted list
 
@@ -79,29 +36,27 @@ Bulleted list
 * *item*
 * item
 * one
-  * two
-     * three
-       * four
-        * five
-          * six
+  * footballs; runner; unices
+  * Cool !
+
+
 ----
 
-[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
-[[haiku hint="sandbox play"]]
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]
 
 ----
 
 ## Different sorts of links:
 
 * [[Features]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
-* [Email](mailto:noone@invalid)
-* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
-* <a href="http://www.google.com/>do html links work?</a>
------
 
-This sandbox is also a [[ikiwiki/blog]]!
+----
+
+This **SandBox** is also a [[blog]]!
 
-[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]