Merge branch 'master' into pedigree

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7ab692c8bc92bf2bf331a6035ec23e9e9c1139c0..5c7368fc3757d804fdad6c64f53100c774a4018d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,36 +1,15 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
-----
-Test. Chinese. 我是中国人，泰山、黄河。
-
-testing openid ... ignore.
-
-Test. Проверка. テスト ığüşöçİ ทดสอบ éphémère
-
-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
+blather!!
 
-Testing it in a comment...
+Testing an edit in the sandbox.
 
-Tester.
+----
 
 Here's a paragraph.
 
 Here's another one with *emphasised* text.
 
-do ë characters work? Sure.
-
-Nofle nofle
-
-OpenID test. It works!!
-
-Hupple hupple hupple hupple snork.
-
-Exactly my point!
-
-Test..
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
-
 # Header
 
 ## Subheader
@@ -41,7 +20,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.
@@ -57,6 +36,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
+     6. wibble
 
 Bulleted list
 
@@ -69,6 +49,10 @@ Bulleted list
        * four
         * five
 
+* a new list
+ * with sub heads
+ * like this
+
 ----
 
 [[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
@@ -76,21 +60,22 @@ Bulleted list
 
 ----
 
+The haiku will change after every save, mind you.
+
 ## Different sorts of links:
 
-* [[WikiLink]]
-* [[different_name_for_a_WikiLink|WikiLink]]
-* [[different name for a WikiLink (with spaces this time)|WikiLink]]
+* [[Features]]
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * [Email](mailto:noone@invalid)
-* WikiLink without any markup.
-
-Here is an edit to test page subscription.
-Testing it again....  please work :)
+* [![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 [[blog]]!
+This sandbox is also a [[ikiwiki/blog]]!
 
-[[inline pages="sandbox/*" rootpage="sandbox" show="4" archive="yes"]]
\ No newline at end of file
+[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]