aboutsummaryrefslogtreecommitdiff
path: root/doc/shortcuts.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-03-03 11:27:59 -0400
committerJoey Hess <joey@kitenet.net>2012-03-03 11:27:59 -0400
commit78737cbfbf91c7b31ed5d216a23de8d360a76392 (patch)
treeeab70ae43573eb03d782e353d9c1134ee892ef1f /doc/shortcuts.mdwn
parent251188cf706f5c9c40e2b4003cd3cd2a777d00ab (diff)
downloadikiwiki-78737cbfbf91c7b31ed5d216a23de8d360a76392.tar
ikiwiki-78737cbfbf91c7b31ed5d216a23de8d360a76392.tar.gz
shortcut: Support Wikipedia's form of url-encoding for unicode characters
I think it's the wrong encoding, seems like mojibake to me, but it works now. Closes: #661198
Diffstat (limited to 'doc/shortcuts.mdwn')
-rw-r--r--doc/shortcuts.mdwn8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 07210f9bf..722c6b141 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -15,7 +15,7 @@ This page controls what shortcut links the wiki supports.
* [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
* [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
* [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
-* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%s"]]
+* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%W"]]
* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
* [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
@@ -69,8 +69,10 @@ 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 [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text. The optional
-`desc` parameter controls the description of the link.
+it, and '%S' is replaced with the raw, non-encoded text.
+Additionally, `%W` is replaced with the text encoded just right for
+Wikipedia. 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