added hook urlpath

[git.ikiwiki.info.git] / doc / shortcuts.mdwn

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index e4e7408970f4b96933666c12c81212da3cc2a84d..14cd5ff2b92ddff7c5d381afe49a3c45bf5cba1c 100644 (file)
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -7,6 +7,7 @@ Some examples of using shortcuts include:
        \[[!google foo]]
        \[[!wikipedia War_of_1812]]
        \[[!debbug 12345]]
        \[[!google foo]]
        \[[!wikipedia War_of_1812]]
        \[[!debbug 12345]]

+       Check the \[[!cia ikiwiki desc="CIA page for %s"]].

 
 This page controls what shortcut links the wiki supports.
 
 
 This page controls what shortcut links the wiki supports.
 


@@ -16,14 +17,17 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]]
 * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]]
 * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]
 * [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]]
 * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]]
 * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]

+* [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]]

 * [[!shortcut name=debbug url="http://bugs.debian.org/%s" desc="bug #%s"]]
 * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
 * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
 * [[!shortcut name=debbug url="http://bugs.debian.org/%s" desc="bug #%s"]]
 * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
 * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]

+* [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]

 * [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
 * [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]]
 * [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
 * [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
   * Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`.  See http://snapshot.debian.net for details.
 * [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
 * [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]]
 * [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
 * [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
   * Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`.  See http://snapshot.debian.net for details.

+* [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]

 * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
 * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
 * [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
 * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
 * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
 * [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]


@@ -53,16 +57,19 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]]
 * [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]]
 * [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]
 * [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]]
 * [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]]
 * [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]

+* [[!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`
 
 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
 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
-with an existing directive.
+[[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.

 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki
 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki