Merge branch 'master' into po

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8e38ea1e9fbf0085f4fb252089e92be85534cb64..a39264e18018b380d5bee9f70e2a3f1b04deaecc 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,11 +1,8 @@
-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  ]]).
 
-hello
-
-testing 1..2..3!!
-
-[[한글페이지]]
 ----
+test
+[[中文显示]]
 
 Here's a paragraph.
 
@@ -56,10 +53,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"]]
@@ -79,7 +72,6 @@ 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
 
 -----
 
@@ -87,9 +79,6 @@ 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
@@ -98,4 +87,4 @@ But, of course, rsync is better.
 
 ----
 
-Let's see what happens...
+Let's see what happens... ~~