web commit by JeroenSchot: moved to done.

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cc37a9978e18cd0e4e1029523a003486a00ddf2c..9343b6215407182c7845dae21ab5cd7619d3d5a3 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,10 +1,8 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
-See [[MarkDown]] for documentation of the markup syntax used on this page.
-
 ----
 
-Here's a paragraph. This is a conflict test edit.......
+Here's a paragraph.
 
 Here's another one with *emphasised* text.
 
@@ -33,7 +31,13 @@ Bulleted list
 * item
 * just to try this stuff - looks kool!
 * test
+* hi mom
+* [[foo_(1975-)]]
 
 [[WikiLink]]
 
-[[SandBox/SubPage]] -- a page under this one.
+----
+
+This sandbox is also a [[blog]]!
+
+[[inline pages="sandbox/*" rootpage="sandbox" show="5"]]