summaryrefslogtreecommitdiff
path: root/doc/sandbox.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-01-26 13:05:38 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-01-26 13:05:38 -0500
commit12eb056b33e1f01a63c4fcee408c9ac0d96c6b5e (patch)
tree988f9eb2099e98141844c205f553f13203cbc0ff /doc/sandbox.mdwn
parentf8c306a21b2d7b137fbc9245079d2db8b75366e1 (diff)
parent9b436a0347e28c52a0d669be64e259b3d0323815 (diff)
Merge branch 'master' into po
Diffstat (limited to 'doc/sandbox.mdwn')
-rw-r--r--doc/sandbox.mdwn17
1 files changed, 3 insertions, 14 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index d39b59715..a39264e18 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,14 +1,8 @@
-This is the [[SandBox]], a page anyone can edit to try out ikiwiki.
-
-hello
-
-testing 1..2..3!!
-
-----
-
-I am testing the edit box provided through ikiwiki.cgi.
+This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
----
+test
+[[中文显示]]
Here's a paragraph.
@@ -59,10 +53,6 @@ Bulleted list
* four
* five
-* a new list
- * with sub heads
- * like this
-
----
[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
@@ -82,7 +72,6 @@ The haiku will change after every save, mind you.
* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
* <a href="http://www.google.com/">plain old html link</a>
* [[foo]]
-* WikiLink
-----