diff options
| author | Brenda Wallace <shiny@cpan.org> | 2010-03-10 20:47:49 +1300 |
|---|---|---|
| committer | Brenda Wallace <shiny@cpan.org> | 2010-03-10 20:47:49 +1300 |
| commit | 47034553fea0ad760596eae416a675b93dd9380c (patch) | |
| tree | c6750d642cfd5d71b331e4ed7bce29247f1277d6 /config.php.sample | |
| parent | c89ed16d24d56879bf40a70d500509d1d42a4532 (diff) | |
| parent | 9653cb9f0a590417245063f905a2089f03b9e7b2 (diff) | |
Merge commit 'mainline/0.9.x' into 0.9.x
Diffstat (limited to 'config.php.sample')
| -rw-r--r-- | config.php.sample | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.php.sample b/config.php.sample index a4580dabb..20de7ffed 100644 --- a/config.php.sample +++ b/config.php.sample @@ -124,6 +124,8 @@ $config['sphinx']['port'] = 3312; // Email info, used for all outbound email // $config['mail']['notifyfrom'] = 'microblog@example.net'; +// Domain for generating no-reply and incoming email addresses, if enabled. +// Defaults to site server name. // $config['mail']['domain'] = 'microblog.example.net'; // See http://pear.php.net/manual/en/package.mail.mail.factory.php for options // $config['mail']['backend'] = 'smtp'; @@ -131,8 +133,6 @@ $config['sphinx']['port'] = 3312; // 'host' => 'localhost', // 'port' => 25, // ); -// For incoming email, if enabled. Defaults to site server name. -// $config['mail']['domain'] = 'incoming.example.net'; // exponential decay factor for tags, default 10 days // raise this if traffic is slow, lower it if it's fast |