Reference another todo item

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a39264e18018b380d5bee9f70e2a3f1b04deaecc..6730dd146847b9a8a2c464702d4b33360778e8ce 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,7 +1,24 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 ----
-test
+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
+
+----
+
+Testing OpenID some more..
+
+test more test
 [[中文显示]]
 
 Here's a paragraph.
@@ -88,3 +105,64 @@ But, of course, rsync is better.
 ----
 
 Let's see what happens... ~~
+
+#中文标题一
+##中文标题二
+###中文标题三
+...
+######中文标题六
+
+###正文:
+
+君不见，黄河之水天上来，奔流到海不复回。
+
+君不见，高堂明镜悲白发，朝如青丝暮成雪。
+
+人生得意须尽欢，莫使金樽空对月。
+
+天生我材必有用，千金散尽还复来。
+
+###列表：
+
+* 天空
+
+   1. 蓝色的
+   2. 好高啊
+
+* 海洋
+
+   1. 有鱼
+       
+       * 鲸鱼
+       * 鲨鱼
+           
+
+* 大地
+
+###链接：
+
+[谷歌](http://www.google.com)
+
+###引用：
+
+> 一级引用
+>
+> 一级引用
+>
+> > 二级引用
+>
+>> 没有空格也可以
+>>> 三级引用
+>
+> 回到一级引用
+
+
+----
+
+
+testing
+
+--
+[[!toc  levels=2]]
+
+[[Mamma Mia]]