Merge commit 'upstream/master'

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

diff --git a/doc/plugins/wikitext.mdwn b/doc/plugins/wikitext.mdwn
index 34467cf8e48b1f46c536a7701aec4739c9eee985..4837121308716938e9160672caa30c799e2a4132 100644 (file)
--- a/doc/plugins/wikitext.mdwn
+++ b/doc/plugins/wikitext.mdwn
@@ -1,8 +1,8 @@
-[[template id=plugin name=wikitext 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
 
 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.
 
 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.
 
 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,
 [[CamelCase]] links.
 
 Lists are indented text, by one tab or four spaces. In unordered lists,