Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / TwitterBridge / README

diff --git a/plugins/TwitterBridge/README b/plugins/TwitterBridge/README
index 5117cf69ac4e8189b8d81eda674c975a238a2eaf..10ea35b2b658631d233b58ff1d67d390967ad9b2 100644 (file)
--- a/plugins/TwitterBridge/README
+++ b/plugins/TwitterBridge/README
@@ -55,12 +55,20 @@ unless you configure it with a consumer key and secret.)
   password under an older version of StatusNet, but all new Twitter
   bridge connections will use OAuth.
 
-** For multi-site setups you can also set a global consumer key and and
+** For multi-site setups you can also set a global consumer key and
    secret.  The Twitter bridge will fall back on the global key pair if
    it can't find a local pair, e.g.:
 
-   $config['twitter']['global_consumer_key']    = 'YOUR_CONSUMER_KEY'
-   $config['twitter']['global_consumer_secret'] = 'YOUR_CONSUMER_SECRET'
+   $config['twitter']['global_consumer_key']    = 'YOUR_CONSUMER_KEY';
+   $config['twitter']['global_consumer_secret'] = 'YOUR_CONSUMER_SECRET';
+
+Upgrade
+-------
+
+If you've used the Twitter bridge plugin prior to version 0.9.5,
+you'll need to run the new scripts/initialize_notice_to_status.php
+script to initialize the new notice-to-status mapping file, which
+greatly improves the integration between StatusNet and Twitter.
 
 Administration panel
 --------------------