diff options
| author | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
| commit | 86edd73d169600875a10a635ef8df4a644545b0d (patch) | |
| tree | 1216eb826f2da7a1c11d84395f25468d1acfa69c /doc/shortcuts.mdwn | |
| parent | 17b3d73f6e65d6a754633902b0dd4716d53b03a9 (diff) | |
| parent | e40d2a6b2b1bdf677f11cc4a71595acf609d1e75 (diff) | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/shortcuts.mdwn')
| -rw-r--r-- | doc/shortcuts.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index c352f2452..14cd5ff2b 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -60,7 +60,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=man url="http://linux.die.net/man/%s"]] * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]] -To add a new shortcut, use the [[`shortcut`|ikiwiki/directive/shortcut]] +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 |