From 886c05d8e8642572af25fee23f414bd31f2e7f3e Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 11 Jul 2013 09:43:22 -0400
Subject: [PATCH] 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 ebb7a60de7..8eb0375502 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -287,10 +287,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>