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

[ikiwiki.git] / doc / plugins / mdwn.mdwn

diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn
index 34c688ce1e8b1d5209e60c4571b5bc38e0e29fcf..07b59c3cf3907435eb216f92aa43732dff3eceb8 100644 (file)
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@@ -1,8 +1,20 @@
-[[template id=plugin name=mdwn core=1 included=1 author="""[[Joey]]"""]]
-[[tag type/format type/core]]
+[[template id=plugin name=mdwn core=1 author="[[Joey]]"]]
+[[tag type/format]]
 
 This plugin lets ikwiki convert files with names ending in ".mdwn" to html.
-It uses the [[markdown]] minimal markup language.
+It uses the [[ikiwiki/markdown]] minimal markup language.
 
 This is the standard markup language used by ikiwiki, although some others
 are also available in other plugins.
+
+There are several implementations of markdown support that can be used by
+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
+[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
+file. Note that multimarkdown's metadata and wikilinks features are
+disabled when it's used with ikiwiki.