summaryrefslogtreecommitdiff
path: root/shortcuts.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-30 06:20:06 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-30 06:20:06 +0200
commitba40d7b2d8c254c3136ea5a4ec2b53e8f96a25d0 (patch)
treeec503f773975fa74c489545277881fa6a13fbc0f /shortcuts.mdwn
parent25e4144932b581c4da73b58e269159b58b49108c (diff)
parent70090d29241b365d5532360afed8782d3c7dfd2e (diff)
Merge branch 'master' into scs
Diffstat (limited to 'shortcuts.mdwn')
-rw-r--r--shortcuts.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 037c31e..4bb6774 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -61,13 +61,13 @@ This page controls what shortcut links the wiki supports.
* [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
To add a new shortcut, use the `shortcut`
-[[ikiwiki/PreprocessorDirective]]. In the url, "%s" is replaced with the
+[[ikiwiki/directive]]. In the url, "%s" is replaced with the
text passed to the named shortcut, after url-encoding it, and '%S' is
replaced with the raw, non-encoded text. The optional `desc` parameter
controls the description of the link.
Remember that the `name` you give the shortcut will become a new
-[[ikiwiki/PreprocessorDirective]]. Avoid using a `name` that conflicts
+[[ikiwiki/directive]]. Avoid using a `name` that conflicts
with an existing directive. These directives also accept a `desc`
parameter that will override the one provided at definition time.