aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/sgml/ref/clusterdb.sgml5
-rw-r--r--doc/src/sgml/ref/pg_basebackup.sgml5
-rw-r--r--doc/src/sgml/ref/pg_dump.sgml12
-rw-r--r--doc/src/sgml/ref/pg_dumpall.sgml5
-rw-r--r--doc/src/sgml/ref/pg_isready.sgml14
-rw-r--r--doc/src/sgml/ref/pg_receivewal.sgml5
-rw-r--r--doc/src/sgml/ref/pg_recvlogical.sgml14
-rw-r--r--doc/src/sgml/ref/pg_restore.sgml5
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml25
-rw-r--r--doc/src/sgml/ref/reindexdb.sgml5
-rw-r--r--doc/src/sgml/ref/vacuumdb.sgml5
11 files changed, 53 insertions, 47 deletions
diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 177856ca74d..c53bacf8648 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -95,7 +95,10 @@ PostgreSQL documentation
<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 44e7b2444b7..e993e8761c1 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -653,8 +653,9 @@ PostgreSQL documentation
<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 e09ed0a4c3a..1400cf87759 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1132,14 +1132,10 @@ PostgreSQL documentation
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 5b514e4567b..4360b2cf577 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -552,8 +552,9 @@ PostgreSQL documentation
<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 3d5b551b87f..ba25ca65a40 100644
--- a/doc/src/sgml/ref/pg_isready.sgml
+++ b/doc/src/sgml/ref/pg_isready.sgml
@@ -47,15 +47,11 @@ PostgreSQL documentation
<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 865ec842621..26a66c0e19b 100644
--- a/doc/src/sgml/ref/pg_receivewal.sgml
+++ b/doc/src/sgml/ref/pg_receivewal.sgml
@@ -252,8 +252,9 @@ PostgreSQL documentation
<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 41508fdc1e5..6b1d98d06ef 100644
--- a/doc/src/sgml/ref/pg_recvlogical.sgml
+++ b/doc/src/sgml/ref/pg_recvlogical.sgml
@@ -273,14 +273,16 @@ PostgreSQL documentation
<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 e0d9d2ad64f..93ea937ac8e 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -156,7 +156,10 @@ PostgreSQL documentation
<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 ef18fe27e03..aed051f543c 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.
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 4f821c2095e..0f3f12bfbfc 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -139,7 +139,10 @@ PostgreSQL documentation
<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 7b139505524..766c6882bd4 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -97,7 +97,10 @@ PostgreSQL documentation
<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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 22:27:15 +0000