Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 099853d1dc0dc1beed43fa290ef5cf4844211a4c..038412d14b09156f2cee05e93ce4b3600587c3ad 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,10 @@
-[[!template  id=test45 text="""Here is the text to insert into my note."""]]
-dddddddddddd
+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"]]
 
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 


@@ -8,7 +13,9 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 vvvv
 CamelCase ?
 
 vvvv
 CamelCase ?
 

-What about [[this page]]?
+[[!tag sandbox]]
+
+What about [[this page]], nono better [[that page]]?

 
 hello world (right back at ya)
 
 
 hello world (right back at ya)
 


@@ -22,6 +29,54 @@ Hello!
 pre formated text?
 ~~~
 
 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.
 > This is a blockquote.
 >
 > This is the first level of quoting.