Merge 1.1.x into master

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index 9b8829618da46df944110bb099a9bc4f1f6fe3ea..b9ffcbaddbbab375ad449557c3f79ca716f0e5b3 100644 (file)
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 README
 ------
 
-StatusNet 1.1.0alpha1
-3 October 2011
+StatusNet 1.1.0
+2 July 2012
 
 This is the README file for StatusNet, the Open Source social
 networking platform. It includes general information about the
@@ -107,12 +107,23 @@ for additional terms.
 New this version
 ================
 
-This is a minor bug fix and feature release since 1.0.1, released 3 October
-2011. It includes the following changes:
+This is a minor bug fix and feature release since 1.0.1, released 3
+October 2011. (Because the plugin interface has changed in an upwardly
+compatible way, we've incremented the minor version number. See
+http://semver.org/ for the semantic versioning scheme we follow.)
 
-- ...
+It includes the following changes:
 
-A full changelog is available at http://status.net/wiki/StatusNet_1.1.0alpha1.
+- ActivitySpam plugin to check updates against spamicity.info
+- Options to hide users who've been silenced or have posted spammy updates.
+- OfflineBackup experimental plugin.
+- Fixes for TwitterBridge to correctly handle replies through the bridge.
+- Improvements in ActivityStreams JSON output to better match 1.0 spec.
+- Console scripts for managing groups.
+- Bug fix for conversation counts in conversation streams.
+- Rights for moderators to manage spam.
+
+A full changelog is available at http://status.net/wiki/StatusNet_1.1.0.
 
 Troubleshooting
 ===============