Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / shortcut_link_text.mdwn

diff --git a/doc/todo/shortcut_link_text.mdwn b/doc/todo/shortcut_link_text.mdwn
index 765c445ab438fa4eb2426ca862edd99d9edc8ae1..952e84608e4be06803ae265d22c46a555c53e7a3 100644 (file)
--- a/doc/todo/shortcut_link_text.mdwn
+++ b/doc/todo/shortcut_link_text.mdwn
@@ -1,4 +1,4 @@
-[[plugins/shortcut]] creates link shortcut [[ikiwiki/PreprocessorDirective]]s,
+[[plugins/shortcut]] creates link shortcut [[ikiwiki/Directive]]s,

 which substitute their argument into the specified shortcut URL to generate
 the link target, and use the argument as the link text.  For example, given
 the example [[shortcuts]], `\[[!wikipedia ikiwiki]]` generates a link to
 which substitute their argument into the specified shortcut URL to generate
 the link target, and use the argument as the link text.  For example, given
 the example [[shortcuts]], `\[[!wikipedia ikiwiki]]` generates a link to