Merge branch 'master' into commentreorg

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5cce0a0369dd1da42bc1754498aaf603d8b469fd..c323153c8402b4a0a5866b4d579f6ea3a6f16edb 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,9 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
-
-blather!
-
-----
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).

 
 

+[[Testing 1 2 3| test]]

 # Header
 
 # Header
 

-## Subheader
+## Subheader2

 
 > This is a blockquote.
 >
 
 > This is a blockquote.
 >


@@ -31,10 +24,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
 1. And another..
  1. foo
  2. bar

-  3. baz
-   4. qux
-    5. quux
-     6. wibble

 
 Bulleted list
 
 
 Bulleted list
 


@@ -42,38 +31,51 @@ Bulleted list
 * *item*
 * item
 * one
 * *item*
 * item
 * one

-  * two
-     * three
-       * four
-        * five
-
-* a new list
- * with sub heads
- * like this
+  * footballs; runner; unices

 
 ----
 
 
 ----
 

-[[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 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/)
 * [[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"]]
+
+----
+
+What about [relative urls](../setup/byhand)?
+
+[[!toggleable  id="foobar" text="""
+foo
+"""]]
+
+[[!toggleable  id="foobar" text="""
+bar
+"""]]
+
+[[!toggle  id="foobar" text="foo/bar"]]
+
+Hmm, can I dig it?
+
+Test
+test2

 
 

-[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]