diff options
| author | Adrian Lang <dokuwiki@adrianlang.de> | 2011-01-14 21:45:52 +0100 |
|---|---|---|
| committer | Adrian Lang <dokuwiki@adrianlang.de> | 2011-01-14 21:45:52 +0100 |
| commit | 731ae6527af8e2b8cdb211aecac260988e8379e9 (patch) | |
| tree | a44a5637394e7fee3c5835e3955cd716699bbea8 /conf/dokuwiki.php | |
| parent | fa7c70ff4d7f9999466436e7d559eb0c81571779 (diff) | |
| parent | 301971b3769a2d1a440cf58fd84f2c100a1348e3 (diff) | |
| download | rpg-731ae6527af8e2b8cdb211aecac260988e8379e9.tar.gz rpg-731ae6527af8e2b8cdb211aecac260988e8379e9.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'conf/dokuwiki.php')
| -rw-r--r-- | conf/dokuwiki.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 9e289d9bc..538b9f9da 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) |