X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6736664672f5de51b2d1b0da04e7298a76740b89..29fd100e9f4e71fb85505d932184ffd5e3f26242:/doc/sandbox.mdwn?ds=sidebyside diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 52f5f082a..4c8621f1c 100644 --- 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 ]]). ----- -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 -## Subheader +## Subheader2 > This is a blockquote. > @@ -39,10 +29,6 @@ Numbered list 1. And another.. 1. foo 2. bar - 3. baz - 4. qux - 5. quux - 6. wibble Bulleted list @@ -50,10 +36,9 @@ Bulleted list * *item* * item * one - * two - * three - * four - * five + * footballs; runner; unices + * Cool ! + ---- @@ -62,33 +47,16 @@ Bulleted list ---- -The haiku will change after every save, mind you. - ## Different sorts of links: * [[Features]] +* * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * * [GNU](http://www.gnu.org/) -* [Email](mailto:noone@invalid) -* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info) -* plain old html link -* [[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]]! -測試的啦 +[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]