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 ef35194a1a34c30efc4115053413cdc439ab1330..986b59eac9be54415d8f9684b932871ec2a321c2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,19 +1,19 @@
 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.
 

+testing 1..2..3!!
+

 ----
 
 ----
 

-test
+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.
 
 
 Here's another one with *emphasised* text.
 

-do ë characters work? Sure.
-
-OpenID test. It works!
-

 # Header
 
 ## Subheader
 # Header
 
 ## Subheader


@@ -24,7 +24,7 @@ OpenID test. It works!
 >
 > > 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.


@@ -40,6 +40,7 @@ Numbered list
   3. baz
    4. qux
     5. quux
   3. baz
    4. qux
     5. quux

+     6. wibble

 
 Bulleted list
 
 
 Bulleted list
 


@@ -50,37 +51,37 @@ Bulleted list
   * two
      * three
        * four
   * 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:
 
 ## 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)
 * <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.
+Test

 
 

-hi
+-----

 
 

-just testing
+This SandBox is also a [[blog]]!

 
 

-Testing a user page for [[users/kyle]]
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]