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 b0bb592c2c855d6eb4bf4c08c8eefd192d9fefdd..722e408518dcc07cff43256c08ab7582c5535427 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,20 +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: (שר×\94) should be spelled shin (ש) resh (ר) heh (×\94) from right to left.
+testing 1..2..3!!

 
 

-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
+----

 
 

-Hupple hupple hupple hupple snork.
+Here's a paragraph. สวัสดี

 
 

-There are Polish diacritical characters: Ä\85, Ä\87, Ä\99, Å\82, Å\84, ó, Å\9b, ż, ź.
+The following code block is pre-formatted:

 
 

-Korean characters test : í\95\9cê¸\80í\85\8cì\8a¤í\8a¸ì\9e\85ë\8b\88ë\8b¤.
+    Testing what
+    pre-formatted code blocks
+    look like.

 
 

-some hindÄ«? हिनà¥\8dदà¥\80
+Here's another one with *emphasised* text.

 
 # Header
 
 
 # Header
 


@@ -55,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"]]

 
 ----
 
 
 ----
 


@@ -76,8 +78,12 @@ The haiku will change after every save, mind you.
 * [[foo]]
 * WikiLink
 
 * [[foo]]
 * WikiLink
 

+Test
+
+Ḷét̨'s̀ şė͜e...
+

 -----
 
 -----
 

-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"]]