X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1786b106a9c7f448136ff47d9b6dd26d48a5dd2e..8a98440db6454fc8653c264f61502bd0d1d6baf8:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..bfc1bf46a 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,45 +1,61 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version  ]]).
 
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
+What about [[this page]]?
 
-# Header
+hello world (right back at ya)
 
-## Subheader2
+test, is it being saved? Probably. I will check. This seems really straightforward.
+
+~~~
+pre formated text?
+~~~
 
 > 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
+
+
+Azerty
+** Qsdf **
+
 >
 > Back to the first level.
+>
+> added a line in level 1
+> and another
+
 
 Numbered list 
 
 1. First item.
- 1. Sub item.
+    1. Sub item.
+    1. Number 2
 1. Another.
 1. And another..
- 1. foo
- 2. bar
+    1. foo
+    2. bar
+    3. quz
+    3. quze
 
 Bulleted list
 
 * item
-* *item*
+* *italic item*
 * item
 * one
   * footballs; runner; unices
   * Cool !
 
+test _this_ out.
 
+`test this code block`
+[[!wikipedia War_of_1812]]
 ----
 
 [[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
@@ -54,9 +70,60 @@ 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_
+
+test ms
+
+opopopo
+----
+
 This **SandBox** is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+Testy test!
+
+
+<p>
+This is an email link:
+<a href="mailto:erik.josefsson@europarl.europa.eu?Subject=Hello%20again" target="_top">
+Send Mail</a>
+</p>
+
+What follows is some preformatted text.  Each line is proceeded by four spaces.
+
+    Test
+
+    <Test>
+
+    <test>
+    <test>
+
+    <test>
+      <child />
+    </test>
+
+...Now why doesn't it work like that on my own copy of ikiwiki? :(
+
+Räksmörgås.
+
+`pre?`
+
+Testing. Test. 試験として書き込みします。
+