Put new command-line options in alphabetical order

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index b45e8134866a7e212ea993ff64fb707cac28aaba..2ab570ad4c1f64773545d77a14a0340998bad146 100644 (file)
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -333,23 +333,23 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--no-role-passwords</option></term>
+      <term><option>--no-publications</option></term>
       <listitem>
        <para>
-        Do not dump passwords for roles. When restored, roles will have a NULL
-        password and authentication will always fail until the password is reset.
-        Since password values aren't needed when this option is specified we
-        use the catalog view pg_roles in preference to pg_authid, since access
-        to pg_authid may be restricted by security policy.
+        Do not dump publications.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--no-publications</option></term>
+      <term><option>--no-role-passwords</option></term>
       <listitem>
        <para>
-        Do not dump publications.
+        Do not dump passwords for roles. When restored, roles will have a NULL
+        password and authentication will always fail until the password is reset.
+        Since password values aren't needed when this option is specified we
+        use the catalog view pg_roles in preference to pg_authid, since access
+        to pg_authid may be restricted by security policy.
        </para>
       </listitem>
      </varlistentry>

diff --git a/doc/src/sgml/ref/pg_recvlogical.sgml b/doc/src/sgml/ref/pg_recvlogical.sgml
index eaea94df8bb89678f2ff5168a96bb44d3d542b85..9c7bb1907be79b1988c568a364f2eb41e97fb7f3 100644 (file)
--- a/doc/src/sgml/ref/pg_recvlogical.sgml
+++ b/doc/src/sgml/ref/pg_recvlogical.sgml
@@ -113,6 +113,32 @@ PostgreSQL documentation
     output and other replication behavior:
 
     <variablelist>
+     <varlistentry>
+      <term><option>-E <replaceable>lsn</replaceable></option></term>
+      <term><option>--endpos=<replaceable>lsn</replaceable></option></term>
+      <listitem>
+       <para>
+        In <option>--start</option> mode, automatically stop replication
+        and exit with normal exit status 0 when receiving reaches the
+        specified LSN.  If specified when not in <option>--start</option>
+        mode, an error is raised.
+       </para>
+
+       <para>
+        If there's a record with LSN exactly equal to <replaceable>lsn</>,
+        the record will be output.
+       </para>
+
+       <para>
+        The <option>--endpos</option> option is not aware of transaction
+        boundaries and may truncate output partway through a transaction.
+        Any partially output transaction will not be consumed and will be
+        replayed again when the slot is next read from. Individual messages
+        are never truncated.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-f <replaceable>filename</replaceable></option></term>
       <term><option>--file=<replaceable>filename</replaceable></option></term>
@@ -162,32 +188,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>-E <replaceable>lsn</replaceable></option></term>
-      <term><option>--endpos=<replaceable>lsn</replaceable></option></term>
-      <listitem>
-       <para>
-        In <option>--start</option> mode, automatically stop replication
-        and exit with normal exit status 0 when receiving reaches the
-        specified LSN.  If specified when not in <option>--start</option>
-        mode, an error is raised.
-       </para>
-
-       <para>
-        If there's a record with LSN exactly equal to <replaceable>lsn</>,
-        the record will be output.
-       </para>
-
-       <para>
-        The <option>--endpos</option> option is not aware of transaction
-        boundaries and may truncate output partway through a transaction.
-        Any partially output transaction will not be consumed and will be
-        replayed again when the slot is next read from. Individual messages
-        are never truncated.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>--if-not-exists</option></term>
       <listitem>

diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
index 5735c48717fa19b075596b5f381a7fa94d213c55..64b043b48a1344584367726545b9bb3fd72343c7 100644 (file)
--- a/doc/src/sgml/ref/pgbench.sgml
+++ b/doc/src/sgml/ref/pgbench.sgml
@@ -579,6 +579,16 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--log-prefix=<replaceable>prefix</></option></term>
+      <listitem>
+       <para>
+        Set the filename prefix for the log files created by
+        <option>--log</>.  The default is <literal>pgbench_log</>.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--progress-timestamp</option></term>
       <listitem>
@@ -610,16 +620,6 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--log-prefix=<replaceable>prefix</></option></term>
-      <listitem>
-       <para>
-        Set the filename prefix for the log files created by
-        <option>--log</>.  The default is <literal>pgbench_log</>.
-       </para>
-      </listitem>
-     </varlistentry>
-
     </variablelist>
    </para>
 

diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index 6b081bd7372a99304c92fc08e3cb1f28fde0d958..5f7412e9d55f813b9ab20c7f9d8b0803b9070748 100644 (file)
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -81,12 +81,12 @@ usage(void)
        printf(_("      --drop-slot        drop the replication slot (for the slot's name see --slot)\n"));
        printf(_("      --start            start streaming in a replication slot (for the slot's name see --slot)\n"));
        printf(_("\nOptions:\n"));
+       printf(_("  -E, --endpos=LSN       exit after receiving the specified LSN\n"));
        printf(_("  -f, --file=FILE        receive log into this file, - for stdout\n"));
        printf(_("  -F  --fsync-interval=SECS\n"
                         "                         time between fsyncs to the output file (default: %d)\n"), (fsync_interval / 1000));
        printf(_("      --if-not-exists    do not error if slot already exists when creating a slot\n"));
        printf(_("  -I, --startpos=LSN     where in an existing slot should the streaming start\n"));
-       printf(_("  -E, --endpos=LSN       exit after receiving the specified LSN\n"));
        printf(_("  -n, --no-loop          do not loop on connection lost\n"));
        printf(_("  -o, --option=NAME[=VALUE]\n"
                         "                         pass option NAME with optional value VALUE to the\n"
@@ -725,7 +725,7 @@ main(int argc, char **argv)
                }
        }
 
-       while ((c = getopt_long(argc, argv, "f:F:nvd:h:p:U:wWI:E:o:P:s:S:",
+       while ((c = getopt_long(argc, argv, "E:f:F:nvd:h:p:U:wWI:o:P:s:S:",
                                                        long_options, &option_index)) != -1)
        {
                switch (c)

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 68003c35331b40a655d71b6f2ef5e59400e76c6e..2a08abfba51ac1200bded0b22796a690f7cf3589 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -131,11 +131,11 @@ main(int argc, char *argv[])
                {"role", required_argument, NULL, 3},
                {"use-set-session-authorization", no_argument, &use_setsessauth, 1},
                {"no-publications", no_argument, &no_publications, 1},
+               {"no-role-passwords", no_argument, &no_role_passwords, 1},
                {"no-security-labels", no_argument, &no_security_labels, 1},
                {"no-subscriptions", no_argument, &no_subscriptions, 1},
                {"no-sync", no_argument, NULL, 4},
                {"no-unlogged-table-data", no_argument, &no_unlogged_table_data, 1},
-               {"no-role-passwords", no_argument, &no_role_passwords, 1},
 
                {NULL, 0, NULL, 0}
        };
@@ -599,12 +599,12 @@ help(void)
        printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
        printf(_("  --inserts                    dump data as INSERT commands, rather than COPY\n"));
        printf(_("  --no-publications            do not dump publications\n"));
+       printf(_("  --no-role-passwords          do not dump passwords for roles\n"));
        printf(_("  --no-security-labels         do not dump security label assignments\n"));
        printf(_("  --no-subscriptions           do not dump subscriptions\n"));
        printf(_("  --no-sync                    do not wait for changes to be written safely to disk\n"));
        printf(_("  --no-tablespaces             do not dump tablespace assignments\n"));
        printf(_("  --no-unlogged-table-data     do not dump unlogged table data\n"));
-       printf(_("  --no-role-passwords          do not dump passwords for roles\n"));
        printf(_("  --quote-all-identifiers      quote all identifiers, even if not key words\n"));
        printf(_("  --use-set-session-authorization\n"
                         "                               use SET SESSION AUTHORIZATION commands instead of\n"

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index ae3624721e11bae0f2a6c57c83920c07550404a1..14aa587a27399d588149696f1dfe03558bc6c4cb 100644 (file)
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -511,10 +511,10 @@ usage(void)
                 "  -T, --time=NUM           duration of benchmark test in seconds\n"
                   "  -v, --vacuum-all         vacuum all four standard tables before tests\n"
                   "  --aggregate-interval=NUM aggregate data over NUM seconds\n"
-               "  --progress-timestamp     use Unix epoch timestamps for progress\n"
-                  "  --sampling-rate=NUM      fraction of transactions to log (e.g., 0.01 for 1%%)\n"
                   "  --log-prefix=PREFIX      prefix for transaction time log file\n"
                   "                           (default: \"pgbench_log\")\n"
+               "  --progress-timestamp     use Unix epoch timestamps for progress\n"
+                  "  --sampling-rate=NUM      fraction of transactions to log (e.g., 0.01 for 1%%)\n"
                   "\nCommon options:\n"
                   "  -d, --debug              print debugging output\n"
          "  -h, --host=HOSTNAME      database server host or socket directory\n"