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 795d10357630858cae8f9b827055c3767ebcdea6..e3b8412dfde15a142260040890e0854800e79713 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,14 +1,25 @@
-[[!template  id=test45 text="""Here is the text to insert into my note."""]]
+###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"]]
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).
 
 [[!meta date="Thu Jun 16 22:04:33 2005" updated="Thu Dec 22 01:23:20 2011"]]
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).

-
+vvvv

 CamelCase ?
 
 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)
 


@@ -16,10 +27,60 @@ wait how does versioning work
 
 test, is it being saved? Probably. I will check. This seems really straightforward.
 
 
 test, is it being saved? Probably. I will check. This seems really straightforward.
 

+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.


@@ -30,6 +91,7 @@ A block of text
 >> Without a space works too.
 >>> to three levels
 
 >> Without a space works too.
 >>> to three levels
 

+This is pretty sweet

 
 Azerty
 ** Qsdf **
 
 Azerty
 ** Qsdf **


@@ -151,3 +213,5 @@ Räksmörgås.
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!
 Testing. Test. 試験として書き込みします。
 
 Καλημέρα!

+
+test