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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..7c2fa13d7 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,26 +1,36 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
+# Sandbox
 
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
+## number 2
 
-# Header
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version  ]]).
 
-## Subheader2
+[[!toc levels=1 startlevel=2 ]]
+
+Let's try this~!
+
+w00t, how does this look on the **git** end?
+
+Testing this sandbox thing.
+
+## Blockquotes
 
 > 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.
 
+> It's kinda like e-mail...
+>> ...but without the cool colored lines...
+>>> ...and different font colors.
+>>>> ...but it's nothing a little CSS can't fix.
+
 Numbered list 
 
 1. First item.
@@ -29,6 +39,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list
 
@@ -38,6 +49,7 @@ Bulleted list
 * one
   * footballs; runner; unices
   * Cool !
+  * Indeed.
 
 
 ----
@@ -54,9 +66,52 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
+* <a href="http://kitenet.net/~joey/">Joey's blog</a>
+
+----
+
+# header1
+
+## header2
+
+### header3
+
+#### header4
+
+##### header 5
+
+**bold**
+
+_italic_
+
+
+
+### this shows a problem with the list and the verbatim 
+
+Now we try to write a "code" block starting with a hash sign
+
+    # test 1,2,3
+    $ another test
+
+
+Now let's write the same block, with a bullest list preceding it.
+
+
+* This is a bullet list
+
+    # test 1,2,3
+    $ another test
+
+
+----
+
+
 
 ----
 
-This **SandBox** is also a [[blog]]!
+This **SandBox** is also a [[blog]]! xxx
+
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]a
+
+
 
-[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]