aboutsummaryrefslogtreecommitdiff
path: root/basewiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-11-20 07:02:57 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-11-20 07:02:57 +0000
commitaf85816bbc752fea174b9f6cee44d39da28a6d9c (patch)
tree4f5da43f01e067000631f0ee3e93663b51c34a23 /basewiki
parentf1e5ad61acdbd3369b08af6159bb9153793225bb (diff)
downloadikiwiki-af85816bbc752fea174b9f6cee44d39da28a6d9c.tar
ikiwiki-af85816bbc752fea174b9f6cee44d39da28a6d9c.tar.gz
merge basewiki page change into basewiki
Diffstat (limited to 'basewiki')
-rw-r--r--basewiki/shortcuts.mdwn4
1 files changed, 2 insertions, 2 deletions
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.