Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 155a5ba4c4bd63daf270043c7faef1c95ab96ce9..001a838e950928a129067b317ee79db12b847430 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,20 +1,18 @@
 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.
+testing 1..2..3!!
 
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
+----
 
-Hupple hupple hupple hupple snork.
+Here's a paragraph. สวัสดี
 
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+The following code block is pre-formatted:
 
-Korean characters test : 한글테스트입니다.
+    Testing what
+    pre-formatted code blocks
+    look like.
 
-some hindī? हिन्दी
+Here's another one with *emphasised* text.
 
 # Header
 
@@ -26,7 +24,7 @@ some hindī? हिन्दी
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
@@ -55,10 +53,14 @@ Bulleted list
        * four
         * five
 
+* a new list
+ * with sub heads
+ * like this
+
 ----
 
-[[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"]]
 
 ----
 
@@ -74,9 +76,10 @@ 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
 
 -----
 
-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"]]