X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/546a6286f1943adc098910929645cda65f5d86fc..fc445f6b70421ffc00cc414b92b038f73804cbc1:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5e9c05225..6ea8cc607 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,16 +4,21 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 2009/7/13 Monday Blue...\\
 While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site.
 
-<<<<<<< HEAD:doc/sandbox.mdwn
 * I thought that creole markup is used by ikiwiki...
 * Thought about using //SVN/CVS// server, however with different idea
 * Kinda curious why **Tcl** does not show her face in this Wiki arena
-=======
-* Thought about using //SVN/CVS// server, however with different idea
-* Kinda curious why **Tcl** does not show her face in this Wiki arena
 * It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup.
->>>>>>> 55c1a37cce91d4fd01bf80fcaeeaf56535218a5c:doc/sandbox.mdwn
 
+---
+
+Guten Morgen aus Deutschland. Wir mögen Umläuter (ich weiß, der Plural ist falsch, aber dafür hat er einen). Die sind heutzutage kein Ärgernis mehr.
+
+&amp;#x263a; becomes &#x263a; 
+
+<script>alert("If this pops, ikiwiki is not cross site scripting safe."); /* Fortunately, this does not work. */</script>
+
+--- 
+I try to have a discussion page !!!
 ----
 
 Testing OpenID some more..
@@ -106,7 +111,56 @@ But, of course, rsync is better.
 
 Let's see what happens... ~~
 
-測試的啦
+#中文标题一
+##中文标题二
+###中文标题三
+...
+######中文标题六
+
+###正文:
+
+君不见，黄河之水天上来，奔流到海不复回。
+
+君不见，高堂明镜悲白发，朝如青丝暮成雪。
+
+人生得意须尽欢，莫使金樽空对月。
+
+天生我材必有用，千金散尽还复来。
+
+###列表：
+
+* 天空
+
+   1. 蓝色的
+   2. 好高啊
+
+* 海洋
+
+   1. 有鱼
+       
+       * 鲸鱼
+       * 鲨鱼
+           
+
+* 大地
+
+###链接：
+
+[谷歌](http://www.google.com)
+
+###引用：
+
+> 一级引用
+>
+> 一级引用
+>
+> > 二级引用
+>
+>> 没有空格也可以
+>>> 三级引用
+>
+> 回到一级引用
+
 
 ----