Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a4e01b7c2b610d08458b41fa5937da21a1438e5e..986b59eac9be54415d8f9684b932871ec2a321c2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,8 +1,16 @@
 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.
 

+testing 1..2..3!!
+

 ----
 
 ----
 

-Here's a paragraph.
+Here's a paragraph. สวัสดี
+
+The following code block is pre-formatted:
+
+    Testing what
+    pre-formatted code blocks
+    look like.

 
 Here's another one with *emphasised* text.
 
 
 Here's another one with *emphasised* text.
 


@@ -16,28 +24,64 @@ Here's another one with *emphasised* text.
 >
 > > This is nested blockquote.
 >
 >
 > > This is nested blockquote.
 >

+>> Without a space works too.
+>>> to three levels
+>

 > Back to the first level.
 
 Numbered list 
 
 1. First item.
 > Back to the first level.
 
 Numbered list 
 
 1. First item.

+ 1. Sub item.

 1. Another.
 1. And another..
 1. Another.
 1. And another..

+ 1. foo
+ 2. bar
+  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!
-* test
-* hi mom
+* one
+  * two
+     * three
+       * four
+        * five
+
+* a new list
+ * with sub heads
+ * like this

 
 

-[[WikiLink]]
+----
+
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]

 
 ----
 
 
 ----
 

-This sandbox is also a [[blog]]! Any [[SubPage]] of this page is automatically
-added to the blog below.
+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
+
+Test
+
+-----
+
+This SandBox is also a [[blog]]!

 
 

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