From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 19 Oct 2006 16:27:17 +0000 (+0000)
Subject: merge change to basewiki
X-Git-Tag: 1.31~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4ad79d8873c21749832c07fab6a0d601ca5a0fa;p=ikiwiki.git

merge change to basewiki
---

diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn
index 7dde7919e..a941dbd13 100644
--- 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
index a941dbd13..000000000
--- 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.