diff options
| author | Michael Hamann <michael@content-space.de> | 2011-01-23 20:33:32 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-01-23 20:33:32 +0100 |
| commit | fc756e0d4d88b37c01a9155e675a549430b00593 (patch) | |
| tree | 7adc185d2c349788961ff7cb8f9bcb25afbce485 /conf | |
| parent | 8605afb1b4e2a6a9e11e21a7bf0775bbb0d5af03 (diff) | |
| parent | 820923f1328bcfe6002831570eb65238411c5b70 (diff) | |
| download | rpg-fc756e0d4d88b37c01a9155e675a549430b00593.tar.gz rpg-fc756e0d4d88b37c01a9155e675a549430b00593.tar.bz2 | |
Merge branch 'master' into indexer_improvements
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/acronyms.conf | 5 | ||||
| -rw-r--r-- | conf/dokuwiki.php | 3 | ||||
| -rw-r--r-- | conf/interwiki.conf | 1 |
3 files changed, 6 insertions, 3 deletions
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 diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index f10c70e58..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 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} |