Reflect merge of page.

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cc0894f6dedc700ee279975cf59d5ceb7e232afc..8aedcbb9e6beafb9dfff37d14161acb47e34fbb9 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,20 +1,5 @@
-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  ]]).
 
-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
-
-Hupple hupple hupple hupple snork.
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
-
-Korean characters test : 한글테스트입니다.
-
-some hindī? हिन्दी
 
 # Header
 
@@ -39,10 +24,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
-  3. baz
-   4. qux
-    5. quux
-     6. wibble
 
 Bulleted list
 
@@ -51,33 +32,30 @@ Bulleted list
 * item
 * one
   * two
-     * three
-       * four
-        * five
 
 ----
 
-[[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:
 
 * [[Features]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
 * [[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]]
-* WikiLink
 
 -----
 
-This sandbox is also a [[ikiwiki/blog]]!
+[[!progress percent=27]]
+
+[[!progress percent=78]]
+
+-----
+
+This **SandBox** is also a [[blog]]!
 
-[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]