diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 44025474c13..acd708f6389 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.18.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.18.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -193,8 +193,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index e20addc3fb4..da75e9b1510 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.42.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.42.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -244,8 +244,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index 6edaab73c13..c7d255211ab 100644
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.38.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.38.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -174,8 +174,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 880053d6b87..7078865b528 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.45.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.45.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -334,8 +334,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index ea9b91a07d1..65752904cdf 100644
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.28.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.28.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -171,8 +171,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index 0128dca7281..a33e54314bc 100644
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/droplang.sgml,v 1.27.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/droplang.sgml,v 1.27.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -182,8 +182,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index 95be35529ae..84807783236 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.34.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.34.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -174,8 +174,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index 4740a4c72bb..e884e3b87cf 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.37.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.37.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -283,8 +283,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 1103349b07c..e7c9a8320dc 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.35.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.35.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -343,8 +343,8 @@ PostgreSQL documentation
   <para>
    For additional server variables, see <xref linkend="app-postgres">.
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 313f2926611..563a2a9323f 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.92.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.92.2.2 2007/03/26 17:23:44 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -684,8 +684,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 5aae695d146..dfa87446c5a 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.58.2.2 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.58.2.3 2007/03/26 17:23:45 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -358,8 +358,8 @@ PostgreSQL documentation
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 85528ed2545..7d728eef9ec 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.64.2.1 2007/02/20 18:11:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.64.2.2 2007/03/26 17:23:45 tgl Exp $ -->
 
 <refentry id="APP-PGRESTORE">
  <refmeta>
@@ -509,8 +509,8 @@
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 990d8d14a0f..a54a2df89fa 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.175.2.4 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.175.2.5 2007/03/26 17:23:45 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -2681,8 +2681,8 @@ $endif
 
   <para>
    This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <xref 
-   linkend="libpq-envars" endterm="libpq">.
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 1594df0c2bc..c1d707bb353 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -215,10 +215,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   Because <application>psql</application> uses <application>libpq</application>
-   internally, all <application>libpq</application> environment variables are
-   also honored by <application>psql</application>.  For a complete list of those
-   variables, see <xref linkend="libpq-envars">.
+   This utility, like most other <productname>PostgreSQL</> utilities,
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index df874d2b56f..462c88db7ec 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.37.2.1 2007/02/20 18:11:17 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.37.2.2 2007/03/26 17:23:45 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -237,10 +237,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   Because <application>psql</application> uses <application>libpq</application>
-   internally, all <application>libpq</application> environment variables are
-   also honored by <application>psql</application>.  For a complete list of those
-   variables, see <xref linkend="libpq-envars">.
+   This utility, like most other <productname>PostgreSQL</> utilities,
+   also uses the environment variables supported by <application>libpq</>
+   (see <xref linkend="libpq-envars">).
   </para>
 
  </refsect1>