more readme fixes

README.md

@@ -1,12 +1,14 @@
 # Social
 
 Contributors: crowdfavorite, alexkingorg
-Tags: comments, facebook, twitter
+Tags: comments, facebook, twitter, social, broadcast, import, integrate, integration
 Requires at least: 3.2
-Tested up to: 3.3.1
-Stable tag: 2.0.1
+Tested up to: 3.3.2
+Stable tag: 2.5
+License: GPLv2
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Broadcast posts to Twitter and/or Facebook, pull in items from each as comments, and allow commenters to use their Twitter/Facebook identities.
+Broadcast posts to Twitter and/or Facebook, pull in reactions from each (replies, retweets, comments, "likes") as comments, and allow commenters to log in with their Twitter/Facebook identities.
 
 ## Description
 
@@ -51,12 +53,6 @@ Please [fork, contribute and file technical bugs on GitHub](https://github.com/c
 5. Make sure your plugin or uploads directory writable to allow the cron jobs to fetch new comments from Twitter and Facebook
 6. (Optional) Register for and add your [Twitter @anywhere API key](http://dev.twitter.com/anywhere) to the settings page to enable Twitter hovercards
 
-## Upgrade Notice
-
-Social 2.0 is a ground-up rewrite from 1.x and a highly recommended upgrade for all users. Enhancements include posting to Facebook Pages, bringing in Facebook Likes, improved Retweet comment display and numerous bug fixes and changes to increase reliability.
-
-If you have customized your Social comment templates or CSS, please refer to the [Upgrade Guide on GitHub](https://github.com/crowdfavorite/wp-social/wiki/Upgrading-from-1.x-to-2.0).
-
 ## Frequently Asked Questions
 
 **Who created this plugin?**
@@ -130,7 +126,7 @@ For both Facebook and Twitter, the final collection of tweets/comments are then
 
 **What tweets will be seen by the Twitter search during aggregation?**
 
-Currently it seems Twitter will only return results using http://example.com/?p=:id and the permalink generated by get_permalink($post_id) if the full link is in the Tweet, or if the URL is minified using t.co URLs. Social can not guarantee that Tweets will be aggregated if any other URL shortening service is used.
+Twitter converts most short URLs to longer URLs, so searches by the final URL will typically find all of the tweets you want. Social also explicitly searches by the short link for the post (using whatever short link generator or plugin was active when the post was broadcast).
 
 **What CRON jobs are built into Social?**
 
@@ -243,8 +239,25 @@ This is because we completely refactored Social's codebase for 2.0. Chances are
 
 For a more in-depth look at what you need to be aware of when upgrading from 1.x to 2.0 please have a look at the wiki entry: https://github.com/crowdfavorite/wp-social/wiki/Upgrading-from-1.x-to-2.0
 
+** How do I include Facebook Likes and Twitter Retweets in my comments feed? **
+
+The following code should add "meta" comments such as Likes as Retweets to your comments RSS and Atom feeds:
+
+	function social_enable_meta_comments_in_feed() {
+		$social = Social::instance();
+		remove_filter('comment_feed_where', array($social, 'comments_feed_exclusions'));
+	}
+	add_action('init', 'social_enable_meta_comments_in_feed');
+
+= Does Social output Facebook Open Graph tags for my site? =
+
+No it does not. If you would like to have these tags on your site, please install one of the many available plugins that add this feature.
 
-## Screenshots=
+= I have a lot of comments and loading the avatars makes the page load slowly, what can I do? =
+
+Social supports the [Lazy Load plugin](http://wordpress.org/extend/plugins/lazy-load/). Install this plugin and Social's avatars will hang out on the couch eating potato chips and watching TV until they are needed.
+
+## Screenshots
 
 1. Allow your visitors to leave a comment as their Facebook or Twitter identities
 
@@ -254,8 +267,34 @@ For a more in-depth look at what you need to be aware of when upgrading from 1.x
 
 4. View of replies imported from Twitter as comments, @anywhere support 
 
+## Upgrade Notice
+
+** 2.5 **
+
+This version fixes an issue where users could be authenticated incorrectly (they would be logged in as someone else) when more than one user was logging in at exactly the same time. We also added a bunch of great new features and enhancements, as well as changes to improve reliability.
+
 ## Changelog
 
+**2.5**
+
+* Fix race condition that could cause users to be authenticated as the wrong user when both requests happened simultaneously.
+* Improve Facebook posting (post links with comments and broadcasts, except for status posts)
+* Improve Social as a platform (can disable broadcasting, comment display, comment importing, "add an account" alert is dismissable)
+* Revise broadcasting screen to allow sending different messages to each account
+* Revise account management UI
+* Add a Manual Tweet Import field on the front-end (via admin bar)
+* Twitter search expanded to receive 100 results per request
+* Import replies via Twitter to broadcasted comments (if found)
+* Automatically select proper social account when replying to a comment
+* When posting a comment back to Facebook, attempt to reply in an existing comment thread where appropriate
+* Automatically check the "broadcast" box when replying to a social comment and authenticated as a user on the same social network
+* Don't include Retweet and Like comments in comment RSS/Atom feeds
+* Improved relative date functions for comments (3 months ago, etc.)
+* Support lazy loading of avatars (via plugin)
+* Change comment header title based on context (creating a new comment, replying to a comment, etc.)
+* Fix issue causing reactions to Facebook broadcasts to not be imported consistently as comments 
+* Various bug fixes and improvements
+
 **2.0.1**
 
 * Localization fixes (props thomasclausen)
@@ -288,10 +327,10 @@ For a more in-depth look at what you need to be aware of when upgrading from 1.x
 
 **1.0.1**
 
-- Automatic CRON jobs now run correctly.
-- Facebook replies to broadcasted posts are now aggregated.
-- Miscellaneous bug fixes.
+* Automatic CRON jobs now run correctly.
+* Facebook replies to broadcasted posts are now aggregated.
+* Miscellaneous bug fixes.
 
 **1.0**
 
-- Initial release
+* Initial release

readme.txt

@@ -52,12 +52,6 @@ Please [fork, contribute and file technical bugs on GitHub](https://github.com/c
 5. Make sure your plugin or uploads directory writable to allow the cron jobs to fetch new comments from Twitter and Facebook
 6. (Optional) Register for and add your [Twitter @anywhere API key](http://dev.twitter.com/anywhere) to the settings page to enable Twitter hovercards
 
-== Upgrade Notice ==
-
-Social 2.0 is a ground-up rewrite from 1.x and a highly recommended upgrade for all users. Enhancements include posting to Facebook Pages, bringing in Facebook Likes, improved Retweet comment display and numerous bug fixes and changes to increase reliability.
-
-If you have customized your Social comment templates or CSS, please refer to the [Upgrade Guide on GitHub](https://github.com/crowdfavorite/wp-social/wiki/Upgrading-from-1.x-to-2.0).
-
 == Frequently Asked Questions ==
 
 = Who created this plugin? =
@@ -275,7 +269,7 @@ Social supports the [Lazy Load plugin](http://wordpress.org/extend/plugins/lazy-
 == Upgrade Notice ==
 
 = 2.5 =
-This version fixes an issue where users could be authenticated incorrectly (they would be logged in as someone else) when more than one user was logging in at exactly the same time.
+This version fixes an issue where users could be authenticated incorrectly (they would be logged in as someone else) when more than one user was logging in at exactly the same time. We also added a bunch of great new features and enhancements, as well as changes to improve reliability.
 
 == Changelog ==