web commit by joey: conflict test

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 03ae1f1c03fd2f4ef8fbb90b9e29be27bc32632b..963c810b25a05bfdf3b4a300e20f01862c61db43 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...
 
-Here's another one with _emphasized_ and *bold* text.
+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]]
+
+[[SandBox/SubPage]] -- a page under this one.