Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index fc702499eee60e12a9b3399f3f2f29b5717eb6a3..4b6b9f27043c58ad315167c3387c17b24262e559 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,14 +1,18 @@
-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 (version [[!version  ]]).
 
-blather!!
-
-Testing an edit in the sandbox.
-
-Is a "SandBox" a SandBox ? or a [[SandBox]]
 ----
 
+test more test
+[[中文显示]]
+
 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
@@ -50,10 +54,6 @@ Bulleted list
        * four
         * five
 
-* a new list
- * with sub heads
- * like this
-
 ----
 
 [[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
@@ -73,10 +73,29 @@ The haiku will change after every save, mind you.
 * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
 * <a href="http://www.google.com/">plain old html link</a>
 * [[foo]]
-* WikiLink
 
 -----
 
-This sandbox is also a [[ikiwiki/blog]]!
+This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+--------
+
+This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
+
+But, of course, rsync is better.
+
+----
+
+Let's see what happens... ~~
+
+測試的啦
+
+----
+
+
+testing
+
+--
+[[!toc  levels=2]]