[Xfce4-commits] <wiki:master> Updates for new stable release.

[Nick Schermer]

Updating branch refs/heads/master
         to 93c2a3b9bca1fa67c34541037fabe29cebbf156c (commit)
       from 2494b538b322c651be6006785c0e3eab34001b95 (commit)

commit 93c2a3b9bca1fa67c34541037fabe29cebbf156c
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Jun 22 12:09:49 2013 +0200

    Updates for new stable release.

 .gitignore          |   16 ++++++++++++----
 conf/acronyms.conf  |    6 ++++--
 conf/interwiki.conf |   10 ++++++++--
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4255ba..c1412f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 #
 # Ignore files from the default docuwiki installation.
 #
-
-.htaccess
-.htaccess.dist
 COPYING
 README
 VERSION
@@ -21,6 +18,8 @@ conf/mime.conf
 conf/msg
 conf/mysql.conf.php.example
 conf/scheme.conf
+conf/plugins.php
+conf/plugins.required.php
 conf/smileys.conf
 conf/users.auth.php
 conf/users.auth.php.dist
@@ -29,14 +28,22 @@ conf/words.aspell.dist
 data/
 doku.php
 feed.php
-inc/
 index.php
 install.php
+inc/
 lib/_fla/
 lib/exe/
 lib/images/
 lib/index.html
 lib/plugins/acl/
+lib/plugins/auth.php
+lib/plugins/authad/
+lib/plugins/authldap/
+lib/plugins/authmysql/
+lib/plugins/authpgsql/
+lib/plugins/authplain/
+lib/plugins/remote.php
+lib/plugins/testing/
 lib/plugins/action.php
 lib/plugins/admin.php
 lib/plugins/config/
@@ -51,4 +58,5 @@ lib/plugins/safefnrecode/
 lib/scripts/
 lib/styles/
 lib/tpl/default/
+lib/tpl/dokuwiki/
 lib/tpl/index.php
diff --git a/conf/acronyms.conf b/conf/acronyms.conf
index 13708d2..058e855 100644
--- a/conf/acronyms.conf
+++ b/conf/acronyms.conf
@@ -62,6 +62,7 @@ JPEG         Joint Photographics Experts Group
 JPG          Joint Photographics Experts Group
 JS           JavaScript
 KISS         Keep it simple stupid
+LAN          Local Area Network
 LDAP         Lightweight Directory Access Protocol
 LGPL         GNU Lesser General Public License
 LOL          Laughing out loud
@@ -71,8 +72,8 @@ MHz          Megahertz
 MIME         Multipurpose Internet Mail Extension
 MIT          Massachusetts Institute of Technology
 MML          Mathematical Markup Language
-MP3          Motion Picture Experts Group Layer 3
-MPEG         Motion Picture Experts Group
+MP3          Moving Picture Experts Group Layer 3
+MPEG         Moving Picture Experts Group
 MSDN         Microsoft Developer Network
 MS           Microsoft
 MSIE         Microsoft Internet Explorer
@@ -101,6 +102,7 @@ POP          Post Office Protocol
 QoS          Quality of Service
 RAID         Redundant Array of Inexpensive Disks
 RDF          Resource Description Framework
+RFC          Request for Comments
 ROTFL        Rolling on the floor laughing
 RPC          Remote Procedure Call
 RSS          Rich Site Summary
diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 0e855f6..28d603d 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}
@@ -15,19 +16,24 @@ wppl      http://pl.wikipedia.org/wiki/{NAME}
 wpjp      http://ja.wikipedia.org/wiki/{NAME}
 wpmeta    http://meta.wikipedia.org/wiki/{NAME}
 doku      http://www.dokuwiki.org/
-dokubug   http://bugs.splitbrain.org/index.php?do=details&task_id=
+dokubug   http://bugs.dokuwiki.org/index.php?do=details&task_id=
 rfc       http://www.cs.ccu.edu.tw/~chm91u/rfc2html.php?in=
 man       http://man.cx/
 amazon    http://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/
 amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
 amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/
+paypal    https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=
 phpfn     http://www.php.net/{NAME}
 coral     http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY}
 freecache http://freecache.org/{NAME}
 sb        http://www.splitbrain.org/go/
+skype     skype:{NAME}
 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?