X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/aaef4408002b1d2b252351f75ce89d7ae7e11814..c4c26838145591f5fb7d4d9a404a43d95d87f0c0:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f1a27f819..5e9c05225 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,14 +1,25 @@
-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 (version [[!version  ]]).
 
-hello
-
-testing 1..2..3!!
+----
+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
 
 ----
 
-I am testing the edit box provided through ikiwiki.cgi.
+Testing OpenID some more..
 
-----
+test more test
+[[中文显示]]
 
 Here's a paragraph.
 
@@ -59,14 +70,6 @@ Bulleted list
        * four
         * five
 
-* a new list
- * with sub heads
- * like this
------
-
-## a level 2 heading
-huh?
-
 ----
 
 [[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
@@ -86,7 +89,6 @@ The haiku will change after every save, mind you.
 * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
 * <a href="http://www.google.com/">plain old html link</a>
 * [[foo]]
-* WikiLink
 
 -----
 
@@ -103,3 +105,15 @@ But, of course, rsync is better.
 ----
 
 Let's see what happens... ~~
+
+測試的啦
+
+----
+
+
+testing
+
+--
+[[!toc  levels=2]]
+
+[[Mamma Mia]]