postgres.git / summary / log / commit / refs

commit    02e61a8488de1ac559306db888901f8fa6db0755
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Thu Jul 11 13:43:19 2013 +0000
First released in: 9.4.0, 9.1.10, 9.2.5, 9.3.0

    pg_upgrade: document possible pg_hba.conf options
    Previously, pg_upgrade docs recommended using .pgpass if using MD5
    authentication to avoid being prompted for a password.  Turns out pg_ctl
    never prompts for a password, so MD5 requires .pgpass --- document that.
    Also recommend 'peer' for authentication too.
    Backpatch back to 9.1.


 doc/src/sgml/pgupgrade.sgml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index f2d2d75af39..523fe440841 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -288,10 +288,10 @@ gmake prefix=/usr/local/pgsql.new install
 
     <para>
      <command>pg_upgrade</> will connect to the old and new servers several times,
-     so you might want to set authentication to <literal>trust</> in
-     <filename>pg_hba.conf</>, or if using <literal>md5</> authentication,
-     use a <filename>~/.pgpass</> file (see <xref linkend="libpq-pgpass">)
-     to avoid being prompted repeatedly for a password.
+     so you might want to set authentication to <literal>trust</>
+     or <literal>peer</> in <filename>pg_hba.conf</>, or if using
+     <literal>md5</> authentication, use a <filename>~/.pgpass</> file
+     (see <xref linkend="libpq-pgpass">).
     </para>
    </step>
 


[parent: 583435d07976]