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 986b59eac9be54415d8f9684b932871ec2a321c2..1a1b128e67aec905c64d25ef0d74623328b5cd83 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,18 +1,5 @@
-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 1..2..3!!
-
-----
-
-Here's a paragraph. สวัสดี
-
-The following code block is pre-formatted:
-
-    Testing what
-    pre-formatted code blocks
-    look like.
-
-Here's another one with *emphasised* text.
 
 # Header
 
@@ -37,10 +24,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
-  3. baz
-   4. qux
-    5. quux
-     6. wibble
 
 Bulleted list
 
@@ -48,14 +31,7 @@ Bulleted list
 * *item*
 * item
 * one
-  * two
-     * three
-       * four
-        * five
-
-* a new list
- * with sub heads
- * like this
+  * footballs; runner; unices
 
 ----
 
@@ -64,24 +40,41 @@ Bulleted list
 
 ----
 
-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
 
-Test
+-----
+
+[[!progress percent=27]]
+
+[[!progress percent=78]]
 
 -----
 
-This SandBox is also a [[blog]]!
+This **SandBox** is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+----
+
+What about [relative urls](../setup/byhand)?
+
+[[!toggleable  id="foobar" text="""
+foo
+"""]]
+
+[[!toggleable  id="foobar" text="""
+bar
+"""]]
+
+[[!toggle  id="foobar" text="foo/bar"]]
+
+Hmm, can I dig it?
+
+Test
+pop