Merge remote branch 'intrigeri/po'

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 986b59eac9be54415d8f9684b932871ec2a321c2..691f20ffe782f010823455a2eba0ce0b739e679e 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,24 +1,6 @@
-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 (version [[!version  ]]).

 
 

-testing 1..2..3!!
-
-----
-
-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.
 >


@@ -33,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
 


@@ -48,14 +28,9 @@ Bulleted list
 * *item*
 * item
 * one
 * *item*
 * item
 * one

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

 
 

-* a new list
- * with sub heads
- * like this

 
 ----
 
 
 ----
 


@@ -64,24 +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]]
-* WikiLink
-
-Test

 
 

------
+----

 
 

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

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