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 6d718ebfd82cb833a76816ea3eb3a05594883d56..986b59eac9be54415d8f9684b932871ec2a321c2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,8 +1,10 @@
 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:
 
 
 The following code block is pre-formatted:
 


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