diff options
author | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
---|---|---|
committer | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
commit | 16a774a8a61756df2d8fb813bfbaed98b42e3e65 (patch) | |
tree | 3a48d311e74ccbf4017330cef8af00003b0ddb34 /conf/dokuwiki.php | |
parent | 662a7b3fcc22d8327026bc1ef161a096683f1580 (diff) | |
parent | a5a71ecfcc1ed6bfca1995b39cd0abe4b8dd9eeb (diff) | |
download | rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.gz rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.bz2 |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'conf/dokuwiki.php')
-rw-r--r-- | conf/dokuwiki.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index e90e4fc23..298c8e572 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -20,6 +20,7 @@ $conf['basedir'] = ''; //absolute dir from serveroot - blank $conf['baseurl'] = ''; //URL to server including protocol - blank for autodetect $conf['savedir'] = './data'; //where to store all the files $conf['allowdebug'] = 0; //allow debug output, enable if needed 0|1 +$conf['mediarevisions'] = 1; //enable/disable media revisions /* Display Options */ @@ -108,6 +109,7 @@ $conf['subscribers'] = 0; //enable change notice subscription sup $conf['subscribe_time'] = 24*60*60; //Time after which digests / lists are sent (in sec, default 1 day) //Should be smaller than the time specified in recent_days $conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0 +$conf['cssdatauri'] = 0; //Maximum byte size of small images to embed into CSS, won't work on IE<8 $conf['hidepages'] = ''; //Regexp for pages to be skipped from RSS, Search and Recent Changes $conf['send404'] = 0; //Send a HTTP 404 status for non existing pages? $conf['sitemap'] = 0; //Create a google sitemap? How often? In days. |