From 248aed7cf430d263f3d5dd98552f35f69de6fe67 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 5 Mar 2010 12:21:30 -0800 Subject: ticket #697: merge two dupe config bits in config.php.sample --- config.php.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config.php.sample') 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 -- cgit v1.2.3-54-g00ecf From 5adb494c26e431948b50690b8efaeedb3f3513d1 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 5 Mar 2010 17:05:00 -0800 Subject: Remove unused variables, update Twitter ones --- config.php.sample | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'config.php.sample') diff --git a/config.php.sample b/config.php.sample index 33ac94a6d..3d2a52bec 100644 --- a/config.php.sample +++ b/config.php.sample @@ -188,9 +188,6 @@ $config['sphinx']['port'] = 3312; // Disable SMS // $config['sms']['enabled'] = false; -// Disable Twitter integration -// $config['twitter']['enabled'] = false; - // Twitter integration source attribute. Note: default is StatusNet // $config['integration']['source'] = 'StatusNet'; @@ -198,7 +195,7 @@ $config['sphinx']['port'] = 3312; // // NOTE: if you enable this you must also set $config['avatar']['path'] // -// $config['twitterbridge']['enabled'] = true; +// $config['twitterimport']['enabled'] = true; // Twitter OAuth settings // $config['twitter']['consumer_key'] = 'YOURKEY'; @@ -212,10 +209,6 @@ $config['sphinx']['port'] = 3312; // $config['throttle']['count'] = 100; // $config['throttle']['timespan'] = 3600; -// List of users banned from posting (nicknames and/or IDs) -// $config['profile']['banned'][] = 'hacker'; -// $config['profile']['banned'][] = 12345; - // Config section for the built-in Facebook application // $config['facebook']['apikey'] = 'APIKEY'; // $config['facebook']['secret'] = 'SECRET'; -- cgit v1.2.3-54-g00ecf