From 3a42f32134c305c1ba7947c53c23839f5dc3985f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 8 May 2015 13:47:48 +0100
Subject: Reword port script usage

---
 docs/postgres.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/postgres.rst b/docs/postgres.rst
index 2dcc3caf9e..76a76cbb54 100644
--- a/docs/postgres.rst
+++ b/docs/postgres.rst
@@ -82,8 +82,8 @@ complete, restart synapse.  For instance::
     cp homeserver.db homeserver.db.snapshot
     ./synctl start
 
-Assuming your database config file (as described in the section *Synapse
-config*) is named ``database_config.yaml`` and the SQLite snapshot is at
+Assuming your new config file (as described in the section *Synapse config*)
+is named ``homeserver-postgres.yaml`` and the SQLite snapshot is at
 ``homeserver.db.snapshot`` then simply run::
 
     python scripts/port_from_sqlite_to_postgres.py \
-- 
cgit 1.5.1


From 22a7ba8b22082503f2521c135168e1fb644efa60 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 8 May 2015 13:50:03 +0100
Subject: Actually rename all isntances

---
 docs/postgres.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/postgres.rst b/docs/postgres.rst
index 76a76cbb54..19d8391115 100644
--- a/docs/postgres.rst
+++ b/docs/postgres.rst
@@ -88,7 +88,7 @@ is named ``homeserver-postgres.yaml`` and the SQLite snapshot is at
 
     python scripts/port_from_sqlite_to_postgres.py \
         --sqlite-database homeserver.db.snapshot \
-        --postgres-config database_config.yaml
+        --postgres-config homeserver-postgres.yaml
 
 The flag ``--curses`` displays a coloured curses progress UI.
 
-- 
cgit 1.5.1


From d79ffa1898ab78f0d9be77865d5402697171bd2a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 9 May 2015 14:45:37 +0100
Subject: typo

---
 docs/application_services.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/application_services.rst b/docs/application_services.rst
index a57bae6194..7e87ac9ad6 100644
--- a/docs/application_services.rst
+++ b/docs/application_services.rst
@@ -20,7 +20,7 @@ The format of the AS configuration file is as follows:
 
     url: <base url of AS>
     as_token: <token AS will add to requests to HS>
-    hs_token: <token HS will ad to requests to AS>
+    hs_token: <token HS will add to requests to AS>
     sender_localpart: <localpart of AS user>
     namespaces:
       users:  # List of users we're interested in
-- 
cgit 1.5.1