Merge branch 'master' into cvs

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4ab764a700ae763cc57c05bfe9ad63e5ffde8425..8b594043e48d462cea62519557ad5799264641f2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,36 +1,9 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
-
-----
-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...
-
-Tester.
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 Here's a paragraph.
 
 Here's another one with *emphasised* text.
 
-do ë characters work? Sure.
-
-Nofle nofle
-
-OpenID test. It works!!
-
-Hupple hupple hupple hupple snork.
-
-Exactly my point!
-
-Test..
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
-
 # Header
 
 ## Subheader
@@ -41,7 +14,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.
@@ -54,9 +27,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
-  3. baz
-   4. qux
-    5. quux
 
 Bulleted list
 
@@ -65,28 +35,23 @@ Bulleted list
 * item
 * 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"]]
 
 ----
 
 ## 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.
 
 -----
 
-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"]]