diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 06:26:31 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 06:26:31 +0200 |
| commit | ea40716aa31cbbb0b5e18a89dabda1e1fef9b39b (patch) | |
| tree | 17b78817e9dbc8a01fcd4b0cb714a6e1346646e7 /shortcuts.mdwn | |
| parent | 099944e5620b5e9ebaf43e1dc53d787289fbf04d (diff) | |
| parent | 70090d29241b365d5532360afed8782d3c7dfd2e (diff) | |
Merge branch 'master' into master-nonedit + drop ikiwiki/directive.mdwn
Diffstat (limited to 'shortcuts.mdwn')
| -rw-r--r-- | shortcuts.mdwn | 4 |
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. |