git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml

index 177856ca74d257a54e0b5f01d5caa6236f6b5604..c53bacf8648c08e36b23813b173fa529b05b0519 100644 (file)

--- a/doc/src/sgml/ref/clusterdb.sgml

+++ b/doc/src/sgml/ref/clusterdb.sgml

<option>--all</option>) is not used, the database name is read

from the environment variable <envar>PGDATABASE</envar>. If

that is not set, the user name specified for the connection is

- used.

+ used. 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>

diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml

index 44e7b2444b7ea2fb014fbc647df53797775ff769..e993e8761c13f502c48c03fafb189a58477381bd 100644 (file)

--- a/doc/src/sgml/ref/pg_basebackup.sgml

+++ b/doc/src/sgml/ref/pg_basebackup.sgml

<term><option>--dbname=<replaceable class="parameter">connstr</replaceable></option></term>

<listitem>

<para>

- Specifies parameters used to connect to the server, as a connection

- string. See <xref linkend="libpq-connstring"/> for more information.

+ Specifies parameters used to connect to the server, as a <link

+ linkend="libpq-connstring">connction string</link>; these

+ will override any conflicting command line options.

</para>

<para>

The option is called <literal>--dbname</literal> for consistency with other

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml

index e09ed0a4c3ac347d3db367ab7e9661e3371179bf..1400cf87759923eff4617803d7a5eeba1865df66 100644 (file)

--- a/doc/src/sgml/ref/pg_dump.sgml

+++ b/doc/src/sgml/ref/pg_dump.sgml

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-connect"/> 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>

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml

index 5b514e4567b20f234a04be6cbb44d18b343b7761..4360b2cf5773a7d5b6725e77e81e0f8519e5585d 100644 (file)

--- a/doc/src/sgml/ref/pg_dumpall.sgml

+++ b/doc/src/sgml/ref/pg_dumpall.sgml

<term><option>--dbname=<replaceable class="parameter">connstr</replaceable></option></term>

<listitem>

<para>

- Specifies parameters used to connect to the server, as a connection

- string. See <xref linkend="libpq-connstring"/> for more information.

+ Specifies parameters used to connect to the server, as a <link

+ linkend="libpq-connstring">connction string</link>; these

+ will override any conflicting command line options.

</para>

<para>

The option is called <literal>--dbname</literal> for consistency with other

diff --git a/doc/src/sgml/ref/pg_isready.sgml b/doc/src/sgml/ref/pg_isready.sgml

index 3d5b551b87f26493476dee1e8fe0b7ca7adf39d9..ba25ca65a40e00c39330eb0d44c26342ceaefb12 100644 (file)

--- a/doc/src/sgml/ref/pg_isready.sgml

+++ b/doc/src/sgml/ref/pg_isready.sgml

<term><option>--dbname=<replaceable class="parameter">dbname</replaceable></option></term>

<listitem>

<para>

- Specifies the name of the database to connect to.

- </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.

+ Specifies the name of the database to connect to. 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>

diff --git a/doc/src/sgml/ref/pg_receivewal.sgml b/doc/src/sgml/ref/pg_receivewal.sgml

index 865ec84262190e8a27165a797ff60eee46c4ae70..26a66c0e19b896fe0289f3e836761c849ad0185a 100644 (file)

--- a/doc/src/sgml/ref/pg_receivewal.sgml

+++ b/doc/src/sgml/ref/pg_receivewal.sgml

<term><option>--dbname=<replaceable class="parameter">connstr</replaceable></option></term>

<listitem>

<para>

- Specifies parameters used to connect to the server, as a connection

- string. See <xref linkend="libpq-connstring"/> for more information.

+ Specifies parameters used to connect to the server, as a <link

+ linkend="libpq-connstring">connction string</link>; these

+ will override any conflicting command line options.

</para>

<para>

The option is called <literal>--dbname</literal> for consistency with other

diff --git a/doc/src/sgml/ref/pg_recvlogical.sgml b/doc/src/sgml/ref/pg_recvlogical.sgml

index 41508fdc1e56cc6c9c9322c371580a1f3ba54315..6b1d98d06ef1f69c06840aba465e9b79ba946ecd 100644 (file)

--- a/doc/src/sgml/ref/pg_recvlogical.sgml

+++ b/doc/src/sgml/ref/pg_recvlogical.sgml

<variablelist>

<varlistentry>

- <term><option>-d <replaceable>database</replaceable></option></term>

- <term><option>--dbname=<replaceable>database</replaceable></option></term>

+ <term><option>-d <replaceable>dbname</replaceable></option></term>

+ <term><option>--dbname=<replaceable>dbname</replaceable></option></term>

<listitem>

<para>

- The database to connect to. See the description of the actions for

- what this means in detail. This can be a <application>libpq</application> connection string;

- see <xref linkend="libpq-connstring"/> for more information. Defaults

- to user name.

+ The database to connect to. See the description

+ of the actions for what this means in detail.

+ 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. Defaults to the user name.

</para>

</listitem>

</varlistentry>

diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml

index e0d9d2ad64f407e3124616ba4e88968ecad432b9..93ea937ac8ea7e526a0da89a3e712436db8e7155 100644 (file)

--- a/doc/src/sgml/ref/pg_restore.sgml

+++ b/doc/src/sgml/ref/pg_restore.sgml

<para>

Connect to database <replaceable

class="parameter">dbname</replaceable> and restore directly

- into the database.

+ into the database. 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>

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml

index ef18fe27e03c9c4869c9617a9f35268a2c77639b..aed051f543c0110fd0f2655cd266909b51e00bad 100644 (file)

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

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

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>

<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.

<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.

diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml

index 4f821c2095ef71d31b10ddac46bd7dc2a134e6f7..0f3f12bfbfc65fb31a4022c52b40a86693a87064 100644 (file)

--- a/doc/src/sgml/ref/reindexdb.sgml

+++ b/doc/src/sgml/ref/reindexdb.sgml

<option>--all</option>) is not used, the database name is read

from the environment variable <envar>PGDATABASE</envar>. If

that is not set, the user name specified for the connection is

- used.

+ used. 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>

diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml

index 7b1395055244d18ccbcb04724938f00236d384a2..766c6882bd4caf1364e28810800768fb2760afdd 100644 (file)

--- a/doc/src/sgml/ref/vacuumdb.sgml

+++ b/doc/src/sgml/ref/vacuumdb.sgml

<option>--all</option>) is not used, the database name is read

from the environment variable <envar>PGDATABASE</envar>. If

that is not set, the user name specified for the connection is

- used.

+ used. 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>