Merge branch '0.8.x' into 0.9.x

Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php

7 files changed, 14 insertions, 14 deletions

diff --git a/doc-src/about b/doc-src/about
index 3036a51b9..21f4dbf15 100644
--- a/doc-src/about
+++ b/doc-src/about
@@ -1,6 +1,6 @@
 %%site.name%% is a
 [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service
-based on the Free Software [Laconica](http://laconi.ca/) tool.
+based on the Free Software [StatusNet](http://status.net/) tool.
 
 If you [register](%%action.register%%) for an account,
 you can post small (140 chars or less) text notices
diff --git a/doc-src/contact b/doc-src/contact
index a8efc456a..31f3a4d2b 100644
--- a/doc-src/contact
+++ b/doc-src/contact
@@ -12,8 +12,8 @@ with "@" plus your user name.
 Bugs
 ----
 
-If you think you've found a bug in the [Laconica](http://laconi.ca/) software,
-or if there's a new feature you'd like to see, add it into the [Laconica bug database](http://laconi.ca/PITS/HomePage). Don't forget to check the list of
+If you think you've found a bug in the [StatusNet](http://status.net/) software,
+or if there's a new feature you'd like to see, add it into the [StatusNet bug database](http://status.net/PITS/HomePage). Don't forget to check the list of
 existing bugs to make sure it hasn't already been reported!
 
 Email
diff --git a/doc-src/faq b/doc-src/faq
index 31582b9f0..6aadd2e60 100644
--- a/doc-src/faq
+++ b/doc-src/faq
@@ -26,7 +26,7 @@ presence. If you don't like how %%site.name%% works, you can take your data and
 Where is feature X?
 -------------------
 
-The software we run, [Laconica](http://laconi.ca/), is still in its early stages,
+The software we run, [StatusNet](http://status.net/), is still in its early stages,
 and many features people expect from microblogging sites are not yet implemented. Some important ones that are expected "soon":
 
 * More [AJAX](http://en.wikipedia.org/wiki/AJAX)-y interface
@@ -36,7 +36,7 @@ and many features people expect from microblogging sites are not yet implemented
 * [Facebook](http://www.facebook.com/) integration
 * Image, video, audio notices
 
-There is [a list of bugs and features](http://laconi.ca/trac/) that you may find
+There is [a list of bugs and features](http://status.net/trac/) that you may find
 interesting. New ideas or complaints are very welcome.
 
 
diff --git a/doc-src/groups b/doc-src/groups
index 645390e0c..772ca9833 100644
--- a/doc-src/groups
+++ b/doc-src/groups
@@ -38,5 +38,5 @@ your phone or IM client if you've set them up to receive notices.
 Remote groups
 -------------
 
-While it's technically possible, this version of Laconica does not
+While it's technically possible, this version of StatusNet does not
 support remote group membership.
diff --git a/doc-src/help b/doc-src/help
index 49b521983..93300ab24 100644
--- a/doc-src/help
+++ b/doc-src/help
@@ -28,6 +28,6 @@ Here are some documents that you might find helpful in understanding
 * [Groups](%%doc.groups%%) - joining together in groups
 * [OpenMicroBlogging](%%doc.openmublog%%) - subscribing to remote users
 * [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy
-* [Source](%%doc.source%%) - How to get the Laconica source code
-* [Badge](%%doc.badge%%) - How to put a Laconica badge on your blog or homepage
+* [Source](%%doc.source%%) - How to get the StatusNet source code
+* [Badge](%%doc.badge%%) - How to put a StatusNet badge on your blog or homepage
 * [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages
\ No newline at end of file
diff --git a/doc-src/openmublog b/doc-src/openmublog
index 6e3abee42..aec532b79 100644
--- a/doc-src/openmublog
+++ b/doc-src/openmublog
@@ -4,8 +4,8 @@ subscribe to notices by users of another service. The protocol, based on
 [OAuth](http://oauth.net/), is open and free, and doesn't depend on any
 central authority to maintain the federated microblogs.
 
-The [Laconica](http://laconi.ca/) software that runs %%site.name%% supports
-OpenMicroBlogging 0.1. Anyone can make a new installation of Laconica on their
+The [StatusNet](http://status.net/) software that runs %%site.name%% supports
+OpenMicroBlogging 0.1. Anyone can make a new installation of StatusNet on their
 own servers, and users of that new installation can subscribe to notices from
 %%site.name%%.
 
diff --git a/doc-src/source b/doc-src/source
index 83debbe53..3ddd6203e 100644
--- a/doc-src/source
+++ b/doc-src/source
@@ -1,12 +1,12 @@
-This service uses a Free microblogging tool called **Laconica**.
-Laconica is available under the [GNU Affero General Public License
+This service uses a Free microblogging tool called **StatusNet**.
+StatusNet is available under the [GNU Affero General Public License
 Version 3.0](http://www.fsf.org/licensing/licenses/agpl-3.0.html), a
 Free Software license for network services.
 
 You can get a copy of the software from the
-[Laconica](http://laconi.ca/) main site. The version of the software
+[StatusNet](http://status.net/) main site. The version of the software
 that runs on *this* site is unmodified from that version. The site
 also depends on certain libraries and other software; you can get
-those at the Laconica site, too.
+those at the StatusNet site, too.