Merge branch 'master' into cvs

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5cce0a0369dd1da42bc1754498aaf603d8b469fd..8b594043e48d462cea62519557ad5799264641f2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,8 +1,4 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
-
-blather!
-
-----
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 Here's a paragraph.
 
@@ -31,10 +27,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
-  3. baz
-   4. qux
-    5. quux
-     6. wibble
 
 Bulleted list
 
@@ -43,37 +35,23 @@ Bulleted list
 * item
 * one
   * two
-     * three
-       * four
-        * five
-
-* a new list
- * with sub heads
- * like this
 
 ----
 
-[[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]]
 * [[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]]!
+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"]]