Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/plugins/creole.mdwn b/doc/plugins/creole.mdwn
index b2496adad6b6d57cb7cd7ab73da16601699d9483..c6491f754392090dff7b2a08e4883aa9afa085c9 100644 (file)
--- a/doc/plugins/creole.mdwn
+++ b/doc/plugins/creole.mdwn
@@ -1,9 +1,9 @@
-[[template id=plugin name=creole author="BerndZeimetz"]]
-[[tag type/format]]
+[[!template id=plugin name=creole author="BerndZeimetz"]]
+[[!tag type/format]]

 
 This plugin allows ikiwiki to process pages written in
 [WikiCreole](http://www.wikicreole.org/) format.
 
 This plugin allows ikiwiki to process pages written in
 [WikiCreole](http://www.wikicreole.org/) format.

-To use it, you need to have the [[cpan Text::WikiCreole]] perl
+To use it, you need to have the [[!cpan Text::WikiCreole]] perl

 module installed, enable the plugin, then files with the extention `.creole`
 will be processed as creole.
 
 module installed, enable the plugin, then files with the extention `.creole`
 will be processed as creole.
 


@@ -12,5 +12,5 @@ wiki markup formats, so should be fairly easy to guess at. There is also a
 [CheatSheet](http://www.wikicreole.org/wiki/CheatSheet).
 
 Links are standard [[WikiLinks|ikiwiki/WikiLink]]. Links and
 [CheatSheet](http://www.wikicreole.org/wiki/CheatSheet).
 
 Links are standard [[WikiLinks|ikiwiki/WikiLink]]. Links and

-[[PreProcessorDirectives]] inside `{{{ }}}` blocks are still expanded,
+[[directives|ikiwiki/directive]] inside `{{{ }}}` blocks are still expanded,

 since this happens before the creole format is processed.
 since this happens before the creole format is processed.