Merge branch 'master' into pedigree

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 69e9d513a3b1f61a01e86ed2c5770cd74cec403c..5c7368fc3757d804fdad6c64f53100c774a4018d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,9 @@
 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.
 

+blather!!
+
+Testing an edit in the sandbox.
+

 ----
 
 Here's a paragraph.
 ----
 
 Here's a paragraph.


@@ -16,7 +20,8 @@ Here's another one with *emphasised* text.
 >
 > > This is nested blockquote.
 >
 >
 > > This is nested blockquote.
 >

->> And without a space works too.
+>> Without a space works too.
+>>> to three levels

 >
 > Back to the first level.
 
 >
 > Back to the first level.
 


@@ -31,26 +36,46 @@ Numbered list
   3. baz
    4. qux
     5. quux
   3. baz
    4. qux
     5. quux

+     6. wibble

 
 Bulleted list
 
 
 Bulleted list
 

-* *item*

 * item
 * item

+* *item*

 * item
 * item

-* just to try this stuff - looks kool!
+* 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"]]
+
+----
+
+The haiku will change after every save, mind you.
+

 ## Different sorts of links:
 
 ## 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)
 * <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 [[blog]]!
+This sandbox is also a [[ikiwiki/blog]]!

 
 

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