X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a55752a7bedb83fa5339f232b9a61a60a67251f3..c7364a0567caed313586bf20fa5a7d93ca3498a4:/doc/sandbox.mdwn?ds=sidebyside

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f9fa321b3..038412d14 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,25 +1,97 @@
+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  ]]).
+vvvv
+CamelCase ?
 
-What about [[this page]]?
+[[!tag sandbox]]
+
+What about [[this page]], nono better [[that page]]?
 
 hello world (right back at ya)
 
+wait how does versioning work
+
 test, is it being saved? Probably. I will check. This seems really straightforward.
 
+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.
+A block of text
 >
 > > This is a nested blockquote.
 >
 >> Without a space works too.
 >>> to three levels
+
+This is pretty sweet
+
+Azerty
+** Qsdf **
+
 >
 > Back to the first level.
 >
@@ -37,6 +109,7 @@ Numbered list
     1. foo
     2. bar
     3. quz
+    3. quze
 
 Bulleted list
 
@@ -46,6 +119,19 @@ Bulleted list
 * one
   * footballs; runner; unices
   * Cool !
+    * test
+  * this
+* something else
+  * some more
+  * and more
+    * and
+      * this
+> a blockquote
+> in a list
+> how is this handled
+        *this  _ _ _
+      * this 2
+      * this 3
 
 test _this_ out.
 
@@ -120,4 +206,6 @@ Räksmörgås.
 
 `pre?`
 
+Testing. Test. 試験として書き込みします。
 
+Καλημέρα!