Revert "removed"

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b8bcc62c403373354d448997593aff44567a1662..9234603fc093cccd9d948341e8f56b9fe083c088 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,11 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
-
-Test conflict.
-
-# Header
-
-## Subheader2
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki
+(version [[!version  ]]).
 
 > 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
@@ -25,6 +20,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list
 
@@ -50,6 +46,23 @@ 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_
 
 ----