From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> Date: Mon, 22 Jan 2007 20:33:32 +0000 (+0000) Subject: merge change to basewiki X-Git-Tag: 1.41~65 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d08057d97e11f427507179bb50bfc5187c5a036;p=ikiwiki.git merge change to basewiki --- diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn index c5b3336bc..60216ca93 100644 --- a/basewiki/shortcuts.mdwn +++ b/basewiki/shortcuts.mdwn @@ -6,7 +6,9 @@ This page controls what shortcut links the wiki supports. * [[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=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=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]] +* [[shortcut name=iki url="http://ikiwiki.kitenet.net/%s.html"]] To add a new shortcut, use the "shortcut" preprocessor directive. "%s" is replaced with the text passed to the named shortcut. The optional desc diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn deleted file mode 100644 index 60216ca93..000000000 --- a/doc/shortcuts.mdwn +++ /dev/null @@ -1,15 +0,0 @@ -This page controls what shortcut links the wiki supports. - -* [[shortcut name=google url="http://www.google.com/search?q=%s"]] -* [[shortcut name=wikipedia url="http://en.wikipedia.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=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=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]] -* [[shortcut name=iki url="http://ikiwiki.kitenet.net/%s.html"]] - -To add a new shortcut, use the "shortcut" preprocessor directive. "%s" is -replaced with the text passed to the named shortcut. The optional desc -parameter controls the description of the link.