Merge commit 'upstream/master'

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 84f09e707a12d88f3015a8499a8f8f7bf16ab23e..986b59eac9be54415d8f9684b932871ec2a321c2 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,8 +1,16 @@
 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!!
+

 ----
 
 ----
 

-Here's a paragraph.
+Here's a paragraph. สวัสดี
+
+The following code block is pre-formatted:
+
+    Testing what
+    pre-formatted code blocks
+    look like.

 
 Here's another one with *emphasised* text.
 
 
 Here's another one with *emphasised* text.
 


@@ -16,7 +24,8 @@ Here's another one with *emphasised* text.
 >
 > > 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.
 
 >
 > Back to the first level.
 


@@ -31,45 +40,48 @@ Numbered list
   3. baz
    4. qux
     5. quux
   3. baz
    4. qux
     5. quux

+     6. wibble

 
 Bulleted list
 
 
 Bulleted list
 

-* *item*

 * item
 * item

+* *item*

 * item
 * item

-* just to try this stuff - looks kool!
+* one
+  * 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)

+* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
+* <a href="http://www.google.com/">plain old html link</a>
+* [[foo]]
+* WikiLink

 
 

-----
-&#1506;&#1489;&#1512;&#1497;&#1514;
-&#1506;&#1489;&#1512;&#1497;&#1514; &#1506;&#1460;&#1501; &#1504;&#1456;&#1511;&#1493;&#1468;&#1491;&#1493;&#1465;&#1514;
-----
-
-So did that work? --[[Joey]]
-
-----
+Test

 
 

-Turkish spesific characters (latin5) expected to be here --> ığüşöçİĞÜŞÖÇ
-(character encoding set as UTF-8 on the client side)
-
-Hmm...  Rendered properly but now in this second entry, they all seem to be corrupted in the CGI form.  How about `sandbox.mdwn`?  --[[Roktas]]
-
-----
+-----

 
 

-This sandbox is also a [[blog]]!
+This SandBox is also a [[blog]]!

 
 

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