Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 44613f5e253fc0e9acc9853c9789430b2124bf2a..722e408518dcc07cff43256c08ab7582c5535427 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,23 +1,19 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
+testing 1..2..3!!
+
 ----
 
-testing openid ... ignore.
+Here's a paragraph. สวัสดี
 
-Test. Проверка. テスト ığüşöçİ ทดสอบ éphémère
+The following code block is pre-formatted:
 
-Here's a paragraph.
+    Testing what
+    pre-formatted code blocks
+    look like.
 
 Here's another one with *emphasised* text.
 
-do ë characters work? Sure.
-
-OpenID test. It works!!
-
-Test..
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
-
 # Header
 
 ## Subheader
@@ -28,7 +24,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.
@@ -44,6 +40,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
+     6. wibble
 
 Bulleted list
 
@@ -56,51 +53,37 @@ Bulleted list
        * four
         * five
 
+* a new list
+ * with sub heads
+ * like this
+
 ----
 
-[[haiku hint="sandbox play"]]
+[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
+[[!haiku hint="sandbox play"]]
 
 ----
 
+The haiku will change after every save, mind you.
+
 ## Different sorts of links:
 
-* [[WikiLink]]
-* [[different_name_for_a_WikiLink|WikiLink]]
-* [[different name for a WikiLink (with spaces this time)|WikiLink]]
+* [[Features]]
+* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * [Email](mailto:noone@invalid)
-* WikiLink without any markup.
-
------
-
-This sandbox is also a [[blog]]!
-
-[[inline pages="sandbox/*" rootpage="sandbox" show="5"]]
+* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
+* <a href="http://www.google.com/">plain old html link</a>
+* [[foo]]
+* WikiLink
 
-----
-[[newpage]]
----
-
-Ethan wants to make a [[sandbox/castle]] in the sand.
-
-hi
+Test
 
-just testing
-
-Testing a user page for [[users/kyle]]
-
-----
-what happens if i edit something with an openid set?
+Ḷét̨'s̀ şė͜e...
 
------------
-
-So what's the point? [[How is this different to any other WiKi|features]]
-
-----
-Test.. I was looking for a wiki supporting OpenID~ 
+-----
 
-----
-me too...
+This SandBox is also a [[blog]]!
 
-[[if test="sandbox/C++" then="[[sandbox/C++]]" else="sad face!"]]
\ No newline at end of file
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]