Merge remote branch 'upstream/master' into prv/po

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index e326319dae3ac641da52647c32885a0d4bb1542c..691f20ffe782f010823455a2eba0ce0b739e679e 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,16 +1,6 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 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.
-
-test 2
-
-# Header
-
-## Subheader
-
-> This is a blockquote.
+> This is a blockerquote.

 >
 > This is the first level of quoting.
 >
 >
 > This is the first level of quoting.
 >


@@ -25,10 +15,12 @@ Numbered list
 
 1. First item.
  1. Sub item.
 
 1. First item.
  1. Sub item.

+ 2. bar

 1. Another.
 1. And another..
  1. foo
  2. bar
 1. Another.
 1. And another..
  1. foo
  2. bar

+ 3. quz

 
 Bulleted list
 
 
 Bulleted list
 


@@ -36,7 +28,9 @@ Bulleted list
 * *item*
 * item
 * one
 * *item*
 * item
 * one

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

 
 ----
 
 
 ----
 


@@ -53,13 +47,7 @@ Bulleted list
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 

------
-
-[[!progress percent=27]]
-
-[[!progress percent=78]]
-
------
+----

 
 This **SandBox** is also a [[blog]]!
 
 
 This **SandBox** is also a [[blog]]!