Skip to content

Commit 056a664

Browse files
committed
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.
1 parent 975e273 commit 056a664

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

doc/src/sgml/ref/psql-ref.sgml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.132 2005/01/22 23:22:19 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.133 2005/02/11 04:19:05 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -348,7 +348,7 @@ PostgreSQL documentation
348348
<term><option>-u</></term>
349349
<listitem>
350350
<para>
351-
Makes <application>psql</application> prompt for the user name and
351+
Forces <application>psql</application> to prompt for the user name and
352352
password before connecting to the database.
353353
</para>
354354

@@ -406,21 +406,25 @@ PostgreSQL documentation
406406
<term><option>--password</></term>
407407
<listitem>
408408
<para>
409-
Cause <application>psql</application> to prompt for a
410-
password before connecting to a database. This will remain set for
411-
the entire session, even if you change the database connection
412-
with the meta-command <command>\connect</command>.
409+
Forces <application>psql</application> to prompt for a
410+
password before connecting to a database.
413411
</para>
414412

415413
<para>
416-
In the current version, <application>psql</application>
417-
automatically issues a password prompt whenever the server
418-
requests password authentication. Because this is currently based
419-
on a hack, the automatic recognition might mysteriously fail,
420-
hence this option to force a prompt. If no password prompt is
421-
issued and the server requires password authentication, the
422-
connection attempt will fail.
414+
<application>psql</application> should automatically prompt for a
415+
password whenever the server requests password authentication.
416+
However, currently password request detection is not totally
417+
reliable, hence this option to force a prompt. If no password
418+
prompt is issued and the server requires password authentication,
419+
the connection attempt will fail.
423420
</para>
421+
422+
<para>
423+
This option will remain set for the entire session, even if you
424+
change the database connection with the meta-command
425+
<command>\connect</command>.
426+
</para>
427+
424428
</listitem>
425429
</varlistentry>
426430

@@ -508,7 +512,10 @@ PostgreSQL documentation
508512
some typing by setting the environment variables
509513
<envar>PGDATABASE</envar>, <envar>PGHOST</envar>,
510514
<envar>PGPORT</envar> and/or <envar>PGUSER</envar> to appropriate
511-
values.
515+
values. (For additional environment variables, see <xref
516+
linkend="libpq-envars">.) It is also convenient to have a
517+
<filename>~/.pgpass</> file to avoid regularly having to type in
518+
passwords. See <xref linkend="libpq-pgpass"> for more information.
512519
</para>
513520

514521
<para>
@@ -2460,7 +2467,7 @@ $endif
24602467

24612468
<listitem>
24622469
<para>
2463-
Default database to connect to
2470+
Default connection database
24642471
</para>
24652472
</listitem>
24662473
</varlistentry>

0 commit comments

Comments
 (0)