diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 7db333b749f..fd27b3efe87 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.20 2007/02/21 23:21:11 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.21 2007/03/26 17:23:36 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 62bdf5671e0..02a3a7948f1 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.43 2007/02/20 18:10:58 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.44 2007/03/26 17:23:36 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 2323be9bd8a..6913a132722 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.39 2007/02/20 18:10:58 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createlang.sgml,v 1.40 2007/03/26 17:23:36 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 9303e68ba25..834ec1db7b6 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.46 2007/02/20 18:10:58 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/createuser.sgml,v 1.47 2007/03/26 17:23:36 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 c96b2da6a54..bb07abe0500 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.30 2007/02/21 23:21:11 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.31 2007/03/26 17:23:36 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 ba590d430ec..c284476c2ae 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.29 2007/02/21 23:21:11 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/droplang.sgml,v 1.30 2007/03/26 17:23:36 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 37ffcc0785b..303f053e52b 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.35 2007/02/20 18:10:58 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.36 2007/03/26 17:23:36 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 9c2e0b1d1d8..312da7085a9 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.42 2007/02/21 23:21:11 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.43 2007/03/26 17:23:36 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -294,8 +294,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 a7e1b7ec696..c9b5ae9938a 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.40 2007/02/21 23:21:11 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.41 2007/03/26 17:23:36 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -358,8 +358,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 7c56a6ba271..6bb1cf4a476 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.96 2007/02/20 18:10:58 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.97 2007/03/26 17:23:36 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -686,8 +686,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 48869374dfb..0d944278c44 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.67 2007/02/21 23:21:12 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.68 2007/03/26 17:23:37 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -406,8 +406,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 c0e6ba27475..8ed0a57b58e 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.69 2007/02/20 18:10:58 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.70 2007/03/26 17:23:37 tgl Exp $ -->
 
 <refentry id="APP-PGRESTORE">
  <refmeta>
@@ -511,8 +511,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 644a71b7920..0603fe79593 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.189 2007/03/16 08:28:01 mha Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.190 2007/03/26 17:23:37 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -2731,8 +2731,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 ec6dc38872a..657930d9e52 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 e082397b933..600b25d5723 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.39 2007/02/20 18:10:59 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.40 2007/03/26 17:23:37 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>