merge changes back to basewiki

diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn
index cca0df4a3f3fcca936903033fae73fccf8d924e8..c5b3336bcb955b9cf964b3060daa869fcc77a511 100644 (file)
--- 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=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
 * [[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 (file)
index c5b3336..0000000
--- 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.