Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2008-05-14 02:42:38 -04:00
commit 6983e05e8f
2 changed files with 5 additions and 1 deletions

View File

@ -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

View File

@ -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"]]