From 649d946bfd6c4feb6a7c8144d3bdff31446e7785 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 21 Nov 2006 15:28:43 +0000 Subject: merge changes back to basewiki --- basewiki/shortcuts.mdwn | 3 +++ doc/shortcuts.mdwn | 13 ------------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 doc/shortcuts.mdwn diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn index cca0df4a3..c5b3336bc 100644 --- a/basewiki/shortcuts.mdwn +++ b/basewiki/shortcuts.mdwn @@ -3,6 +3,9 @@ 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=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]] To add a new shortcut, use the "shortcut" preprocessor directive. "%s" is diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn deleted file mode 100644 index c5b3336bc..000000000 --- a/doc/shortcuts.mdwn +++ /dev/null @@ -1,13 +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=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]] - -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. -- cgit v1.2.3