From: joey Date: Mon, 20 Nov 2006 07:02:57 +0000 (+0000) Subject: merge basewiki page change into basewiki X-Git-Tag: 1.34~126 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af85816bbc752fea174b9f6cee44d39da28a6d9c;p=ikiwiki.git merge basewiki page change into basewiki --- diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn index a941dbd13..cb80c4d40 100644 --- 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"]] @@ -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 -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 index cb80c4d40..000000000 --- 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.