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 4b0adb4f17bd00d19508c5ac1b7c4876e21c7f25..c6491f754392090dff7b2a08e4883aa9afa085c9 100644 (file)
--- a/doc/plugins/creole.mdwn
+++ b/doc/plugins/creole.mdwn
@@ -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
-[[ikiwiki/directives]] inside `{{{ }}}` blocks are still expanded,
+[[directives|ikiwiki/directive]] inside `{{{ }}}` blocks are still expanded,
 since this happens before the creole format is processed.