Remove unused variables, update Twitter ones

diff --git a/config.php.sample b/config.php.sample
index 5c5fb5b539341e2aa7e108feb81ddfdde1883ac1..9e0b4e2acae57d4dd6d7cbc54191a917116793ce 100644 (file)
--- 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';