Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9dd643e22f911969859f2f97e232d8ee8ed64864..9e709172a900f0e23f1defe91e298814489fdbf1 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -2,26 +2,16 @@ This is the SandBox, a page anyone can edit to try out ikiwiki.
 
 ----
 
 
 ----
 

-testing openid ... ignore.
+Here's a paragraph. สวัสดี

 
 

-Test. Проверка. テスト ığüşöçİ ทดสอบ éphémère
+The following code block is pre-formatted:

 
 

-Testing right-to-left text: (שרה) should be spelled shin (ש) resh (ר) heh (ה) from right to left.
-
-Testing it in a comment...
-
-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!!
-
-Test..
-
-There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
-

 # Header
 
 ## Subheader
 # Header
 
 ## Subheader


@@ -32,7 +22,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.


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

+     6. wibble

 
 Bulleted list
 
 
 Bulleted list
 


@@ -60,54 +51,35 @@ Bulleted list
        * four
         * five
 
        * 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"]]
-
-----
-[[newpage]]
----
-
-Ethan wants to make a [[sandbox/castle]] in the sand.
-
-hi
-
-just testing
-
-Testing a user page for [[users/kyle]]
-
-----
-what happens if i edit something with an openid set?
+* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
+* <a href="http://www.google.com/">plain old html link</a>
+* [[foo]]
+* WikiLink

 
 

------------
+Test

 
 

-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...
+-----

 
 

-[[if test="sandbox/C++" then="[[sandbox/C++]]" else="sad face!"]]
+This SandBox is also a [[blog]]!

 
 

-----
-subscription test
\ No newline at end of file
+[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]