Merge remote branch 'intrigeri/po'

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index f19e9afa01f638f6a630b27ec1bf40189c5f94c9..691f20ffe782f010823455a2eba0ce0b739e679e 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,25 +1,6 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 

-----
-
-test more test
-[[中文显示]]
-
-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.
-
-# Header
-
-## Subheader
-
-> This is a blockquote.
+> This is a blockerquote.

 >
 > This is the first level of quoting.
 >
 >
 > This is the first level of quoting.
 >


@@ -34,14 +15,12 @@ Numbered list
 
 1. First item.
  1. Sub item.
 
 1. First item.
  1. Sub item.

+ 2. bar

 1. Another.
 1. And another..
  1. foo
  2. bar
 1. Another.
 1. And another..
  1. foo
  2. bar

-  3. baz
-   4. qux
-    5. quux
-     6. wibble
+ 3. quz

 
 Bulleted list
 
 
 Bulleted list
 


@@ -49,10 +28,9 @@ Bulleted list
 * *item*
 * item
 * one
 * *item*
 * item
 * one

-  * two
-     * three
-       * four
-        * five
+  * footballs; runner; unices
+  * Cool !
+

 
 ----
 
 
 ----
 


@@ -61,38 +39,16 @@ Bulleted list
 
 ----
 
 
 ----
 

-The haiku will change after every save, mind you.
-

 ## Different sorts of links:
 
 * [[Features]]
 ## Different sorts of links:
 
 * [[Features]]

+* <http://ikiwiki.info/ikiwiki/formatting/>

 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <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]]
-
------
-
-This SandBox is also a [[blog]]!
-
-[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-
---------
-
-This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
-
-But, of course, rsync is better.
-
-----
-
-Let's see what happens... ~~
-
-測試的啦

 
 ----
 
 
 ----
 

+This **SandBox** is also a [[blog]]!

 
 

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