Merge commit 'origin/master' into pub/master

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 63537bcc2be59e070e17b44db767931bcea07979..001a838e950928a129067b317ee79db12b847430 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,12 +1,16 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 

-blather!!
-
-Testing an edit in the sandbox.
+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.
 
 
 Here's another one with *emphasised* text.
 


@@ -76,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"]]