merge basewiki page change into basewiki

diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn
index a941dbd13f4a5d5ad9c7ca02d3dd1c9fdeea06a0..cb80c4d40ed5c2449aba170d3a21e22af7cd56ba 100644 (file)
--- a/basewiki/shortcuts.mdwn
+++ b/basewiki/shortcuts.mdwn
@@ -1,4 +1,4 @@
-This page is used to control what shortcut links are supported by the wiki.
+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=google url="http://www.google.com/search?q=%s"]]
 * [[shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]]


@@ -6,4 +6,4 @@ This page is used to control what shortcut links are supported by the wiki.
 * [[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
 * [[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.
+the url becomes the text passed to the named shortcut.

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
deleted file mode 100644 (file)
index cb80c4d..0000000
--- a/doc/shortcuts.mdwn
+++ /dev/null
@@ -1,9 +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"]]
-* [[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 becomes the text passed to the named shortcut.