diff options
| author | intrigeri <intrigeri@boum.org> | 2010-06-25 14:38:37 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-06-25 14:38:37 +0200 |
| commit | 9f401d6617a11efcedda1c956b2ccea061a7540f (patch) | |
| tree | a5648589b38487427a58a7ebacfdc036a5dd102a /doc/sandbox.mdwn | |
| parent | 73f4a8835876c8cb07808367cd72d9ae972893e8 (diff) | |
| parent | 71950b2ae5ff6fd3b631c5504455cc07699b1c11 (diff) | |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/po.pm
Diffstat (limited to 'doc/sandbox.mdwn')
| -rw-r--r-- | doc/sandbox.mdwn | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index afd7dbeab..8ecaf1cb9 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,9 +1,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). - # Header -## Subheader +## Subheader2 > This is a blockquote. > @@ -32,6 +31,8 @@ Bulleted list * item * one * footballs; runner; unices + * Cool ! + ---- @@ -48,32 +49,8 @@ Bulleted list * <http://www.gnu.org/> * [GNU](http://www.gnu.org/) ------ - -[[!progress percent=27]] - -[[!progress percent=78]] - ------ +---- This **SandBox** is also a [[blog]]! [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] - ----- - -What about [relative urls](../setup/byhand)? - -[[!toggleable id="foobar" text=""" -foo -"""]] - -[[!toggleable id="foobar" text=""" -bar -"""]] - -[[!toggle id="foobar" text="foo/bar"]] - -Hmm, can I dig it? - -Test |