Merge branch 'master' into commentreorg

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 2f95d479171de4335ce412ed602a7b8a6ca6cb9a..c323153c8402b4a0a5866b4d579f6ea3a6f16edb 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,26 +1,9 @@
-This is the SandBox, a page anyone can edit to try out ikiwiki.
-
-----
-
-testing openid ... ignore.
-
-Test. Проверка. テスト ığüşöçİ ทดสอบ éphémère
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-do ë characters work? Sure.
-
-OpenID test. It works!!
-
-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
 
 # Header
 

-## Subheader
+## Subheader2

 
 > This is a blockquote.
 >
 
 > This is a blockquote.
 >


@@ -28,7 +11,7 @@ There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 >
 > > 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.


@@ -41,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
 


@@ -51,51 +31,51 @@ 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.

 
 -----
 
 
 -----
 

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

 
 

-[[inline pages="sandbox/*" rootpage="sandbox" show="5"]]
+[[!progress percent=78]]

 
 

-----
-[[newpage]]
----
+-----

 
 

-Ethan wants to make a [[sandbox/castle]] in the sand.
+This **SandBox** is also a [[blog]]!

 
 

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

 
 

-just testing
+----

 
 

-Testing a user page for [[users/kyle]]
+What about [relative urls](../setup/byhand)?

 
 

-----
-what happens if i edit something with an openid set?
+[[!toggleable  id="foobar" text="""
+foo
+"""]]

 
 

------------
+[[!toggleable  id="foobar" text="""
+bar
+"""]]

 
 

-So what's the point? [[How is this different to any other WiKi|features]]
+[[!toggle  id="foobar" text="foo/bar"]]

 
 

-----
-Test.. I was looking for a wiki supporting OpenID~ 
+Hmm, can I dig it?
+
+Test
+test2