X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4d21c60c11bab6ae12f95ba9eaa374b67ff561f5..refs/heads/debian-jessie-backports:/doc/sandbox.mdwn?ds=sidebyside

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 099853d1d..0872462f6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,14 @@
-[[!template  id=test45 text="""Here is the text to insert into my note."""]]
-dddddddddddd
+###Is this a heading? 
+
+Sure it is. 
+
+Nope my friend.
+
+<<<<<<< HEAD
+[[test link]]
+=======
+[[Test link]]
+>>>>>>> 59f04c5ad3daf0c01e81d28ec1106e23567a1100
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 
@@ -8,7 +17,9 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 vvvv
 CamelCase ?
 
-What about [[this page]]?
+[[!tag sandbox]]
+
+What about [[this page]], nono better [[that page]]?
 
 hello world (right back at ya)
 
@@ -22,6 +33,54 @@ Hello!
 pre formated text?
 ~~~
 
+```
+testing markdown
+```
+
+# one
+
+- foo
+
+## two
+
+- bar
+
+### trois
+
+- blah
+    - more blah
+
+#### quatre
+
+## bir
+- bir
+
+## iki
+- iki
+
+* yildiz
+** cyildiz
+
+- tire
+  - ctire
+
+* *i dene*
+* **b dene**
+
+
+1. number
+2. list
+    a. ick
+    b. bar
+
+| table | here |
+|----|.----.|
+| test adfasdfasdfa | 2 |
+| subtest | adfad|
+
+ok no formating.
+
+
 > This is a blockquote.
 >
 > This is the first level of quoting.
@@ -154,3 +213,7 @@ Räksmörgås.
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!
+
+test
+
+I must **emphasise** this.