1.0.0beta2

diff --git a/README b/README
index 194471e5521c1f7066276a85d0f6083f365f2b12..5db5d9bfa2fc5e9aa0a0e666d5caea6b5ef792d8 100644 (file)
--- a/README
+++ b/README
@@ -2,19 +2,19 @@
 README
 ------
 
-StatusNet 0.9.9 "9-9"
+StatusNet 1.0.0beta2
 2 August 2011
 
-This is the README file for StatusNet, the Open Source microblogging
-platform. It includes installation instructions, descriptions of
-options you can set, warnings, tips, and general info for
-administrators. Information on using StatusNet can be found in the
+This is the README file for StatusNet, the Open Source social
+networking platform. It includes installation instructions,
+descriptions of options you can set, warnings, tips, and general info
+for administrators. Information on using StatusNet can be found in the
 "doc" subdirectory or in the "help" section on-line.
 
 About
 =====
 
-StatusNet is a Free and Open Source microblogging platform. It helps
+StatusNet is a Free and Open Source social networking platform. It helps
 people in a community, company or group to exchange short (140
 characters, by default) messages over the Web. Users can choose which
 people to "follow" and receive only their friends' or colleagues'
@@ -474,7 +474,7 @@ off of amd64 to another server.
 Public feed
 -----------
 
-You can send *all* messages from your microblogging site to a
+You can send *all* messages from your social networking site to a
 third-party service using XMPP. This can be useful for providing
 search, indexing, bridging, or other cool services.
 
@@ -614,7 +614,7 @@ Private
 
 The administrator can set the "private" flag for a site so that it's
 not visible to non-logged-in users. This might be useful for
-workgroups who want to share a microblogging site for project
+workgroups who want to share a social networking site for project
 management, but host it on a public server.
 
 Total privacy is not guaranteed or ensured. Also, privacy is
@@ -1733,8 +1733,8 @@ There are several ways to get more information about StatusNet.
 Feedback
 ========
 
-* Microblogging messages to http://support.status.net/ are very welcome.
-* The microblogging group http://identi.ca/group/statusnet is a good
+* Messages to http://support.status.net/ are very welcome.
+* The group http://identi.ca/group/statusnet is a good
   place to discuss the software.
 * StatusNet has a bug tracker for any defects you may find, or ideas for
   making things better. http://status.net/bugs

diff --git a/lib/framework.php b/lib/framework.php
index 7c92d14722096c678f2fe142f0f1e3c342e6930d..3a338ea888c6086fb159d65f4ed7ef97b86b8227 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.0.0');
-define('STATUSNET_LIFECYCLE', 'beta1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_LIFECYCLE', 'beta2'); // '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
@@ -156,4 +156,5 @@ function PEAR_ErrorToPEAR_Exception($err)
     }
     throw new PEAR_Exception($err->getMessage());
 }
+
 PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');