From 00a8eb61a254f620dbf4ba5de2f33831f159cdeb Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 4 Sep 2012 09:17:19 -0400
Subject: [PATCH] Document that pg_upgrade requires PGHOST be set for any
 pre-9.1 servers with a socket directory mismatch with the new server.

Backpatch to 9.2.
---
 doc/src/sgml/pgupgrade.sgml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 9e43f3ce13..301222c55d 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -520,11 +520,10 @@ psql --username postgres --file script.sql postgres
   </para>
 
   <para>
-   If doing <option>--check</> with a running old server of a pre-9.1 version,
-   and the old server is using a Unix-domain socket directory that is
-   different from the default built into the new <productname>PostgreSQL</>
-   installation, set <envar>PGHOST</> to point to the socket location of the
-   old server.  (This is not relevant on Windows.)
+   If using a pre-9.1 old server that is using a non-default Unix-domain
+   socket directory or a default that differs from the default of the
+   new cluster, set <envar>PGHOST</> to point to the old server's socket
+   location.  (This is not relevant on Windows.)
   </para>
 
   <para>