Merge branch 'master' into po

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7030df8f59163d6c26e8a4c67ab4c5445ce89c46..a39264e18018b380d5bee9f70e2a3f1b04deaecc 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +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  ]]).
 
 ----
-
-Test. Проверка. テスト ığüşöçİ ทดสอบ
+test
+[[中文显示]]
 
 Here's a paragraph.
 
-Here's another one with *emphasised* text.
+The following code block is pre-formatted:
 
-do ë characters work? Sure.
+    Testing what
+    pre-formatted code blocks
+    look like.
 
-mooooooo...
+Here's another one with *emphasised* text.
 
 # Header
 
@@ -22,7 +24,7 @@ mooooooo...
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
@@ -38,6 +40,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
+     6. wibble
 
 Bulleted list
 
@@ -48,30 +51,40 @@ Bulleted list
   * 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)
-* WikiLink without any markup.
+* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
+* <a href="http://www.google.com/">plain old html link</a>
+* [[foo]]
 
 -----
 
-This sandbox is also a [[blog]]!
+This SandBox is also a [[blog]]!
 
-[[inline pages="sandbox/*" rootpage="sandbox" show="5"]]
+[[!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.
 
 ----
-[[newpage]]
----
-random
\ No newline at end of file
+
+Let's see what happens... ~~