Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index ba551f17d5780ea2c4776aa502d16e2397a0e694..685f352b03991098a6b9fa9ef784dda56a4ad321 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,36 +1,19 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
-
-----
-Test. Chinese. 我是中国人，泰山、黄河。
-
-testing openid ... ignore.
-
-Test. Проверка. テスト ığüşöçİ ทดสอบ éphémère
+This is the SandBox, a page anyone can edit to try out this fab ikiwiki.
 
 Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
 
-Testing it in a comment...
-
-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: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 
+Korean characters test : 한글테스트입니다.
+
 # Header
 
 ## Subheader
@@ -69,6 +52,9 @@ Bulleted list
        * four
         * five
 
+----
+Its a WikiWikiWorld!! 
+
 ----
 
 [[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
@@ -78,16 +64,17 @@ Bulleted list
 
 ## 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.
+* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
+* <a href="http://www.google.com/">plain old html link</a>
+* [[foo]]
 
 -----
 
-This sandbox is also a [[blog]]!
+This sandbox is also a [[ikiwiki/blog]]!
 
-[[inline pages="sandbox/*" rootpage="sandbox" show="4" archive="yes"]]
+[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]