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 e8eda730f052c67068c2c11d7e4c04f682a31b7d..1a1b128e67aec905c64d25ef0d74623328b5cd83 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,12 +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  ]]).

 
 

-----
-
-Test. Проверка. テスト ığüşöçİ
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.

 
 # Header
 
 
 # Header
 


@@ -18,7 +11,7 @@ Here's another one with *emphasised* text.
 >
 > > This is nested blockquote.
 >
 >
 > > This is nested blockquote.
 >

->> And without a space works too.
+>> Without a space works too.

 >>> to three levels
 >
 > Back to the first level.
 >>> to three levels
 >
 > Back to the first level.


@@ -31,9 +24,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
 1. And another..
  1. foo
  2. bar

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

 
 Bulleted list
 
 
 Bulleted list
 


@@ -41,30 +31,50 @@ Bulleted list
 * *item*
 * item
 * one
 * *item*
 * item
 * one

-  * two
-     * three
-       * four
+  * footballs; runner; unices

 
 ----
 
 
 ----
 

-[[haiku hint="sandbox play"]]
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]

 
 ----
 
 ## Different sorts of links:
 
 
 ----
 
 ## Different sorts of links:
 

-* [[WikiLink]]
-* [[different_name_for_a_WikiLink|WikiLink]]
-* [[different name for a WikiLink (with spaces this time)|WikiLink]]
+* [[Features]]
+* <http://ikiwiki.info/ikiwiki/formatting/>
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]

 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)

-* [Email](mailto:noone@invalid)
-* WikiLink without any markup.

 
 

-[[tag bar]]
+-----
+
+[[!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?

 
 

-[[inline pages="sandbox/*" rootpage="sandbox" show="5"]]
+Test
+pop