summaryrefslogtreecommitdiff
path: root/config.php.sample
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-05 12:21:30 -0800
committerBrion Vibber <brion@pobox.com>2010-03-05 12:21:30 -0800
commit248aed7cf430d263f3d5dd98552f35f69de6fe67 (patch)
tree773a56f95c8e4644226fa63e0857bcb018ad0566 /config.php.sample
parent89e313e45b1b08fc80ab908e4dd531689319aa6f (diff)
ticket #697: merge two dupe config bits in config.php.sample
Diffstat (limited to 'config.php.sample')
-rw-r--r--config.php.sample4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.php.sample b/config.php.sample
index b8852dc67..33ac94a6d 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