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 a0c20fff4175b50f5fcd4b83a73568b620b471dc..001a838e950928a129067b317ee79db12b847430 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,18 +1,18 @@
 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 right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
+testing 1..2..3!!

 
 

-Here's a paragraph.
-
-Here's another one with *emphasised* text.
+----

 
 

-do ë characters work? Sure.
+Here's a paragraph. สวัสดี

 
 

-Hupple hupple hupple hupple snork.
+The following code block is pre-formatted:

 
 

-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+    Testing what
+    pre-formatted code blocks
+    look like.

 
 

-Korean characters test : 한글테스트입니다.
+Here's another one with *emphasised* text.

 
 # Header
 
 
 # Header
 


@@ -24,7 +24,7 @@ Korean characters test : 한글테스트입니다.
 >
 > > 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.
 >>> to three levels
 >
 > Back to the first level.


@@ -53,10 +53,14 @@ Bulleted list
        * four
         * five
 
        * 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"]]

 
 ----
 
 
 ----
 


@@ -72,9 +76,10 @@ The haiku will change after every save, mind you.
 * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
 * <a href="http://www.google.com/">plain old html link</a>
 * [[foo]]
 * [![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"]]