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

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5fcd549f4c438ec56e380c596ea62efc348eb6a2..17eb885f079c8a943cf433ab4a130cb73ff52d42 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,31 +1,20 @@
 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.
 
-Testing it in a comment...
-
 Here's a paragraph.
 
 Here's another one with *emphasised* text.
 
 do ë characters work? Sure.
 
-OpenID test. It works!!
-
 Hupple hupple hupple hupple snork.
 
-Exactly my point!
+There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 
-Test..
+test
 
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+Korean characters test : 한글테스트입니다.
 
 # Header
 
@@ -74,29 +63,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)
+* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
+* <a href="http://www.google.com/">plain old html link</a>
+* [[foo]]
 
 -----
 
-<div class ="whatever">
-
-Try putting divs around a list:
-
-* first item
-* second item
-
-</div>
-
-----
-
-
-aaaaaaaaaaaaaaaa
-
-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"]]