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

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

diff --git a/doc/plugins/wikitext.mdwn b/doc/plugins/wikitext.mdwn
index abbebb6773e877031bf967af3680c065b49c5d8c..4837121308716938e9160672caa30c799e2a4132 100644 (file)
--- a/doc/plugins/wikitext.mdwn
+++ b/doc/plugins/wikitext.mdwn
@@ -1,8 +1,8 @@
-[[template id=plugin name=wikitext included=1 author="[[Joey]]"]]
-[[tag type/format]]
+[[!template id=plugin name=wikitext author="[[Joey]]"]]
+[[!tag type/format]]
 
 This plugin allows ikiwiki to process pages written in the original wiki
-text format. To use it, you need to have the [[cpan Text::WikiFormat]] perl
+text format. To use it, you need to have the [[!cpan Text::WikiFormat]] perl
 module installed, enable the plugin, then files with the extention `.wiki`
 will be processed as wiki text.
 
@@ -12,7 +12,7 @@ hyphen characters at the start of a line create a horizontal line. Newlines
 turn into the appropriate tags. Headers are matching equals signs around
 the header text -- the more signs, the lesser the header.
 
-Links are standard [[WikiLinks|WikiLink]], although you can also enable
+Links are standard [[WikiLinks|ikiwiki/WikiLink]], although you can also enable
 [[CamelCase]] links.
 
 Lists are indented text, by one tab or four spaces. In unordered lists,