diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
| commit | 8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a (patch) | |
| tree | 9e26465e0ca98a5f3cbc6c72a0cace4bf83b93db /doc/sandbox.mdwn | |
| parent | 78a69e5bd632eb86ef8135e9c1d05d2c48b43362 (diff) | |
| parent | 08fda4c9d374de1d3de3172a192d4d915d3dc0c1 (diff) | |
| download | ikiwiki-8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a.tar ikiwiki-8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a.tar.gz | |
Merge branch 'master'
Conflicts:
doc/ikiwiki-makerepo.mdwn
Diffstat (limited to 'doc/sandbox.mdwn')
| -rw-r--r-- | doc/sandbox.mdwn | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 9e709172a..1e5fba304 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,8 +1,12 @@ -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 ]]). ---- +misc test -Here's a paragraph. สวัสดี +test more test +[[中文显示]] + +Here's a paragraph. The following code block is pre-formatted: @@ -51,10 +55,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"]] @@ -74,12 +74,26 @@ The haiku will change after every save, mind you. * [](http://ikiwiki.info) * <a href="http://www.google.com/">plain old html link</a> * [[foo]] -* WikiLink - -Test ----- 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... ~~ + +測試的啦 + +---- + + +testing |