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 63537bcc2be59e070e17b44db767931bcea07979..582d46e846252e1a419e3e48982eca1243f6c90d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,13 +1,17 @@
 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.
 
+The following code block is pre-formatted:
+
+    Testing what
+    pre-formatted code blocks
+    look like.
+
 Here's another one with *emphasised* text.
 
 # Header
@@ -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"]]