Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8b594043e48d462cea62519557ad5799264641f2..c665e67f06e387af7aa2b888b15dc74feff6a213 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,24 +1,24 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-# Header
-
-## Subheader
+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 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
 >
 > Back to the first level.
 
 >
 >> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
 

+1. Hot Items that are hot
+ 1. Daves Insanity Sauce
+ 2. Marie Sharps 
+ 1. Blazing Inferno
+1. Not so Hot Items
+ 1. Tabasco 
+

 Numbered list 
 
 1. First item.
 Numbered list 
 
 1. First item.


@@ -27,6 +27,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
 1. And another..
  1. foo
  2. bar

+ 3. quz

 
 Bulleted list
 
 
 Bulleted list
 


@@ -34,7 +35,9 @@ Bulleted list
 * *item*
 * item
 * one
 * *item*
 * item
 * one

-  * two
+  * footballs; runner; unices
+  * Cool !
+

 
 ----
 
 
 ----
 


@@ -46,12 +49,14 @@ Bulleted list
 ## Different sorts of links:
 
 * [[Features]]
 ## 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/)
 * [[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>

 
 

------
+----

 
 

-This SandBox is also a [[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"]]