From 3f09bb8d27d509c25e4cbeef92ad454582579851 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Fri, 18 Jul 2014 16:05:17 -0400
Subject: [PATCH] Limit pg_upgrade authentication advice to always-secure
 techniques.

~/.pgpass is a sound choice everywhere, and "peer" authentication is
safe on every platform it supports.  Cease to recommend "trust"
authentication, the safety of which is deeply configuration-specific.
Back-patch to 9.0, where pg_upgrade was introduced.
---
 doc/src/sgml/pgupgrade.sgml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 6012523dbc..9a670d38c0 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -252,10 +252,9 @@ gmake prefix=/usr/local/pgsql.new install
     <title>Adjust authentication</title>
 
     <para>
-     <command>pg_upgrade</> will connect to the old and new servers several times,
-     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
+     <command>pg_upgrade</> will connect to the old and new servers several
+     times, so you might want to set authentication to <literal>peer</>
+     in <filename>pg_hba.conf</> or use a <filename>~/.pgpass</> file
      (see <xref linkend="libpq-pgpass">).
     </para>
    </step>
@@ -355,8 +354,7 @@ pg_upgrade.exe
     <title>Restore <filename>pg_hba.conf</></title>
 
     <para>
-     If you modified <filename>pg_hba.conf</> to use <literal>trust</>,
-     restore its original authentication settings.
+     If you modified <filename>pg_hba.conf</>, restore its original settings.
     </para>
    </step>
 
-- 
2.50.0