Merge branch 'master' into templatemove

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index bb58178c8e7bf456627c079bafa4906e4d1bdc4d..c323153c8402b4a0a5866b4d579f6ea3a6f16edb 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,41 +1,9 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
-
-----
-Creating a new page: [[Sand_Notes]]
-
-# テスト。
-
-Test. Korean. 나는 한국인, 백두산,동해
-
-Test. Chinese. 我是中国人，泰山、黄河。
-
-testing openid ... ignore.
-
-Test. Проверка. Тэстенг. テスト ığüşöçİ ทดสอบ éphémère
-
-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
-
-Testing it in a comment...
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
-
-OpenID test. It works!!
-
-Hupple hupple hupple hupple snork.
-
-Exactly my point!
-
-Test..
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
+[[Testing 1 2 3| test]]
 # Header
 
-## Subheader
+## Subheader2
 
 > This is a blockquote.
 >
@@ -43,7 +11,7 @@ There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
@@ -56,9 +24,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
-  3. baz
-   4. qux
-    5. quux
 
 Bulleted list
 
@@ -66,49 +31,51 @@ Bulleted list
 * *item*
 * item
 * one
-  * two
-     * three
-       * four
-        * five
+  * footballs; runner; unices
 
 ----
 
-[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
-[[haiku hint="sandbox play"]]
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]
 
 ----
 
 ## Different sorts of links:
 
-* [[WikiLink]]
-* [[different_name_for_a_WikiLink|WikiLink]]
+* [[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)
 
 -----
 
-<div class="whatever">
+[[!progress percent=27]]
 
-Try putting divs around a list doesn't work:
+[[!progress percent=78]]
 
-* first item
-* second item
-
-</div>
+-----
 
-span also doesn't work:
+This **SandBox** is also a [[blog]]!
 
-<span class="whatever">
-* first item
-* second item
-</span>
+[[!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"]]
 
-aaaaaaaaaaaaaaaa
+Hmm, can I dig it?
 
-This sandbox is also a [[blog]]!
+Test
+test2
 
-[[inline pages="sandbox/*" rootpage="sandbox" show="4" archive="yes"]]