|
1 | 1 | <!-- |
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 $ |
3 | 3 | PostgreSQL documentation |
4 | 4 | --> |
5 | 5 |
|
@@ -348,7 +348,7 @@ PostgreSQL documentation |
348 | 348 | <term><option>-u</></term> |
349 | 349 | <listitem> |
350 | 350 | <para> |
351 | | -Makes <application>psql</application> prompt for the user name and |
| 351 | +Forces <application>psql</application> to prompt for the user name and |
352 | 352 | password before connecting to the database. |
353 | 353 | </para> |
354 | 354 |
|
@@ -406,21 +406,25 @@ PostgreSQL documentation |
406 | 406 | <term><option>--password</></term> |
407 | 407 | <listitem> |
408 | 408 | <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. |
413 | 411 | </para> |
414 | 412 |
|
415 | 413 | <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. |
423 | 420 | </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 | + |
424 | 428 | </listitem> |
425 | 429 | </varlistentry> |
426 | 430 |
|
@@ -508,7 +512,10 @@ PostgreSQL documentation |
508 | 512 | some typing by setting the environment variables |
509 | 513 | <envar>PGDATABASE</envar>, <envar>PGHOST</envar>, |
510 | 514 | <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. |
512 | 519 | </para> |
513 | 520 |
|
514 | 521 | <para> |
@@ -2460,7 +2467,7 @@ $endif |
2460 | 2467 |
|
2461 | 2468 | <listitem> |
2462 | 2469 | <para> |
2463 | | - Defaultdatabase to connect to |
| 2470 | + Defaultconnection database |
2464 | 2471 | </para> |
2465 | 2472 | </listitem> |
2466 | 2473 | </varlistentry> |
|