Put new command-line options into alphabetical order in help output

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 65dcfff0a031d424fb2e102fc2b95c63b9975967..c1f2253af2ecb62a9f5ef1fed1cf00d2450aedbc 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -378,14 +378,14 @@ usage(void)
        printf(_("Usage:\n"));
        printf(_("  %s [OPTION]...\n"), progname);
        printf(_("\nOptions controlling the output:\n"));
-       printf(_("  -t, --target=TARGET[:DETAIL]\n"
-                        "                         backup target (if other than client)\n"));
        printf(_("  -D, --pgdata=DIRECTORY receive base backup into directory\n"));
        printf(_("  -F, --format=p|t       output format (plain (default), tar)\n"));
        printf(_("  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
                         "                         (in kB/s, or use suffix \"k\" or \"M\")\n"));
        printf(_("  -R, --write-recovery-conf\n"
                         "                         write configuration for replication\n"));
+       printf(_("  -t, --target=TARGET[:DETAIL]\n"
+                        "                         backup target (if other than client)\n"));
        printf(_("  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
                         "                         relocate tablespace in OLDDIR to NEWDIR\n"));
        printf(_("      --waldir=WALDIR    location for the write-ahead log directory\n"));

diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 2ca4dd29afe3074a77f63f79f8cb2fc387267072..1ff8da1676481fa39737a3c6e305f35e822f4e74 100644 (file)
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -88,8 +88,6 @@ usage(const char *progname)
        printf(_("Options:\n"));
        printf(_("  -c, --restore-target-wal       use restore_command in target configuration to\n"
                         "                                 retrieve WAL files from archives\n"));
-       printf(_("      --config-file=FILENAME     use specified main server configuration\n"));
-       printf(_("                                 file when running target cluster\n"));
        printf(_("  -D, --target-pgdata=DIRECTORY  existing data directory to modify\n"));
        printf(_("      --source-pgdata=DIRECTORY  source data directory to synchronize with\n"));
        printf(_("      --source-server=CONNSTR    source server to synchronize with\n"));
@@ -99,6 +97,8 @@ usage(const char *progname)
        printf(_("  -P, --progress                 write progress messages\n"));
        printf(_("  -R, --write-recovery-conf      write configuration for replication\n"
                         "                                 (requires --source-server)\n"));
+       printf(_("      --config-file=FILENAME     use specified main server configuration\n"
+                        "                                 file when running target cluster\n"));
        printf(_("      --debug                    write a lot of debug messages\n"));
        printf(_("      --no-ensure-shutdown       do not automatically fix unclean shutdown\n"));
        printf(_("  -V, --version                  output version information, then exit\n"));

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 8a31ffa0677fff082c6006540ae05cc1b68b58db..8197da8546d8e9d0ac19c0845223912eeb823131 100644 (file)
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -921,11 +921,11 @@ usage(void)
                   "  --log-prefix=PREFIX      prefix for transaction time log file\n"
                   "                           (default: \"pgbench_log\")\n"
                   "  --max-tries=NUM          max number of tries to run transaction (default: 1)\n"
-                  "  --verbose-errors         print messages of all errors\n"
                   "  --progress-timestamp     use Unix epoch timestamps for progress\n"
                   "  --random-seed=SEED       set random seed (\"time\", \"rand\", integer)\n"
                   "  --sampling-rate=NUM      fraction of transactions to log (e.g., 0.01 for 1%%)\n"
                   "  --show-script=NAME       show builtin script code, then exit\n"
+                  "  --verbose-errors         print messages of all errors\n"
                   "\nCommon options:\n"
                   "  -d, --debug              print debugging output\n"
                   "  -h, --host=HOSTNAME      database server host or socket directory\n"