Pre-alpha version changes

diff --git a/INSTALL b/INSTALL
index 54225ca31521045326e76e97e43b0ba630ba6173..80487a4d3090657919ed5704410381a8a38ad132 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.0.1.tar.gz
+       tar zxf statusnet-1.1.0alpha1.tar.gz
 
-   ...which will make a statusnet-1.0.1 subdirectory in your current
+   ...which will make a statusnet-1.1.0alpha1 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.0.1 /var/www/statusnet
+       mv statusnet-1.1.0alpha1 /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 d08f9ff1ab5797be6e601bdf0126f22f381e4972..9b8829618da46df944110bb099a9bc4f1f6fe3ea 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 README
 ------
 
-StatusNet 1.0.1
+StatusNet 1.1.0alpha1
 3 October 2011
 
 This is the README file for StatusNet, the Open Source social
@@ -107,46 +107,12 @@ for additional terms.
 New this version
 ================
 
-This is a minor bug fix release since 1.0.0, released 30 September
-2011. It fixes the following bugs:
-
-- Change default OEmbed provider from oohembed to noembed.
-- Fix problem with path matching on new installs.
-
-Notable additions in the 1.0.x series:
-
-- Support for private updates, including private-to-groups, private
-  within a site, and private to followers only.
-- Conversation mode in streams; notices appear along with all replies.
-- Microapps -- post different types of activities to timelines, with
-  interaction. Events, bookmarks, Q&A, and polls included by default.
-- New 3-column layout in 'neo' theme by default. Older, 2-column layout
-  themes have been removed.
-- Alphabetical, searchable user directory.
-- Alphabetical, searchable group directory.
-- Groups can require all posts to be private ('private groups'), and
-  limit members to the group.
-- Users can make all posts private to their followers ('private stream'),
-  and require authorization to follow.
-- General plugin for IM support; added AIM, IRC and MSN to existing
-  XMPP code.
-- Support for Twitter-like lists, to follow other users without 
-  interfering with the home timeline.
-- Subscription to searches.
-- Subscription to tags.
-- Drupal-style schema system ("schemax") allows in-place database
-  upgrades from various software versions.
-- Fine-grained control of URL shortening, and an internal URL shortener
-  available.
-- Extended profile for private, enterprise sites.
-- sites are private by default.
-- Blog plugin for extended posts.
-- Plugin to restrict all users of a site to a single email domain.
-- Plugin to send a daily email summary to site users.
-- Deeper integration with Activity Streams (http://activitystrea.ms) format.
-- Automated upgrade script.
-
-A full changelog is available at http://status.net/wiki/StatusNet_1.0.1.
+This is a minor bug fix and feature release since 1.0.1, released 3 October
+2011. It includes the following changes:
+
+- ...
+
+A full changelog is available at http://status.net/wiki/StatusNet_1.1.0alpha1.
 
 Troubleshooting
 ===============

diff --git a/UPGRADE b/UPGRADE
index 17838185f3e0e48a5e26a978216b4817e75b298e..547a24d9fd2a0d7bc66b0484c932bcdf11ba1a98 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,7 +1,7 @@
 Upgrading
 =========
 
-If you've been using StatusNet 0.9.9 or lower, or if you've
+If you've been using StatusNet 1.0 or lower, or if you've
 been tracking the "git" version of the software, you will probably
 want to upgrade and keep your existing data. Try these step-by-step
 instructions; read to the end first before trying them.
@@ -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.0.1 tarball and move it to "statusnet" or
+7. Unpack your StatusNet 1.1.0alpha1 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.0.1 directory and AFTER YOU MAKE A
+    In your new StatusNet 1.1.0alpha1 directory and AFTER YOU MAKE A
     BACKUP run the upgrade.php script like this:
 
         php ./scripts/upgrade.php

diff --git a/lib/framework.php b/lib/framework.php
index 8f5cdf31c648a7a1b0da12128493d9f91b165689..e49842640babf4e4d26170a8368c8a2b345481e1 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -20,7 +20,7 @@
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('STATUSNET_BASE_VERSION', '1.1.0');
-define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_LIFECYCLE', 'alpha1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
 
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility