Merge branch 'master' into pedigree

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1adbc972caf8b86827f13d82d3de05f6ec87fe06..5c7368fc3757d804fdad6c64f53100c774a4018d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,18 +1,14 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
+blather!!
 
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
+Testing an edit in the sandbox.
 
-Hupple hupple hupple hupple snork.
+----
 
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+Here's a paragraph.
 
-Korean characters test : 한글테스트입니다.
+Here's another one with *emphasised* text.
 
 # Header
 
@@ -24,7 +20,7 @@ Korean characters test : 한글테스트입니다.
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
@@ -40,6 +36,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
+     6. wibble
 
 Bulleted list
 
@@ -52,6 +49,10 @@ Bulleted list
        * four
         * five
 
+* a new list
+ * with sub heads
+ * like this
+
 ----
 
 [[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
@@ -71,6 +72,7 @@ The haiku will change after every save, mind you.
 * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
 * <a href="http://www.google.com/">plain old html link</a>
 * [[foo]]
+* WikiLink
 
 -----