web commit by joey: conflict test

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index be5c51496fef8613b7eb855c69d793adf9320324..36c755650f26d79a8a97e2fe02bbe38447dbfa1b 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,9 +4,9 @@ See [[MarkDown]] for documentation of the markup syntax used on this page.
 
 ----
 
-Here's a paragraph.
+Here's a paragraph. test 2: testing 1.2.3.4..
 
-Here's another one.
+Here's another one with *emphasised* text.
 
 # Header
 
@@ -28,8 +28,12 @@ Numbered list
 
 Bulleted list
 
+* *item*
 * item
 * item
-* item
+* just to try this stuff - looks kool!
+* test
+
+[[WikiLink]]
 
-Link back to the [[index]].
+[[SandBox/SubPage]] -- a page under this one.