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 33deafaa7c6b19c59e29519fa5f8870280b61c6e..722e408518dcc07cff43256c08ab7582c5535427 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,10 +1,16 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
-blather
+testing 1..2..3!!
 
 ----
 
-Here's a paragraph.
+Here's a paragraph. สวัสดี
+
+The following code block is pre-formatted:
+
+    Testing what
+    pre-formatted code blocks
+    look like.
 
 Here's another one with *emphasised* text.
 
@@ -53,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"]]
 
 ----
 
@@ -72,8 +78,12 @@ The haiku will change after every save, mind you.
 * [[foo]]
 * WikiLink
 
+Test
+
+Ḷét̨'s̀ şė͜e...
+
 -----
 
-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"]]