merge change to basewiki

diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn
index 7dde7919ede27c57dd32ef1b73ddbd21f951c939..a941dbd13f4a5d5ad9c7ca02d3dd1c9fdeea06a0 100644 (file)
--- a/basewiki/shortcuts.mdwn
+++ b/basewiki/shortcuts.mdwn
@@ -3,6 +3,7 @@ This page is used to control what shortcut links are supported by the wiki.
 * [[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"]]
+* [[shortcut name=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]]
 
 To add a new shortcut, use the "shortcut" preprocessor directive. "%s" in
 the url is replaced by the text of the shortcut.

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
deleted file mode 100644 (file)
index a941dbd..0000000
--- a/doc/shortcuts.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-This page is used to control what shortcut links are supported by the wiki.
-
-* [[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"]]
-* [[shortcut name=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]]
-
-To add a new shortcut, use the "shortcut" preprocessor directive. "%s" in
-the url is replaced by the text of the shortcut.