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

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/rebuilddb_psql.sh b/scripts/rebuilddb_psql.sh
index ac169c205..6b15b9212 100755
--- a/scripts/rebuilddb_psql.sh
+++ b/scripts/rebuilddb_psql.sh
@@ -5,7 +5,7 @@
 # below, AND backed up your database. Failure to observe these instructions
 # may result in losing all the data in your database.
 #
-# This script is used to upgrade Laconica's PostgreSQL database to the
+# This script is used to upgrade StatusNet's PostgreSQL database to the
 # latest version. It does the following:
 # 
 #  1. Dumps the existing data to /tmp/rebuilddb_psql.sql
@@ -15,7 +15,7 @@
 #
 # You MUST run this script as the 'postgres' user.
 # You MUST be able to write to /tmp/rebuilddb_psql.sql
-# You MUST specify the laconica database user and database name on the
+# You MUST specify the statusnet database user and database name on the
 # command line, e.g. ./rebuilddb_psql.sh myuser mydbname
 #
 
@@ -27,7 +27,7 @@ cd `dirname $0`
 pg_dump -a -D --disable-trigger $DB > /tmp/rebuilddb_psql.sql
 psql -c "drop schema public cascade; create schema public;" $DB
 psql -c "grant all privileges on schema public to $user;" $DB
-psql $DB < ../db/laconica_pg.sql
+psql $DB < ../db/statusnet_pg.sql
 psql $DB < /tmp/rebuilddb_psql.sql
 for tab in `psql -c '\dts' $DB -tA | cut -d\| -f2`; do
   psql -c "ALTER TABLE \"$tab\" OWNER TO $user;" $DB