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 825bf2b07212c131c99c6c0ec2d2488490291cba..986b59eac9be54415d8f9684b932871ec2a321c2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,23 +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.
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+----

 
 

-Korean characters test : 한글테스트입니다.
+Here's a paragraph. สวัสดี

 
 

-測試 c测试
+The following code block is pre-formatted:

 
 

-some hindī? हिन्दी 
-some kannada? ಕನ್ನಡ
+    Testing what
+    pre-formatted code blocks
+    look like.

 
 

-some Finnish: hääyöaie
+Here's another one with *emphasised* text.

 
 # Header
 
 
 # Header
 


@@ -64,8 +59,8 @@ Bulleted list
 
 ----
 
 
 ----
 

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

 
 ----
 
 
 ----
 


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

+Test
+

 -----
 
 -----
 

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