jQuery rewrite branch merged into master branch of whole project

6 files changed, 21 insertions, 11 deletions

diff --git a/conf/acronyms.conf b/conf/acronyms.conf
index 13708d2df..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
@@ -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/dokuwiki.php b/conf/dokuwiki.php
index 2405494e0..629e7c0c6 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -99,6 +99,7 @@ $conf['fetchsize']   = 0;                //maximum size (bytes) fetch.php may do
 $conf['notify']      = '';               //send change info to this email (leave blank for nobody)
 $conf['registernotify'] = '';            //send info about newly registered users to this email (leave blank for nobody)
 $conf['mailfrom']    = '';               //use this email when sending mails
+$conf['mailprefix']  = '';               //use this as prefix of outgoing mails
 $conf['gzip_output'] = 0;                //use gzip content encodeing for the output xhtml (if allowed by browser)
 $conf['gdlib']       = 2;                //the GDlib version (0, 1 or 2) 2 tries to autodetect
 $conf['im_convert']  = '';               //path to ImageMagicks convert (will be used instead of GD)
@@ -121,7 +122,7 @@ $conf['rss_linkto'] = 'diff';            //what page RSS entries link to:
                                          //  'page'    - the revised page itself
                                          //  'rev'     - page showing all revisions
                                          //  'current' - most recent revision of page
-$conf['rss_content'] = 'abstract';       // what to put in the items by deafult?
+$conf['rss_content'] = 'abstract';       // what to put in the items by default?
                                          //  'abstract' - plain text, first paragraph or so
                                          //  'diff'     - plain text unified diff wrapped in <pre> tags
                                          //  'htmldiff' - diff as HTML table
@@ -133,6 +134,8 @@ $conf['broken_iua']  = 0;                //Platform with broken ignore_user_abor
 $conf['xsendfile']   = 0;                //Use X-Sendfile (1 = lighttpd, 2 = standard)
 $conf['renderer_xhtml'] = 'xhtml';       //renderer to use for main page generation
 $conf['rememberme'] = 1;                 //Enable/disable remember me on login
+$conf['external_tokenizer'] = 0;         //Use an external program to split pages into words for indexing
+$conf['tokenizer_cmd'] = '/usr/bin/mecab -O wakati';
 
 //Set target to use when creating links - leave empty for same window
 $conf['target']['wiki']      = '';
diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 0e855f626..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,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&amp;task_id=
+dokubug   http://bugs.dokuwiki.org/index.php?do=details&amp;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&amp;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}&amp;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 376d918b2..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|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|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
diff --git a/conf/words.aspell.dist b/conf/words.aspell.dist
deleted file mode 100644
index a49138fcb..000000000
--- a/conf/words.aspell.dist
+++ /dev/null
@@ -1,5 +0,0 @@
-personal_ws-1.1 en 4 utf-8
-DokuWiki
-Wiki
-WikiWiki
-Gohr