X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/546a6286f1943adc098910929645cda65f5d86fc..154c4ea9e:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 5e9c05225..ff8b986ec 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,74 +1,50 @@
-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
-[[中文显示]]
+hello world (right back at ya)
+asfddsaf sadfkjal;skdfj saldkfjasdf  
+sdafljas;dlfk safdiuhsdf
 
-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
 >
 > Back to the first level.
+>
+> added a line in level 1
+> and another
+
 
 Numbered list 
 
 1. First item.
- 1. Sub item.
+    1. Sub item.
+    1. Number 2
 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
-* *item*
+* *italic item*
 * item
 * one
-  * two
-     * three
-       * four
-        * five
+  * footballs; runner; unices
+  * Cool !
+
+test _this_ out.
+
+`test this code block`
 
 ----
 
@@ -77,43 +53,45 @@ 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]]
+* <a href="http://kitenet.net/~joey/">Joey's blog</a>
 
------
+----
 
-This SandBox is also a [[blog]]!
+# header1
 
-[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+## header2
 
---------
+### header3
 
-This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
+#### header4
 
-But, of course, rsync is better.
+##### header 5
 
-----
+**bold**
 
-Let's see what happens... ~~
+_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>