diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-05-14 02:42:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-05-14 02:42:38 -0400 |
| commit | 6983e05e8f9f6188b537e2ea1add5120752d9025 (patch) | |
| tree | d559eef22f7f67d718836fca0f2c1b42992bee13 | |
| parent | 2c6f41e59c8c4e790559e5171cb0e2aeda919b3b (diff) | |
| parent | 62ac574b362baa40960d56c1f07ce197c4fba4b6 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/plugins/mdwn.mdwn | 2 | ||||
| -rw-r--r-- | doc/sandbox.mdwn | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn index 07b59c3cf..b5ce9c79c 100644 --- a/doc/plugins/mdwn.mdwn +++ b/doc/plugins/mdwn.mdwn @@ -12,7 +12,7 @@ this plugin. The [original version of markdown](http://daringfireball.net/projects/markdown/) can be used, or the [[cpan Text::Markdown]] perl module. -[[cpan Text::Markdown]] also includes a markdown varient called +[[cpan Text::Markdown]] also includes a markdown variant called [multimarkdown](http://fletcherpenney.net/MultiMarkdown/), which supports tables, footnotes, and other new features. Multimarkdown is not enabled by default, but can be turned on via the `multimarkdown` option in the setup diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index cc0894f6d..b82799a4b 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -55,6 +55,10 @@ Bulleted list * four * five +* a new list + * with sub heads + * like this + ---- [[template id=note text="this is generated by the [[plugins/haiku]] plugin"]] |