Merge branch 'master' into pedigree

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 55f9899ccfad8f0b64f5148c2e85fce917886698..5c7368fc3757d804fdad6c64f53100c774a4018d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,34 +1,15 @@
 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.
 

-----
-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.
 
 
 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.
-
-Test..
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
-

 # Header
 
 ## Subheader
 # Header
 
 ## Subheader


@@ -39,7 +20,7 @@ There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 >
 > > This is nested blockquote.
 >
 >
 > > This is nested blockquote.
 >

->> And without a space works too.
+>> Without a space works too.

 >>> to three levels
 >
 > Back to the first level.
 >>> to three levels
 >
 > Back to the first level.


@@ -55,6 +36,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
   3. baz
    4. qux
     5. quux

+     6. wibble

 
 Bulleted list
 
 
 Bulleted list
 


@@ -67,24 +49,33 @@ 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"]]
 
 ----
 
 [[haiku hint="sandbox play"]]
 
 ----
 

+The haiku will change after every save, mind you.
+

 ## Different sorts of links:
 
 ## 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)
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * [Email](mailto:noone@invalid)

-* WikiLink without any markup.
+* [![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="5"]]
+[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]