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 540d7296e4563f92e567be7e2fb0e923c5e59bb3..986b59eac9be54415d8f9684b932871ec2a321c2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,18 +1,18 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
-----
-
-Test. Проверка. テスト ığüşöçİ ทดสอบ éphémère
+testing 1..2..3!!
 
-Here's a paragraph.
+----
 
-Here's another one with *emphasised* text.
+Here's a paragraph. สวัสดี
 
-do ë characters work? Sure.
+The following code block is pre-formatted:
 
-mooooooooooooooooOo...
+    Testing what
+    pre-formatted code blocks
+    look like.
 
-OpenID test. It works!
+Here's another one with *emphasised* text.
 
 # Header
 
@@ -24,7 +24,7 @@ OpenID test. It works!
 >
 > > This is nested blockquote.
 >
->> And without a space works too.
+>> Without a space works too.
 >>> to three levels
 >
 > Back to the first level.
@@ -40,6 +40,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
+     6. wibble
 
 Bulleted list
 
@@ -50,35 +51,37 @@ Bulleted list
   * two
      * three
        * 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.
+* [![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]]!
-
-[[inline pages="sandbox/*" rootpage="sandbox" show="5"]]
+Test
 
-----
-[[newpage]]
----
-
-Ethan wants to make a [[sandbox/castle]] in the sand.
+-----
 
-hi
+This SandBox is also a [[blog]]!
 
-just testing
\ No newline at end of file
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]