summaryrefslogtreecommitdiff
path: root/shortcuts.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2013-10-09 13:48:19 +0200
committerJonas Smedegaard <dr@jones.dk>2013-10-09 13:48:19 +0200
commit41357710a941da2d24ee40dbea9064d35cf9c8f1 (patch)
tree41e4fbecb3cc98b5c687e4818b8346c63e0384f3 /shortcuts.mdwn
parentf76e2bf0fd821e1a02ca15cfa4f12f0a66f6a3a7 (diff)
parent6aac938c82557d6f42841fa5e98fb80c37922bec (diff)
Merge branch 'ikiwiki' into da
Conflicts (manually resolved): ikiwiki/pagespec.mdwn shortcuts.mdwn
Diffstat (limited to 'shortcuts.mdwn')
-rw-r--r--shortcuts.mdwn4
1 files changed, 1 insertions, 3 deletions
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index cb0ab8d..a5eef18 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -7,7 +7,7 @@ Nogle eksempler på brug af genveje:
\[[!google foo]]
\[[!wikipedia War_of_1812]]
\[[!debbug 12345]]
- Undersøg \[[!cia ikiwiki desc="CIA-siden vedr. %s"]].
+ Undersøg \[[!google ikiwiki desc="google søgning efter %s"]].
Denne side styrer hvilke genveje wikien understøtter.
@@ -54,8 +54,6 @@ Denne side styrer hvilke genveje wikien understøtter.
* [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
* [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
* [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
-* [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]]
-* [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]]
* [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]]
* [[!shortcut name=man url="http://linux.die.net/man/%s"]]
* [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]]