Index: doc/src/sgml/ref/psql-ref.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v
retrieving revision 1.132
diff -c -c -r1.132 psql-ref.sgml
*** doc/src/sgml/ref/psql-ref.sgml	22 Jan 2005 23:22:19 -0000	1.132
--- doc/src/sgml/ref/psql-ref.sgml	11 Feb 2005 04:14:48 -0000
***************
*** 348,354 ****
        <term><option>-u</></term>
        <listitem>
        <para>
!       Makes <application>psql</application> prompt for the user name and
        password before connecting to the database.
        </para>
  
--- 348,354 ----
        <term><option>-u</></term>
        <listitem>
        <para>
!       Forces <application>psql</application> to prompt for the user name and
        password before connecting to the database.
        </para>
  
***************
*** 406,426 ****
        <term><option>--password</></term>
        <listitem>
        <para>
!       Cause <application>psql</application> to prompt for a
!       password before connecting to a database. This will remain set for
!       the entire session, even if you change the database connection
!       with the meta-command <command>\connect</command>.
        </para>
  
        <para>
!       In the current version, <application>psql</application>
!       automatically issues a password prompt whenever the server
!       requests password authentication. Because this is currently based
!       on a hack, the automatic recognition might mysteriously fail,
!       hence this option to force a prompt. If no password prompt is
!       issued and the server requires password authentication, the
!       connection attempt will fail.
        </para>
        </listitem>
      </varlistentry>
  
--- 406,430 ----
        <term><option>--password</></term>
        <listitem>
        <para>
!       Forces <application>psql</application> to prompt for a
!       password before connecting to a database.  
        </para>
  
        <para>
!       <application>psql</application> should automatically prompt for a
!       password whenever the server requests password authentication.
!       However, currently password request detection is not totally
!       reliable, hence this option to force a prompt. If no password
!       prompt is issued and the server requires password authentication,
!       the connection attempt will fail.
        </para>
+ 
+       <para>
+       This option will remain set for the entire session, even if you
+       change the database connection with the meta-command
+       <command>\connect</command>.
+       </para>
+ 
        </listitem>
      </varlistentry>
  
***************
*** 508,514 ****
      some typing by setting the environment variables
      <envar>PGDATABASE</envar>, <envar>PGHOST</envar>,
      <envar>PGPORT</envar> and/or <envar>PGUSER</envar> to appropriate
!     values.
      </para>
  
      <para>
--- 512,521 ----
      some typing by setting the environment variables
      <envar>PGDATABASE</envar>, <envar>PGHOST</envar>,
      <envar>PGPORT</envar> and/or <envar>PGUSER</envar> to appropriate
!     values. (For additional environment variables, see <xref
!     linkend="libpq-envars">.) It is also convenient to have a
!     <filename>~/.pgpass</> file to avoid regularly having to type in
!     passwords. See <xref linkend="libpq-pgpass"> for more information.
      </para>
  
      <para>
***************
*** 2460,2466 ****
  
      <listitem>
       <para>
!       Default database to connect to
       </para>
      </listitem>
     </varlistentry>
--- 2467,2473 ----
  
      <listitem>
       <para>
!       Default connection database
       </para>
      </listitem>
     </varlistentry>