Merge branch 'master' into po

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index abe1a44ca9b31ac30945d3aa1b87f27f1127a594..a39264e18018b380d5bee9f70e2a3f1b04deaecc 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,9 +1,17 @@
-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  ]]).
 
 ----
+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
@@ -16,7 +24,8 @@ Here's another one with *emphasised* text.
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
+>>> to three levels
 >
 > Back to the first level.
 
@@ -31,36 +40,51 @@ Numbered list
   3. baz
    4. qux
     5. quux
+     6. wibble
 
 Bulleted list
 
-* *item*
 * item
+* *item*
 * item
-* just to try this stuff - looks kool!
+* one
+  * two
+     * three
+       * four
+        * five
 
 ----
 
-[[haiku hint="sandbox play"]]
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]
 
 ----
 
+The haiku will change after every save, mind you.
+
 ## Different sorts of links:
 
-* [[WikiLink]]
-* [[different_name_for_a_WikiLink|WikiLink]]
-* [[different name for a WikiLink (with spaces this time)|WikiLink]]
+* [[Features]]
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * [Email](mailto:noone@invalid)
+* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
+* <a href="http://www.google.com/">plain old html link</a>
+* [[foo]]
 
-----
-&#1506;&#1489;&#1512;&#1497;&#1514;
-&#1506;&#1489;&#1512;&#1497;&#1514; &#1506;&#1460;&#1501; &#1504;&#1456;&#1511;&#1493;&#1468;&#1491;&#1493;&#1465;&#1514;
-----
+-----
+
+This SandBox is also a [[blog]]!
+
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
 
-So did that work? --[[Joey]]
+--------
 
-This sandbox is also a [[blog]]!
+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.
+
+----
 
-[[inline pages="sandbox/*" rootpage="sandbox" show="5"]]
+Let's see what happens... ~~