diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-08-27 10:01:58 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-27 10:01:58 +0200 |
commit | f398ad035b973608d380c9939ea845d8e2a0cdc2 (patch) | |
tree | 1ba1a0c94e375ab8ed609eaa57a542c6b87de5a8 /doc/sandbox.mdwn | |
parent | 958e5735c946263a111420fe47abe58782581e8c (diff) | |
parent | 6d213a0c739d5b34357b01a616f99197eeba6ad9 (diff) |
Merge branch 'master' of git://git.ikiwiki.info
Diffstat (limited to 'doc/sandbox.mdwn')
-rw-r--r-- | doc/sandbox.mdwn | 139 |
1 files changed, 13 insertions, 126 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 9b0a53c68..365cb3321 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,48 +1,10 @@ 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 - - ---- -I try to have a discussion page !!! ----- - -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 - > 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 @@ -53,14 +15,12 @@ Numbered list 1. First item. 1. Sub item. + 2. bar 1. Another. 1. And another.. 1. foo 2. bar - 3. baz - 4. qux - 5. quux - 6. wibble + 3. quz Bulleted list @@ -68,10 +28,9 @@ Bulleted list * *item* * item * one - * two - * three - * four - * five + * footballs; runner; unices + * Cool ! + ---- @@ -80,92 +39,20 @@ Bulleted list ---- -The haiku will change after every save, mind you. - ## 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/) -* [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. +* <test.html> +<google.de> +<http://www.perl.it> ---- -Let's see what happens... ~~ - -#中文标题一 -##中文标题二 -###中文标题三 -... -######中文标题六 - -###正文: +This **SandBox** is also a [[blog]]! +[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]] -君不见,黄河之水天上来,奔流到海不复回。 - -君不见,高堂明镜悲白发,朝如青丝暮成雪。 - -人生得意须尽欢,莫使金樽空对月。 - -天生我材必有用,千金散尽还复来。 - -###列表: - -* 天空 - - 1. 蓝色的 - 2. 好高啊 - -* 海洋 - - 1. 有鱼 - - * 鲸鱼 - * 鲨鱼 - - -* 大地 - -###链接: - -[谷歌](http://www.google.com) - -###引用: - -> 一级引用 -> -> 一级引用 -> -> > 二级引用 -> ->> 没有空格也可以 ->>> 三级引用 -> -> 回到一级引用 - - ----- - - -testing - --- -[[!toc levels=2]] - -[[Mamma Mia]] +[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] |