Merge branch 'master' into po

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 0f5f26e079da76b31b276d5889fc5a3ad3e176a4..a39264e18018b380d5bee9f70e2a3f1b04deaecc 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,33 +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  ]]).
 
 ----
-Creating a new page: [[Sand_Notes]]
-
-Test. Chinese. 我是中国人，泰山、黄河。
-
-testing openid ... ignore.
-
-Test. Проверка. Тэстенг. テスト ığüşöçİ ทดสอบ éphémère
-
-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
-
-Testing it in a comment...
+test
+[[中文显示]]
 
 Here's a paragraph.
 
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
-
-OpenID test. It works!!
+The following code block is pre-formatted:
 
-Hupple hupple hupple hupple snork.
+    Testing what
+    pre-formatted code blocks
+    look like.
 
-Exactly my point!
-
-Test..
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+Here's another one with *emphasised* text.
 
 # Header
 
@@ -39,7 +24,7 @@ There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
@@ -55,6 +40,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
+     6. wibble
 
 Bulleted list
 
@@ -69,42 +55,36 @@ Bulleted list
 
 ----
 
-[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
-[[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]]
+* [[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]]
 
 -----
 
-<div class="whatever">
+This SandBox is also a [[blog]]!
 
-Try putting divs around a list doesn't work:
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
 
-* first item
-* second item
+--------
 
-</div>
+This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
 
-span also doesn't work:
-
-<span class="whatever">
-* first item
-* second item
-</span>
+But, of course, rsync is better.
 
 ----
 
-
-aaaaaaaaaaaaaaaa
-
-This sandbox is also a [[blog]]!
-
-[[inline pages="sandbox/*" rootpage="sandbox" show="4" archive="yes"]]
+Let's see what happens... ~~