update documentation

diff --git a/INSTALL b/INSTALL
index 80487a4d3090657919ed5704410381a8a38ad132..75237fa1fe97db747dc6da6e75d2c0834404f63f 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -106,9 +106,9 @@ especially if you've previously installed PHP/MySQL packages.
 1. Unpack the tarball you downloaded on your Web server. Usually a
    command like this will work:
 
-       tar zxf statusnet-1.1.0alpha1.tar.gz
+       tar zxf statusnet-1.1.0-alpha1.tar.gz
 
-   ...which will make a statusnet-1.1.0alpha1 subdirectory in your current
+   ...which will make a statusnet-1.1.0-alpha1 subdirectory in your current
    directory. (If you don't have shell access on your Web server, you
    may have to unpack the tarball on your local computer and FTP the
    files to the server.)
@@ -116,7 +116,7 @@ especially if you've previously installed PHP/MySQL packages.
 2. Move the tarball to a directory of your choosing in your Web root
    directory. Usually something like this will work:
 
-       mv statusnet-1.1.0alpha1 /var/www/statusnet
+       mv statusnet-1.1.0-alpha1 /var/www/statusnet
 
    This will make your StatusNet instance available in the statusnet path of
    your server, like "http://example.net/statusnet". "microblog" or

diff --git a/README b/README
index 9b8829618da46df944110bb099a9bc4f1f6fe3ea..b58aaeebc84ef290b2eebc30dc3f2c76410bbfbd 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 README
 ------
 
-StatusNet 1.1.0alpha1
+StatusNet 1.1.0-alpha1
 3 October 2011
 
 This is the README file for StatusNet, the Open Source social
@@ -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-alpha1.
 
 Troubleshooting
 ===============

diff --git a/UPGRADE b/UPGRADE
index 547a24d9fd2a0d7bc66b0484c932bcdf11ba1a98..c50e7622ff5d35bdea84349b72a5fa22559dd7ec 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -24,7 +24,7 @@ instructions; read to the end first before trying them.
 5. Once all writing processes to your site are turned off, make a
    final backup of the Web directory and database.
 6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
-7. Unpack your StatusNet 1.1.0alpha1 tarball and move it to "statusnet" or
+7. Unpack your StatusNet 1.1.0-alpha1 tarball and move it to "statusnet" or
    wherever your code used to be.
 8. Copy the config.php file and the contents of the avatar/, background/,
    file/, and local/ subdirectories from your old directory to your new
@@ -37,7 +37,7 @@ instructions; read to the end first before trying them.
     reversed. YOU CAN EASILY DESTROY YOUR SITE WITH THIS STEP. Don't
     do it without a known-good backup!
 
-    In your new StatusNet 1.1.0alpha1 directory and AFTER YOU MAKE A
+    In your new StatusNet 1.1.0-alpha1 directory and AFTER YOU MAKE A
     BACKUP run the upgrade.php script like this:
 
         php ./scripts/upgrade.php