diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 41c49a7bd..5c7368fc3 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,24 +1,81 @@
-#I am bashman, I am learning to be hacker.
+This is the SandBox, a page anyone can edit to try out ikiwiki.
-##I am studing in the high scool to be a ingenier.
+blather!!
-### I am like fedora an debian.
-### I am like perl and ikiwiki... :)
-
-Coding...
+Testing an edit in the sandbox.
- #!/usr/bin/perl
- print "hello World in ikiwiki";
+----
-I am like this, is realy fast!, is the merma!.
-OOO sorry by my english, is no very good. :-|
+Here's a paragraph.
-:-|
+Here's another one with *emphasised* text.
- Identing for PHP, by example...
+# Header
- a = RespaldoPeer::doSelect(new Criteria());
- ?>
+## Subheader
-lol.
+> This is a blockquote.
+>
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+>> Without a space works too.
+>>> to three levels
+>
+> Back to the first level.
+
+Numbered list
+
+1. First item.
+ 1. Sub item.
+1. Another.
+1. And another..
+ 1. foo
+ 2. bar
+ 3. baz
+ 4. qux
+ 5. quux
+ 6. wibble
+
+Bulleted list
+
+* item
+* *item*
+* item
+* one
+ * two
+ * three
+ * four
+ * five
+
+* a new list
+ * with sub heads
+ * like this
+
+----
+
+[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[haiku hint="sandbox play"]]
+
+----
+
+The haiku will change after every save, mind you.
+
+## Different sorts of links:
+
+* [[Features]]
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
+*
+* [GNU](http://www.gnu.org/)
+* [Email](mailto:noone@invalid)
+* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
+* plain old html link
+* [[foo]]
+* WikiLink
+
+-----
+
+This sandbox is also a [[ikiwiki/blog]]!
+
+[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]