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 a0e42ebd67554d30a091f6a8e571613a978f325f..986b59eac9be54415d8f9684b932871ec2a321c2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,14 +1,16 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
-blather!!
+testing 1..2..3!!
 
-Testing an edit in the sandbox.
+----
 
-Is a "SandBox" a SandBox ? or a [[SandBox]] or a Sandbox or a [[sandbox]]
+Here's a paragraph. สวัสดี
 
-----
+The following code block is pre-formatted:
 
-Here's a paragraph.
+    Testing what
+    pre-formatted code blocks
+    look like.
 
 Here's another one with *emphasised* text.
 
@@ -75,11 +77,11 @@ The haiku will change after every save, mind you.
 * <a href="http://www.google.com/">plain old html link</a>
 * [[foo]]
 * WikiLink
-* Is a "SandBox" a SandBox ? or a [[SandBox]] or a Sandbox or a [[sandbox]]
-* Sandbox (no link?)
+
+Test
 
 -----
 
-This sandbox is also a [[ikiwiki/blog]]!
+This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]