summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-10-19 16:27:17 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-10-19 16:27:17 +0000
commitf4ad79d8873c21749832c07fab6a0d601ca5a0fa (patch)
treee3094a44679e09a5f647e5827b60c0c61ea5eedb
parent436c3fbefcaf06bf68d8e79813f68951039a1cff (diff)
merge change to basewiki
-rw-r--r--basewiki/shortcuts.mdwn1
-rw-r--r--doc/shortcuts.mdwn9
2 files changed, 1 insertions, 9 deletions
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.