X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/677f06ca35b23b404b066d2965f29dd479654ab1..a6e629e5cf612e3c32c61c3fc0a9d859c1a7a5d9:/doc/sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index b82799a4b..4c8621f1c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,24 +1,14 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
-
-Hupple hupple hupple hupple snork.
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
-
-Korean characters test : 한글테스트입니다.
-
-some hindī? हिन्दी
+<<<<<<< HEAD
+Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
 
 # Header
 
-## Subheader
+## Subheader2
 
 > This is a blockquote.
 >
@@ -39,10 +29,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
-  3. baz
-   4. qux
-    5. quux
-     6. wibble
 
 Bulleted list
 
@@ -50,38 +36,27 @@ Bulleted list
 * *item*
 * item
 * one
-  * two
-     * three
-       * four
-        * five
+  * footballs; runner; unices
+  * Cool !
 
-* a new list
- * with sub heads
- * like this
 
 ----
 
-[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
-[[haiku hint="sandbox play"]]
+[[!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]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
-* [Email](mailto:noone@invalid)
-* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
-* <a href="http://www.google.com/">plain old html link</a>
-* [[foo]]
-* WikiLink
 
------
+----
 
-This sandbox is also a [[ikiwiki/blog]]!
+This **SandBox** is also a [[blog]]!
 
-[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]