summaryrefslogtreecommitdiff
path: root/doc/shortcuts.mdwn
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-08-30 03:02:15 -0400
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-08-30 03:02:15 -0400
commitc36d2fa896e9ea42c0b6b0135ba04b4f4f60950f (patch)
tree22f1314d8e974c73bde4970c97d497628f2a1465 /doc/shortcuts.mdwn
parent5e94e973eeb4ba75d9c37bd801278f686f0977c3 (diff)
parent517432273b96fc9e6bad9b7667ef6d1b04c699ee (diff)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
Diffstat (limited to 'doc/shortcuts.mdwn')
-rw-r--r--doc/shortcuts.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 14cd5ff2b..500146a31 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -62,9 +62,9 @@ This page controls what shortcut links the wiki supports.
To add a new shortcut, use the `shortcut`
[[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.
+text passed to the named shortcut, after [[!wikipedia 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/directive]]. Avoid using a `name` that conflicts
@@ -73,5 +73,5 @@ parameter that will override the one provided at definition time.
If you come up with a shortcut that you think others might find useful,
consider contributing it to the [shortcuts page on the ikiwiki
-ikiwiki](http://ikiwiki.info/shortcuts/), so that future versions of
+wiki](http://ikiwiki.info/shortcuts/), so that future versions of
ikiwiki will include your shortcut in the standard underlay.