From b66a6bd459cdc006fd7a3c1586f656554ddafbd9 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
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 <dokuwiki@adrianlang.de>
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 <pre> tags
                                          //  'htmldiff' - diff as HTML table
-- 
cgit v1.2.3


From 5526795c71a703486ddd19bf986e6a0cf7309945 Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
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 <anika@selfthinker.org>
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&amp;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