typo fix.

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1e5fba3041eeb829762158147000d38b4e14109c..4c8621f1cad4ca58cba6de91ce90898478a0fb8b 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,24 +1,14 @@
 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  ]]).
 

-----
-misc test
-
-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.
+<<<<<<< HEAD
+Test conflict.
+=======
+Testing 123.
+>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718

 
 # Header
 
 
 # Header
 

-## Subheader
+## Subheader2

 
 > This is a blockquote.
 >
 
 > This is a blockquote.
 >


@@ -39,10 +29,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
 1. And another..
  1. foo
  2. bar

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

 
 Bulleted list
 
 
 Bulleted list
 


@@ -50,10 +36,9 @@ Bulleted list
 * *item*
 * item
 * one
 * *item*
 * item
 * one

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

 
 ----
 
 
 ----
 


@@ -62,38 +47,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"]]