diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 177856ca74..c53bacf864 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -95,7 +95,10 @@ PostgreSQL documentation
) is not used, the database name is read
from the environment variable PGDATABASE. If
that is not set, the user name specified for the connection is
- used.
+ used. The dbname can be a connection string. If so,
+ connection string parameters will override any conflicting command
+ line options.
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index 44e7b2444b..e993e8761c 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -653,8 +653,9 @@ PostgreSQL documentation
- Specifies parameters used to connect to the server, as a connection
- string. See for more information.
+ Specifies parameters used to connect to the server, as a connction string; these
+ will override any conflicting command line options.
The option is called --dbname for consistency with other
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index e09ed0a4c3..1400cf8775 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 dbname as the first non-option
- argument on the command line.
-
-
- If this parameter contains an = sign or starts
- with a valid URI prefix
- (postgresql://
- or postgres://), it is treated as a
- conninfo string. See for more information.
+ argument on the command line. The dbname
+ can be a connection string.
+ If so, connection string parameters will override any conflicting
+ command line options.
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 5b514e4567..4360b2cf57 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -552,8 +552,9 @@ PostgreSQL documentation
- Specifies parameters used to connect to the server, as a connection
- string. See for more information.
+ Specifies parameters used to connect to the server, as a connction string; these
+ will override any conflicting command line options.
The option is called --dbname for consistency with other
diff --git a/doc/src/sgml/ref/pg_isready.sgml b/doc/src/sgml/ref/pg_isready.sgml
index 3d5b551b87..ba25ca65a4 100644
--- a/doc/src/sgml/ref/pg_isready.sgml
+++ b/doc/src/sgml/ref/pg_isready.sgml
@@ -47,15 +47,11 @@ PostgreSQL documentation
- Specifies the name of the database to connect to.
-
-
- If this parameter contains an = sign or starts
- with a valid URI prefix
- (postgresql://
- or postgres://), it is treated as a
- conninfo string. See for more information.
+ Specifies the name of the database to connect to. The
+ dbname can be a connection string. If so,
+ connection string parameters will override any conflicting command
+ line options.
diff --git a/doc/src/sgml/ref/pg_receivewal.sgml b/doc/src/sgml/ref/pg_receivewal.sgml
index 865ec84262..26a66c0e19 100644
--- a/doc/src/sgml/ref/pg_receivewal.sgml
+++ b/doc/src/sgml/ref/pg_receivewal.sgml
@@ -252,8 +252,9 @@ PostgreSQL documentation
- Specifies parameters used to connect to the server, as a connection
- string. See for more information.
+ Specifies parameters used to connect to the server, as a connction string; these
+ will override any conflicting command line options.
The option is called --dbname for consistency with other
diff --git a/doc/src/sgml/ref/pg_recvlogical.sgml b/doc/src/sgml/ref/pg_recvlogical.sgml
index 41508fdc1e..6b1d98d06e 100644
--- a/doc/src/sgml/ref/pg_recvlogical.sgml
+++ b/doc/src/sgml/ref/pg_recvlogical.sgml
@@ -273,14 +273,16 @@ PostgreSQL documentation
-
-
+
+
- The database to connect to. See the description of the actions for
- what this means in detail. This can be a libpq connection string;
- see 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 dbname can be a connection string. If so,
+ connection string parameters will override any conflicting
+ command line options. Defaults to the user name.
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index e0d9d2ad64..93ea937ac8 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -156,7 +156,10 @@ PostgreSQL documentation
Connect to database dbname and restore directly
- into the database.
+ into the database. The dbname can
+ be a connection string.
+ If so, connection string parameters will override any conflicting
+ command line options.
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index ef18fe27e0..aed051f543 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 dbname as the first non-option
- argument on the command line.
-
-
- If this parameter contains an = sign or starts
- with a valid URI prefix
- (postgresql://
- or postgres://), it is treated as a
- conninfo string. See for more information.
+ argument on the command line. The dbname
+ can be a connection string.
+ If so, connection string parameters will override any conflicting
+ command line options.
@@ -498,7 +493,7 @@ EOF
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 .pgpass 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
Force psql to prompt for a
- password before connecting to a database.
+ password before connecting to a database, even if the password will
+ not be used.
- This option is never essential, since psql
- will automatically prompt for a password if the server demands
- password authentication. However, psql
+ If the server requires password authentication and a password is not
+ available from other sources such as a .pgpass
+ file, psql will prompt for a
+ password in any case. However, psql
will waste a connection attempt finding out that the server wants a
password. In some cases it is worth typing to avoid
the extra connection attempt.
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 4f821c2095..0f3f12bfbf 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -139,7 +139,10 @@ PostgreSQL documentation
) is not used, the database name is read
from the environment variable PGDATABASE. If
that is not set, the user name specified for the connection is
- used.
+ used. The dbname can be a connection string. If so,
+ connection string parameters will override any conflicting command
+ line options.
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 7b13950552..766c6882bd 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -97,7 +97,10 @@ PostgreSQL documentation
) is not used, the database name is read
from the environment variable PGDATABASE. If
that is not set, the user name specified for the connection is
- used.
+ used. The dbname can be a connection string. If so,
+ connection string parameters will override any conflicting command
+ line options.