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 2813486c70d9ca62dc36780f3e97086e5e253c0a..001a838e950928a129067b317ee79db12b847430 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,24 +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.
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+----
 
-Korean characters test : 한글테스트입니다.
+Here's a paragraph. สวัสดี
 
-測試 
+The following code block is pre-formatted:
 
-test edit
+    Testing what
+    pre-formatted code blocks
+    look like.
 
-some hindī? हिन्दी
+Here's another one with *emphasised* text.
 
 # Header
 
@@ -65,8 +59,8 @@ Bulleted list
 
 ----
 
-[[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"]]
 
 ----
 
@@ -86,6 +80,6 @@ The haiku will change after every save, mind you.
 
 -----
 
-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"]]