diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 2f1a248ca76..006c81f3077 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.257 2008/03/31 02:43:14 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.258 2008/06/01 16:23:08 tgl Exp $ -->
 
 <chapter id="libpq">
  <title><application>libpq</application> - C Library</title>
@@ -4838,8 +4838,12 @@ defaultNoticeProcessor(void *arg, const char *message)
       <indexterm>
        <primary><envar>PGOPTIONS</envar></primary>
       </indexterm>
-      <envar>PGOPTIONS</envar> sets additional run-time  options  for the
-      <productname>PostgreSQL</productname> server.
+      <envar>PGOPTIONS</envar> sets additional run-time options for the
+      <productname>PostgreSQL</productname> server.  For example, setting
+      <envar>PGOPTIONS</envar> to <literal>-c geqo=off</> sets the session's
+      value of the <varname>geqo</> parameter to <literal>off</>.
+      For a detailed discussion of the available options consult <xref
+      linkend="runtime-config">.
      </para>
     </listitem>
 
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 57664e3082e..6333e37bf25 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.206 2008/05/16 17:17:00 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.207 2008/06/01 16:23:08 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -2754,22 +2754,13 @@ $endif
 
    <varlistentry>
     <term><envar>PGDATABASE</envar></term>
-
-    <listitem>
-     <para>
-      Default connection database
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
     <term><envar>PGHOST</envar></term>
     <term><envar>PGPORT</envar></term>
     <term><envar>PGUSER</envar></term>
 
     <listitem>
      <para>
-      Default connection parameters
+      Default connection parameters (see <xref linkend="libpq-envars">).
      </para>
     </listitem>
    </varlistentry>