diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 5b42fa85aa9..c41068f074e 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -58,13 +58,13 @@
 
      <varlistentry>
       <term><option>-b</option> <replaceable>old_bindir</></term>
-      <term><option>--old-bindir</option> <replaceable>OLDBINDIR</></term>
+      <term><option>--old-bindir=</option><replaceable>OLDBINDIR</></term>
       <listitem><para>specify the old cluster executable directory</para></listitem>
      </varlistentry>
 
      <varlistentry>
       <term><option>-B</option> <replaceable>new_bindir</></term>
-      <term><option>--new-bindir</option> <replaceable>NEWBINDIR</></term>
+      <term><option>--new-bindir=</option><replaceable>NEWBINDIR</></term>
       <listitem><para>specify the new cluster executable directory</para></listitem>
      </varlistentry>
 
@@ -76,13 +76,13 @@
 
      <varlistentry>
       <term><option>-d</option> <replaceable>old_datadir</></term>
-      <term><option>--old-datadir</option> <replaceable>OLDDATADIR</></term>
+      <term><option>--old-datadir=</option><replaceable>OLDDATADIR</></term>
       <listitem><para>specify the old cluster data directory</para></listitem>
      </varlistentry>
 
      <varlistentry>
       <term><option>-D</option> <replaceable>new_datadir</></term>
-      <term><option>--new-datadir</option> <replaceable>NEWDATADIR</></term>
+      <term><option>--new-datadir=</option><replaceable>NEWDATADIR</></term>
       <listitem><para>specify the new cluster data directory</para></listitem>
      </varlistentry>
 
@@ -94,7 +94,7 @@
 
      <varlistentry>
       <term><option>-G</option> <replaceable>debug_filename</></term>
-      <term><option>--debugfile</option> <replaceable>DEBUGFILENAME</></term>
+      <term><option>--debugfile=</option><replaceable>DEBUGFILENAME</></term>
       <listitem><para>output debugging activity to file</para></listitem>
      </varlistentry>
 
@@ -106,25 +106,25 @@
 
      <varlistentry>
       <term><option>-l</option> <replaceable>log_filename</></term>
-      <term><option>--logfile</option> <replaceable>LOGFILENAME</></term>
+      <term><option>--logfile=</option><replaceable>LOGFILENAME</></term>
       <listitem><para>log session activity to file</para></listitem>
      </varlistentry>
 
      <varlistentry>
       <term><option>-p</option> <replaceable>old_portnum</></term>
-      <term><option>--old-port</option> <replaceable>portnum</></term>
+      <term><option>--old-port=</option><replaceable>portnum</></term>
       <listitem><para>specify the old cluster port number</para></listitem>
      </varlistentry>
 
      <varlistentry>
       <term><option>-P</option> <replaceable>new_portnum</></term>
-      <term><option>--new-port</option> <replaceable>portnum</></term>
+      <term><option>--new-port=</option><replaceable>portnum</></term>
       <listitem><para>specify the new cluster port number</para></listitem>
      </varlistentry>
 
      <varlistentry>
       <term><option>-u</option> <replaceable>username</></term>
-      <term><option>--user</option> <replaceable>username</></term>
+      <term><option>--user=</option><replaceable>username</></term>
       <listitem><para>clusters superuser</para></listitem>
      </varlistentry>
 
diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 5ce3a41fc77..081f398706d 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -77,7 +77,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>--dbname=</><replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
         Specifies the name of the database to be clustered.
@@ -113,7 +113,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-t <replaceable class="parameter">table</replaceable></></term>
-      <term><option>--table <replaceable class="parameter">table</replaceable></></term>
+      <term><option>--table=<replaceable class="parameter">table</replaceable></></term>
       <listitem>
        <para>
         Cluster <replaceable class="parameter">table</replaceable> only.
@@ -162,7 +162,7 @@ PostgreSQL documentation
     <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the server is
@@ -174,7 +174,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -186,7 +186,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as.
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 633881d6f7b..7cbf56506da 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -87,7 +87,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-D <replaceable class="parameter">tablespace</replaceable></></term>
-      <term><option>--tablespace <replaceable class="parameter">tablespace</replaceable></></term>
+      <term><option>--tablespace=<replaceable class="parameter">tablespace</replaceable></></term>
       <listitem>
        <para>
         Specifies the default tablespace for the database.
@@ -108,7 +108,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-l <replaceable class="parameter">locale</replaceable></></term>
-      <term><option>--locale <replaceable class="parameter">locale</replaceable></></term>
+      <term><option>--locale=<replaceable class="parameter">locale</replaceable></></term>
       <listitem>
        <para>
         Specifies the locale to be used in this database.  This is equivalent
@@ -118,7 +118,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--lc-collate <replaceable class="parameter">locale</replaceable></></term>
+      <term><option>--lc-collate=<replaceable class="parameter">locale</replaceable></></term>
       <listitem>
        <para>
         Specifies the LC_COLLATE setting to be used in this database.
@@ -127,7 +127,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--lc-ctype <replaceable class="parameter">locale</replaceable></></term>
+      <term><option>--lc-ctype=<replaceable class="parameter">locale</replaceable></></term>
       <listitem>
        <para>
         Specifies the LC_CTYPE setting to be used in this database.
@@ -137,7 +137,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-E <replaceable class="parameter">encoding</replaceable></></term>
-      <term><option>--encoding <replaceable class="parameter">encoding</replaceable></></term>
+      <term><option>--encoding=<replaceable class="parameter">encoding</replaceable></></term>
       <listitem>
        <para>
         Specifies the character encoding scheme to be used in this
@@ -150,7 +150,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-O <replaceable class="parameter">owner</replaceable></></term>
-      <term><option>--owner <replaceable class="parameter">owner</replaceable></></term>
+      <term><option>--owner=<replaceable class="parameter">owner</replaceable></></term>
       <listitem>
        <para>
         Specifies the database user who will own the new database.
@@ -160,7 +160,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-T <replaceable class="parameter">template</replaceable></></term>
-      <term><option>--template <replaceable class="parameter">template</replaceable></></term>
+      <term><option>--template=<replaceable class="parameter">template</replaceable></></term>
       <listitem>
        <para>
         Specifies the template database from which to build this database.
@@ -207,7 +207,7 @@ PostgreSQL documentation
     <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -219,7 +219,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the TCP port or the local Unix domain socket file
@@ -230,7 +230,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as.
diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index 0bc1976c15e..f01f2983228 100644
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
@@ -77,7 +77,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>--dbname=</><replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
         Specifies the database to which the language should be added.
@@ -138,7 +138,7 @@ PostgreSQL documentation
     <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -151,7 +151,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -163,7 +163,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as.
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index fbc184f4c82..0c47fb49971 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -78,7 +78,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-c <replaceable class="parameter">number</replaceable></></term>
-      <term><option>--connection-limit <replaceable class="parameter">number</replaceable></></term>
+      <term><option>--connection-limit=<replaceable class="parameter">number</replaceable></></term>
       <listitem>
        <para>
         Set a maximum number of connections for the new user.
@@ -276,7 +276,7 @@ PostgreSQL documentation
    <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -289,7 +289,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -301,7 +301,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as (not the user name to create).
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index c169d7fcd46..1aa76cdb57b 100644
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -118,7 +118,7 @@ PostgreSQL documentation
    <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -131,7 +131,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -143,7 +143,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as.
diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index 810c78e5215..0ad640b0b47 100644
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -79,7 +79,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>--dbname=</><replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
         Specifies from which database the language should be removed.
@@ -140,7 +140,7 @@ PostgreSQL documentation
     <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -153,7 +153,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -165,7 +165,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as.
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index 07866128200..3089a219543 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -119,7 +119,7 @@ PostgreSQL documentation
    <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -132,7 +132,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -144,7 +144,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as (not the user name to drop).
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index baefb578826..24e8ee0a368 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -74,7 +74,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-c <replaceable class="parameter">command</replaceable></></term>
-      <term><option>--command <replaceable class="parameter">command</replaceable></></term>
+      <term><option>--command=<replaceable class="parameter">command</replaceable></></term>
       <listitem>
       <para>
       Specifies that <application>psql</application> is to execute one
@@ -107,7 +107,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option>--dbname <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>--dbname=<replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
       <para>
        Specifies the name of the database to connect to. This is
@@ -151,7 +151,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-f <replaceable class="parameter">filename</replaceable></></term>
-      <term><option>--file <replaceable class="parameter">filename</replaceable></></term>
+      <term><option>--file=<replaceable class="parameter">filename</replaceable></></term>
       <listitem>
       <para>
       Use the file <replaceable class="parameter">filename</replaceable>
@@ -183,7 +183,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-F <replaceable class="parameter">separator</replaceable></></term>
-      <term><option>--field-separator <replaceable class="parameter">separator</replaceable></></term>
+      <term><option>--field-separator=<replaceable class="parameter">separator</replaceable></></term>
       <listitem>
       <para>
       Use <replaceable class="parameter">separator</replaceable> as the
@@ -195,7 +195,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-h <replaceable class="parameter">hostname</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">hostname</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">hostname</replaceable></></term>
       <listitem>
       <para>
       Specifies the host name of the machine on which the
@@ -232,7 +232,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-L <replaceable class="parameter">filename</replaceable></></term>
-      <term><option>--log-file <replaceable class="parameter">filename</replaceable></></term>
+      <term><option>--log-file=<replaceable class="parameter">filename</replaceable></></term>
       <listitem>
       <para>
        Write all query output into file <replaceable
@@ -255,7 +255,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-o <replaceable class="parameter">filename</replaceable></></term>
-      <term><option>--output <replaceable class="parameter">filename</replaceable></></term>
+      <term><option>--output=<replaceable class="parameter">filename</replaceable></></term>
       <listitem>
       <para>
       Put all query output into file <replaceable
@@ -267,7 +267,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
       <para>
       Specifies the TCP port or the local Unix-domain
@@ -281,7 +281,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-P <replaceable class="parameter">assignment</replaceable></></term>
-      <term><option>--pset <replaceable class="parameter">assignment</replaceable></></term>
+      <term><option>--pset=<replaceable class="parameter">assignment</replaceable></></term>
       <listitem>
       <para>
       Specifies printing options, in the style of
@@ -310,7 +310,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-R <replaceable class="parameter">separator</replaceable></></term>
-      <term><option>--record-separator <replaceable class="parameter">separator</replaceable></></term>
+      <term><option>--record-separator=<replaceable class="parameter">separator</replaceable></></term>
       <listitem>
       <para>
       Use <replaceable class="parameter">separator</replaceable> as the
@@ -365,7 +365,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-T <replaceable class="parameter">table_options</replaceable></></term>
-      <term><option>--table-attr <replaceable class="parameter">table_options</replaceable></></term>
+      <term><option>--table-attr=<replaceable class="parameter">table_options</replaceable></></term>
       <listitem>
       <para>
       Specifies options to be placed within the
@@ -377,7 +377,7 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
       <para>
       Connect to the database as the user <replaceable
@@ -389,8 +389,8 @@ PostgreSQL documentation
 
     <varlistentry>
       <term><option>-v <replaceable class="parameter">assignment</replaceable></></term>
-      <term><option>--set <replaceable class="parameter">assignment</replaceable></></term>
-      <term><option>--variable <replaceable class="parameter">assignment</replaceable></></term>
+      <term><option>--set=<replaceable class="parameter">assignment</replaceable></></term>
+      <term><option>--variable=<replaceable class="parameter">assignment</replaceable></></term>
       <listitem>
       <para>
       Perform a variable assignment, like the <command>\set</command>
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index fa4d7b41c71..026bdcc7185 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -80,7 +80,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>--dbname=</><replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
         Specifies the name of the database to be reindexed.
@@ -106,7 +106,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-i <replaceable class="parameter">index</replaceable></></term>
-      <term><option>--index <replaceable class="parameter">index</replaceable></></term>
+      <term><option>--index=<replaceable class="parameter">index</replaceable></></term>
       <listitem>
        <para>
         Recreate <replaceable class="parameter">index</replaceable> only.
@@ -136,7 +136,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-t <replaceable class="parameter">table</replaceable></></term>
-      <term><option>--table <replaceable class="parameter">table</replaceable></></term>
+      <term><option>--table=<replaceable class="parameter">table</replaceable></></term>
       <listitem>
        <para>
         Reindex <replaceable class="parameter">table</replaceable> only.
@@ -176,7 +176,7 @@ PostgreSQL documentation
     <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the server is
@@ -188,7 +188,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -200,7 +200,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as.
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index b4833f12525..e9022fe9479 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -85,7 +85,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></option></term>
-      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></option></term>
+      <term><option><optional>--dbname=</><replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
         Specifies the name of the database to be cleaned or analyzed.
@@ -141,7 +141,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-t <replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</option></term>
-      <term><option>--table <replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</option></term>
+      <term><option>--table=<replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</option></term>
       <listitem>
        <para>
         Clean or analyze <replaceable class="parameter">table</replaceable> only.
@@ -217,7 +217,7 @@ PostgreSQL documentation
     <variablelist>
      <varlistentry>
       <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the server
@@ -229,7 +229,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -241,7 +241,7 @@ PostgreSQL documentation
 
      <varlistentry>
       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as.