Reflect merge of page.

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8e38ea1e9fbf0085f4fb252089e92be85534cb64..8aedcbb9e6beafb9dfff37d14161acb47e34fbb9 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,21 +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  ]]).

 
 

-hello
-
-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
 
 
 # Header
 


@@ -40,10 +24,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
 1. And another..
  1. foo
  2. bar

-  3. baz
-   4. qux
-    5. quux
-     6. wibble

 
 Bulleted list
 
 
 Bulleted list
 


@@ -52,13 +32,6 @@ Bulleted list
 * item
 * one
   * two
 * item
 * one
   * two

-     * three
-       * four
-        * five
-
-* a new list
- * with sub heads
- * like this

 
 ----
 
 
 ----
 


@@ -67,35 +40,22 @@ Bulleted list
 
 ----
 
 
 ----
 

-The haiku will change after every save, mind you.
-

 ## 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/)

-* [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

 
 -----
 
 
 -----
 

-This SandBox is also a [[blog]]!
+[[!progress percent=27]]

 
 

-[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+[[!progress percent=78]]

 
 -----
 
 -----

-[[한글]]
-
---------
-
-This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net

 
 

-But, of course, rsync is better.
+This **SandBox** is also a [[blog]]!

 
 

-----
-
-Let's see what happens...
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]