From df61352eb6753f990519f0d9439429362efa3ce5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 7 Nov 2010 10:56:34 +0100 Subject: spam list update --- conf/wordblock.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/wordblock.conf b/conf/wordblock.conf index 376d918b2..b3822a29c 100644 --- a/conf/wordblock.conf +++ b/conf/wordblock.conf @@ -26,4 +26,4 @@ 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|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) -- cgit v1.2.3 From 1c07b9e622d139fa815c955c89569f96342475fb Mon Sep 17 00:00:00 2001 From: Tom N Harris Date: Tue, 16 Nov 2010 18:09:53 -0500 Subject: Use external program to split pages into words An external tokenizer inserts extra spaces to mark words in the input text. The text is sent through STDIN and STDOUT file handles. A good choice for Chinese and Japanese is MeCab. http://sourceforge.net/projects/mecab/ With the command line 'mecab -O wakati' --- conf/dokuwiki.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 2405494e0..f10c70e58 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -133,6 +133,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'] = ''; -- cgit v1.2.3 From b66a6bd459cdc006fd7a3c1586f656554ddafbd9 Mon Sep 17 00:00:00 2001 From: Matthias Schulte Date: Tue, 30 Nov 2010 20:05:49 +0100 Subject: fixed abbreviation FS#2108 / added RFC --- conf/acronyms.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/acronyms.conf b/conf/acronyms.conf index 13708d2df..172b9974d 100644 --- a/conf/acronyms.conf +++ b/conf/acronyms.conf @@ -71,8 +71,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 +101,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 -- cgit v1.2.3 From b5a0be432b07d64035ca80b606debad9ccdbd664 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 7 Dec 2010 08:30:50 +0100 Subject: =?UTF-8?q?Various=20changes=20to=20feed.php=E2=80=99s=20parameter?= =?UTF-8?q?=20handling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Do not emit E_NOTICEs * Introduce explicit feed mode default value »recent« instead of handling every unknown feed mode as recent changes mode. This means: - FEED_MODE_UNKNOWN is only executed if the given feed mode is indeed unknown. This is specifically not the case if no feed mode request param has been specified or the requested feed mode is »recent«. - FEED_MODE_UNKNOWN dies with an error as default behaviour * opt[items] is forced to be a non-negative integer * opt[show_minor] is forced to be a boolean and thus has a default value of false instead of null --- conf/dokuwiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 2405494e0..9e289d9bc 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -121,7 +121,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 
 tags
                                          //  'htmldiff' - diff as HTML table
-- 
cgit v1.2.3


From 5526795c71a703486ddd19bf986e6a0cf7309945 Mon Sep 17 00:00:00 2001
From: Guy Brand 
Date: Fri, 31 Dec 2010 15:46:43 +0100
Subject: Allow a prefix for subject of sent mails (Close FS#2021)

---
 conf/dokuwiki.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf')

diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 2405494e0..90fbb8174 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)
-- 
cgit v1.2.3


From 8480b938f50a6dce0c9944a1433f6728a555b4a1 Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Tue, 4 Jan 2011 23:01:24 +0000
Subject: added paypal interwiki links

usage: [[paypal>email@address.com]]
---
 conf/interwiki.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf')

diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 0e855f626..702696792 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -21,6 +21,7 @@ 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}
-- 
cgit v1.2.3


From 3c896238111421b5906a3155de5736d62d830221 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Wed, 26 Jan 2011 14:33:04 +0100
Subject: adjusted dokubug> interwiki URL

---
 conf/interwiki.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 702696792..b14bfef9f 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -15,7 +15,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/
-- 
cgit v1.2.3


From 28ac81641d6db55bfadc51abf2ff97157c3cfdf4 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Mon, 7 Feb 2011 22:24:54 +0100
Subject: added one of the most important smileys

---
 conf/smileys.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf')

diff --git a/conf/smileys.conf b/conf/smileys.conf
index 47e4537e2..5ff230e60 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
-- 
cgit v1.2.3


From 0411c186caeff3347eccfa98d5cacc280a356d20 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Tue, 8 Feb 2011 09:00:41 +0100
Subject: that smiley was far too happy

---
 conf/smileys.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/smileys.conf b/conf/smileys.conf
index 5ff230e60..80daed57a 100644
--- a/conf/smileys.conf
+++ b/conf/smileys.conf
@@ -18,7 +18,7 @@
 :-X         icon_silenced.gif
 :-|         icon_neutral.gif
 ;-)         icon_wink.gif
-m)          facepalm.gif
+m(          facepalm.gif
 ^_^         icon_fun.gif
 :?:         icon_question.gif
 :!:         icon_exclaim.gif
-- 
cgit v1.2.3


From 95412639d7371a2448aa3c791d9bb3c5e00f1b57 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Wed, 9 Feb 2011 18:34:28 +0100
Subject: added some spammers to the blacklist

---
 conf/wordblock.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'conf')

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
-- 
cgit v1.2.3


From 023e47d6f2d7d5b726cf38fd83805eedf55a8075 Mon Sep 17 00:00:00 2001
From: lupo49 
Date: Fri, 11 Feb 2011 16:18:20 +0100
Subject: Support for VoIP/SIP callto-links (FS#2167)

---
 conf/interwiki.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'conf')

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?
-- 
cgit v1.2.3


From d56f5396654e167eb635689cc3dbbd37c632e601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= 
Date: Sun, 13 Feb 2011 13:21:13 +0200
Subject: Add LAN

---
 conf/acronyms.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf')

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
-- 
cgit v1.2.3


From 9a75132c18b2137de6b86433baed5735c8516751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= 
Date: Sun, 13 Feb 2011 13:27:42 +0200
Subject: Add skype interwiki

---
 conf/interwiki.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'conf')

diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 6def35949..28d603de2 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -27,6 +27,7 @@ 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
 
-- 
cgit v1.2.3


From 5e5debec39d4912761954435b4cded9b5b41263a Mon Sep 17 00:00:00 2001
From: Anika Henke 
Date: Sat, 5 Mar 2011 11:31:58 +0000
Subject: deleted obsolete word list conf file for old spellchecker

---
 conf/words.aspell.dist | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 conf/words.aspell.dist

(limited to 'conf')

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
-- 
cgit v1.2.3