diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-11-21 15:28:43 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-11-21 15:28:43 +0000 |
| commit | 649d946bfd6c4feb6a7c8144d3bdff31446e7785 (patch) | |
| tree | f6ab7fe47b556ef76d0682002472db2d7d73e152 | |
| parent | 677c6bf76d572648e04e456536a2f83f1a689f92 (diff) | |
| download | ikiwiki-649d946bfd6c4feb6a7c8144d3bdff31446e7785.tar ikiwiki-649d946bfd6c4feb6a7c8144d3bdff31446e7785.tar.gz | |
merge changes back to basewiki
| -rw-r--r-- | basewiki/shortcuts.mdwn | 3 | ||||
| -rw-r--r-- | doc/shortcuts.mdwn | 13 |
2 files changed, 3 insertions, 13 deletions
diff --git a/basewiki/shortcuts.mdwn b/basewiki/shortcuts.mdwn index cca0df4a3..c5b3336bc 100644 --- a/basewiki/shortcuts.mdwn +++ b/basewiki/shortcuts.mdwn @@ -3,6 +3,9 @@ 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" desc="bug #%s"]] +* [[shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] +* [[shortcut name=debpkg url="http://packages.debian.org/%s"]] +* [[shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%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" is diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn deleted file mode 100644 index c5b3336bc..000000000 --- a/doc/shortcuts.mdwn +++ /dev/null @@ -1,13 +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" desc="bug #%s"]] -* [[shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] -* [[shortcut name=debpkg url="http://packages.debian.org/%s"]] -* [[shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%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" is -replaced with the text passed to the named shortcut. The optional desc -parameter controls the description of the link. |