diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-08 13:37:45 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-08 13:37:45 -0800 |
| commit | 42463e160d6672f6e5e458a22ddae79b62fa39bf (patch) | |
| tree | e0733a6cbb4d2bac34c2a8fc604e32e5363b41f7 /config.php.sample | |
| parent | ef3991dbbe0acdba2dd7050b99f951ccfe5b8258 (diff) | |
| parent | 7e7d88831cf8b3e8876499b86890da2e63b08c97 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline 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 9e0b4e2ac..75f5c7d55 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 |