From: Simon Riggs <simon@2ndQuadrant.com>
Date: Fri, 19 Mar 2010 19:31:06 +0000 (+0000)
Subject: Clarify docs about database parameter in streaming replication primary_conninfo.
X-Git-Tag: REL9_0_ALPHA5~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f42ddc477297a6cac9cc403a65b268f2b578b621;p=postgresql

Clarify docs about database parameter in streaming replication primary_conninfo.
Docs were unclear on whether or not database=replication was required,
nor did they mention the FATAL error this causes if database parameter is
mentioned explicitly, whatever its value.
---

diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index ddad438b15..00f2779229 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.53 2010/03/02 21:18:59 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.54 2010/03/19 19:31:06 sriggs Exp $ -->
 
 <chapter id="high-availability">
  <title>High Availability, Load Balancing, and Replication</title>
@@ -922,6 +922,11 @@ host    replication     foo             192.168.1.100/32        md5
 # and port 5432 as the user "foo" whose password is "foopass".
 primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass'
 </programlisting>
+
+      You do not need to specify <literal>database=replication</> in the
+      <varname>primary_conninfo</varname>. The required option will be added
+      automatically. If you mention the database parameter at all within
+      <varname>primary_conninfo</varname> then a FATAL error will be raised.
     </para>
    </sect2>
   </sect1>