From 32937f3ea03dd163bbcdc6f39efe22ffb760e0d6 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 1 May 2015 14:06:43 +0100
Subject: [PATCH] database config is not kept in separate config file anymore

---
 docs/postgres.rst | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/docs/postgres.rst b/docs/postgres.rst
index d645e1d69..2dcc3caf9 100644
--- a/docs/postgres.rst
+++ b/docs/postgres.rst
@@ -34,19 +34,15 @@ Synapse config
 When you are ready to start using PostgreSQL, add the following line to your
 config file::
 
-    database_config: <db_config_file>
-
-Where ``<db_config_file>`` is the file name that points to a yaml file of the
-following form::
-
-    name: psycopg2
-    args:
-        user: <user>
-        password: <pass>
-        database: <db>
-        host: <host>
-        cp_min: 5
-        cp_max: 10
+    database:
+        name: psycopg2
+        args:
+            user: <user>
+            password: <pass>
+            database: <db>
+            host: <host>
+            cp_min: 5
+            cp_max: 10
 
 All key, values in ``args`` are passed to the ``psycopg2.connect(..)``
 function, except keys beginning with ``cp_``, which are consumed by the twisted