diff options
Diffstat (limited to 'doc/src/sgml/ref/psql-ref.sgml')
| -rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 201946990f4..45381329cda 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -168,15 +168,10 @@ EOF Specifies the name of the database to connect to. This is equivalent to specifying <replaceable class="parameter">dbname</replaceable> as the first non-option - argument on the command line. - </para> - <para> - If this parameter contains an <symbol>=</symbol> sign or starts - with a valid <acronym>URI</acronym> prefix - (<literal>postgresql://</literal> - or <literal>postgres://</literal>), it is treated as a - <parameter>conninfo</parameter> string. See <xref - linkend="libpq-connstring"/> for more information. + argument on the command line. The <replaceable>dbname</replaceable> + can be a <link linkend="libpq-connstring">connection string</link>. + If so, connection string parameters will override any conflicting + command line options. </para> </listitem> </varlistentry> @@ -498,7 +493,7 @@ EOF <listitem> <para> Never issue a password prompt. If the server requires password - authentication and a password is not available by other means + authentication and a password is not available from other sources such as a <filename>.pgpass</filename> file, the connection attempt will fail. This option can be useful in batch jobs and scripts where no user is present to enter a password. @@ -518,13 +513,15 @@ EOF <listitem> <para> Force <application>psql</application> to prompt for a - password before connecting to a database. + password before connecting to a database, even if the password will + not be used. </para> <para> - This option is never essential, since <application>psql</application> - will automatically prompt for a password if the server demands - password authentication. However, <application>psql</application> + If the server requires password authentication and a password is not + available from other sources such as a <filename>.pgpass</filename> + file, <application>psql</application> will prompt for a + password in any case. However, <application>psql</application> will waste a connection attempt finding out that the server wants a password. In some cases it is worth typing <option>-W</option> to avoid the extra connection attempt. |