diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-02-13 18:51:16 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-02-13 18:51:16 +0100 |
| commit | d605920733633a63372aab20a971d0437bf8f2fa (patch) | |
| tree | 8b71e4127f8d26f249c6f3583ca9bb23cf8ebad4 /conf | |
| parent | 93e911cc0a3e855e85dfd6b2252ad9bf4cc5ed11 (diff) | |
| parent | 023e47d6f2d7d5b726cf38fd83805eedf55a8075 (diff) | |
| download | rpg-d605920733633a63372aab20a971d0437bf8f2fa.tar.gz rpg-d605920733633a63372aab20a971d0437bf8f2fa.tar.bz2 | |
Merge branch 'master' of https://github.com/lupo49/dokuwiki into lupo49-master
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/interwiki.conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/conf/interwiki.conf b/conf/interwiki.conf index b14bfef9f..6def35949 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -5,7 +5,8 @@ # no further encoding is done # If no placeholder is defined the urlencoded name is appended to the URL -# You can add more InterWiki shortcuts here. +# To prevent losing your added InterWiki shortcuts after an upgrade, +# you should add new ones to interwiki.local.conf wp http://en.wikipedia.org/wiki/{NAME} wpfr http://fr.wikipedia.org/wiki/{NAME} @@ -29,6 +30,9 @@ sb http://www.splitbrain.org/go/ google.de http://www.google.de/search?q= go http://www.google.com/search?q={URL}&btnI=lucky +# To support VoIP/SIP links +callto callto://{NAME} + # Standards from http://usemod.com/intermap.txt follow AbbeNormal http://www.ourpla.net/cgi-bin/pikie.cgi? |