Changes look good to me.

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 83d3fac7710a3401a72b53ac0af097ac2489da25..6730dd146847b9a8a2c464702d4b33360778e8ce 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,52 +1,35 @@
-This is the SandBox, a page anyone can edit to try out this fab ikiwiki.
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).

 
 

-foo
-
-# Table of Contents
-testhead
-sandbox
-
-
-<h2>testhead</h2>

 ----
 ----

-Do re me fa so la te... git?
-
-i see. i see. lalala hmmmmmmmm.
-
-## sandbox
-[[sandbox]] does that work? yep. yay!
-
-# テスト。
-
-Test. Korean. 나는 한국인, 백두산,동해
+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

 
 

-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 OpenID some more..

 
 

-Testing it in a comment...
+test more test
+[[中文显示]]

 
 Here's a paragraph.
 
 
 Here's a paragraph.
 

-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
-
-OpenID test. It works!!
-
-Hupple hupple hupple hupple snork.
+The following code block is pre-formatted:

 
 

-Exactly my point!
+    Testing what
+    pre-formatted code blocks
+    look like.

 
 

-Test..
-
-A [[nonexistingpage]]
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+Here's another one with *emphasised* text.

 
 # Header
 
 
 # Header
 


@@ -58,7 +41,7 @@ There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 >
 > > This is nested blockquote.
 >
 >
 > > This is nested blockquote.
 >

->> And without a space works too.
+>> Without a space works too.

 >>> to three levels
 >
 > Back to the first level.
 >>> to three levels
 >
 > Back to the first level.


@@ -74,6 +57,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
   3. baz
    4. qux
     5. quux

+     6. wibble

 
 Bulleted list
 
 
 Bulleted list
 


@@ -85,14 +69,16 @@ Bulleted list
      * three
        * four
         * five
      * three
        * four
         * five

-          * six
+

 ----
 
 ----
 

-[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
-[[haiku hint="sandbox play"]]
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]

 
 ----
 
 
 ----
 

+The haiku will change after every save, mind you.
+

 ## Different sorts of links:
 
 * [[Features]]
 ## Different sorts of links:
 
 * [[Features]]


@@ -101,9 +87,82 @@ Bulleted list
 * [GNU](http://www.gnu.org/)
 * [Email](mailto:noone@invalid)
 * [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
 * [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/>do html links work?</a>
+* <a href="http://www.google.com/">plain old html link</a>
+* [[foo]]
+

 -----
 
 -----
 

-This sandbox is also a [[ikiwiki/blog]]!
+This SandBox is also a [[blog]]!
+
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+--------
+
+This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
+
+But, of course, rsync is better.
+
+----
+
+Let's see what happens... ~~
+
+#中文标题一
+##中文标题二
+###中文标题三
+...
+######中文标题六
+
+###正文:
+
+君不见，黄河之水天上来，奔流到海不复回。
+
+君不见，高堂明镜悲白发，朝如青丝暮成雪。
+
+人生得意须尽欢，莫使金樽空对月。
+
+天生我材必有用，千金散尽还复来。
+
+###列表：
+
+* 天空
+
+   1. 蓝色的
+   2. 好高啊
+
+* 海洋
+
+   1. 有鱼
+       
+       * 鲸鱼
+       * 鲨鱼
+           
+
+* 大地
+
+###链接：
+
+[谷歌](http://www.google.com)
+
+###引用：
+
+> 一级引用
+>
+> 一级引用
+>
+> > 二级引用
+>
+>> 没有空格也可以
+>>> 三级引用
+>
+> 回到一级引用
+
+
+----
+
+
+testing
+
+--
+[[!toc  levels=2]]

 
 

-[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+[[Mamma Mia]]