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.

diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 70dc6c9b14b275b809d3b41094b2c443afd388e0..c628b49d8b1e9ee0ae570ba5188c7c27ac37a275 100644 (file)
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -281,10 +281,10 @@ gmake prefix=/usr/local/pgsql.new install
 
     
      pg_upgrade will connect to the old and new servers several times,
-     so you might want to set authentication to trust in
-     pg_hba.conf, or if using md5 authentication,
-     use a ~/.pgpass file (see )
-     to avoid being prompted repeatedly for a password.
+     so you might want to set authentication to trust
+     or peer in pg_hba.conf, or if using
+     md5 authentication, use a ~/.pgpass file
+     (see ).