X-Original-To: pgsql-docs-postgresql.org@localhost.postgresql.org
Received: from localhost (unknown [200.46.204.144])
	by svr1.postgresql.org (Postfix) with ESMTP id 579238B9E39
	for <pgsql-docs-postgresql.org@localhost.postgresql.org>;
	Fri, 11 Feb 2005 04:20:02 +0000 (GMT)
Received: from svr1.postgresql.org ([200.46.204.71])
	by localhost (av.hub.org [200.46.204.144]) (amavisd-new, port 10024)
	with ESMTP id 33484-05
	for <pgsql-docs-postgresql.org@localhost.postgresql.org>;
	Fri, 11 Feb 2005 04:19:40 +0000 (GMT)
Received: from candle.pha.pa.us (candle.pha.pa.us [64.139.89.126])
	by svr1.postgresql.org (Postfix) with ESMTP id 2D8328B9E7A
	for <pgsql-docs@postgresql.org>; Fri, 11 Feb 2005 04:19:39 +0000 (GMT)
Received: (from pgman@localhost)
	by candle.pha.pa.us (8.11.6/8.11.6) id j1B4Je920720
	for pgsql-docs@postgresql.org; Thu, 10 Feb 2005 23:19:40 -0500 (EST)
From: Bruce Momjian <pgman@candle.pha.pa.us>
Message-Id: <200502110419.j1B4Je920720@candle.pha.pa.us>
Subject: Mention libpq env. and pgpass in psql manual page
To: PostgreSQL-documentation <pgsql-docs@postgresql.org>
Date: Thu, 10 Feb 2005 23:19:40 -0500 (EST)
X-Mailer: ELM [version 2.4ME+ PL121 (25)]
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=ELM1108095580-3654-0_
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by amavisd-new at hub.org
X-Spam-Status: No, hits=0.024 tagged_above=0 required=5 tests=AWL
X-Spam-Level: 
X-Archive-Number: 200502/28
X-Sequence-Number: 2861


--ELM1108095580-3654-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII

I have committed to CVS HEAD and 8.0.X:

---------------------------------------------------------------------------

Mention that some psql environment variables come from libpq and note
more variables can be found in the libpq manual section.

Mention .pgpass in the psql manual page section dealing with connection
parameters and point to the libpq section for more details.

Backpatch to 8.0.X.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

--ELM1108095580-3654-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain
Content-Disposition: inline; filename="/bjm/diff"

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>

--ELM1108095580-3654-0_--