Merge branch 'master' into indexer_rewrite

Conflicts:
	inc/fulltext.php
	inc/indexer.php
	lib/exe/indexer.php

4 files changed, 13 insertions, 3 deletions

diff --git a/conf/acronyms.conf b/conf/acronyms.conf
index 172b9974d..058e85550 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
diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 702696792..28d603de2 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,7 +16,7 @@ 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/
@@ -26,9 +27,13 @@ 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?
diff --git a/conf/smileys.conf b/conf/smileys.conf
index 47e4537e2..80daed57a 100644
--- a/conf/smileys.conf
+++ b/conf/smileys.conf
@@ -18,6 +18,7 @@
 :-X         icon_silenced.gif
 :-|         icon_neutral.gif
 ;-)         icon_wink.gif
+m(          facepalm.gif
 ^_^         icon_fun.gif
 :?:         icon_question.gif
 :!:         icon_exclaim.gif
diff --git a/conf/wordblock.conf b/conf/wordblock.conf
index b3822a29c..fe451f278 100644
--- a/conf/wordblock.conf
+++ b/conf/wordblock.conf
@@ -26,4 +26,7 @@ downgradetowindowsxp\.com
 elegantugg\.com
 classicedhardy\.com
 research-service\.com
-https?:\/\/(\S*?)(2-pay-secure|911essay|academia-research|anypapers|applicationessay|bestbuyessay|bestdissertation|bestessay|bestresume|besttermpaper|businessessay|college-paper|customessay|custom-made-paper|custom-writing|dissertationblog|dissertation-service|dissertations?expert|essaybank|essay-?blog|essaycapital|essaylogic|essaymill|essayontime|essaypaper|essays?land|essaytownsucks|essaywrit|essay-writing-service|fastessays|freelancercareers|genuinecontent|genuineessay|genuinepaper|goessay|grandresume|killer-content|ma-dissertation|managementessay|masterpaper|mightystudent|needessay|researchedge|researchpaper-blog|resumecvservice|resumesexperts|resumesplanet|rushessay|samedayessay|superiorcontent|superiorpaper|superiorthesis|term-paper|termpaper-blog|term-paper-research|thesisblog|universalresearch|valwriting|vdwriters|wisetranslation|writersassembly|writers\.com\.ph|writers\.ph)
+https?:\/\/(\S*?)(2-pay-secure|911essay|academia-research|anypapers|applicationessay|bestbuyessay|bestdissertation|bestessay|bestresume|besttermpaper|businessessay|college-paper|customessay|custom-made-paper|custom-writing|degree-?result|dissertationblog|dissertation-service|dissertations?expert|essaybank|essay-?blog|essaycapital|essaylogic|essaymill|essayontime|essaypaper|essays?land|essaytownsucks|essay-?writ|fastessays|freelancercareers|genuinecontent|genuineessay|genuinepaper|goessay|grandresume|killer-content|ma-dissertation|managementessay|masterpaper|mightystudent|needessay|researchedge|researchpaper-blog|resumecvservice|resumesexperts|resumesplanet|rushessay|samedayessay|superiorcontent|superiorpaper|superiorthesis|term-paper|termpaper-blog|term-paper-research|thesisblog|universalresearch|valwriting|vdwriters|wisetranslation|writersassembly|writers\.com\.ph|writers\.ph)
+flatsinmumbai\.co\.in
+https?:\/\/(\S*?)penny-?stock
+mattressreview\.biz