fix error in git_wrapper path i introduced

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6730dd146847b9a8a2c464702d4b33360778e8ce..452ee4e84a411a78ca8e234a9fc2656a6e52f27c 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,74 +1,46 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version  ]]).

 
 

-----
-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.
-
-The following code block is pre-formatted:
-
-    Testing what
-    pre-formatted code blocks
-    look like.
-
-Here's another one with *emphasised* text.
-
-# Header
-
-## Subheader
+hello world (right back at ya)

 
 > This is a blockquote.
 >
 > This is the first level of quoting.
 >
 
 > This is a blockquote.
 >
 > This is the first level of quoting.
 >

-> > This is nested blockquote.
+> > This is a nested blockquote.

 >
 >> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
 >
 >> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.

+>
+> added a line in level 1
+> and another
+

 
 Numbered list 
 
 1. First item.
 
 Numbered list 
 
 1. First item.

- 1. Sub item.
+    1. Sub item.
+    1. Number 2

 1. Another.
 1. And another..
 1. Another.
 1. And another..

- 1. foo
- 2. bar
-  3. baz
-   4. qux
-    5. quux
-     6. wibble
+    1. foo
+    2. bar
+    3. quz

 
 Bulleted list
 
 * item
 
 Bulleted list
 
 * item

-* *item*
+* *italic item*

 * item
 * one
 * item
 * one

-  * two
-     * three
-       * four
-        * five
+  * footballs; runner; unices
+  * Cool !
+
+test _this_ out.
+
+`test this code block`

 
 ----
 
 
 ----
 


@@ -77,92 +49,45 @@ Bulleted list
 
 ----
 
 
 ----
 

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

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

+* <http://ikiwiki.info/ikiwiki/formatting/>

 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * [[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]]
-
------
-
-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.
+* <a href="http://kitenet.net/~joey/">Joey's blog</a>

 
 ----
 
 
 ----
 

-Let's see what happens... ~~
-
-#中文标题一
-##中文标题二
-###中文标题三
-...
-######中文标题六
-
-###正文:
-
-君不见，黄河之水天上来，奔流到海不复回。
-
-君不见，高堂明镜悲白发，朝如青丝暮成雪。
-
-人生得意须尽欢，莫使金樽空对月。
-
-天生我材必有用，千金散尽还复来。
-
-###列表：
+# header1

 
 

-* 天空
+## header2

 
 

-   1. 蓝色的
-   2. 好高啊
+### header3

 
 

-* 海洋
+#### header4

 
 

-   1. 有鱼
-       
-       * 鲸鱼
-       * 鲨鱼
-           
+##### header 5

 
 

-* 大地
+**bold**

 
 

-###链接：
-
-[谷歌](http://www.google.com)
-
-###引用：
-
-> 一级引用
->
-> 一级引用
->
-> > 二级引用
->
->> 没有空格也可以
->>> 三级引用
->
-> 回到一级引用
+_italic_

 
 

+test ms

 
 

+opopopo

 ----
 
 ----
 

+This **SandBox** is also a [[blog]]!
+
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]

 
 

-testing
+Testy test!

 
 

---
-[[!toc  levels=2]]

 
 

-[[Mamma Mia]]
+<p>
+This is an email link:
+<a href="mailto:erik.josefsson@europarl.europa.eu?Subject=Hello%20again" target="_top">
+Send Mail</a>
+</p>