Merge branch 'master' into git-anon

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index ab1d91d891aac7f8bb69bd235cfa1befe15e7724..9e709172a900f0e23f1defe91e298814489fdbf1 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,42 +1,17 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
 ----
-Do re me fa so la te... git?
 
-i see. i see. lalala hmmmmmmmm.
+Here's a paragraph. สวัสดี
 
-[[sandbox]] does that work? yep. yay!
+The following code block is pre-formatted:
 
-# テスト。
-
-Test. Korean. 나는 한국인, 백두산,동해
-
-Test. Chinese. 我是中国人，泰山、黄河。
-
-testing openid ... ignore.
-
-Test. Проверка. Тэстенг. テスト ığüşöçİ ทดสอบ éphémère
-
-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
-
-Testing it in a comment...
-
-Here's a paragraph.
+    Testing what
+    pre-formatted code blocks
+    look like.
 
 Here's another one with *emphasised* text.
 
-do ë characters work? Sure.
-
-OpenID test. It works!!
-
-Hupple hupple hupple hupple snork.
-
-Exactly my point!
-
-Test..
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
-
 # Header
 
 ## Subheader
@@ -47,7 +22,7 @@ There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
@@ -63,6 +38,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
+     6. wibble
 
 Bulleted list
 
@@ -75,42 +51,35 @@ Bulleted list
        * 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"]]
 
 ----
 
+The haiku will change after every save, mind you.
+
 ## Different sorts of links:
 
-* [[WikiLink]]
-* [[different_name_for_a_WikiLink|WikiLink]]
+* [[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
 
------
-
-<div class="whatever">
-
-Try putting divs around a list doesn't work:
+Test
 
-* first item
-* second item
-
-</div>
-
-span also doesn't work:
-
-<span class="whatever">
-* first item
-* second item
-</span>
-
-----
+-----
 
-This sandbox is also a [[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"]]