diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/oid2name/oid2name.c | 28 | ||||
| -rw-r--r-- | contrib/pg_archivecleanup/pg_archivecleanup.c | 10 | ||||
| -rw-r--r-- | contrib/pg_standby/pg_standby.c | 4 | ||||
| -rw-r--r-- | contrib/pg_upgrade/option.c | 2 | ||||
| -rw-r--r-- | contrib/pgbench/pgbench.c | 12 | ||||
| -rw-r--r-- | contrib/vacuumlo/vacuumlo.c | 21 |
6 files changed, 39 insertions, 38 deletions
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index c7ba1bd1010..e8a389e49e7 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -179,20 +179,20 @@ help(const char *progname) "Usage:\n" " %s [OPTION]...\n" "\nOptions:\n" - " -d DBNAME database to connect to\n" - " -f FILENODE show info for table with given file node\n" - " -H HOSTNAME database server host or socket directory\n" - " -i show indexes and sequences too\n" - " -o OID show info for table with given OID\n" - " -p PORT database server port number\n" - " -q quiet (don't show headers)\n" - " -s show all tablespaces\n" - " -S show system objects too\n" - " -t TABLE show info for named table\n" - " -U NAME connect as specified database user\n" - " -x extended (show additional columns)\n" - " --help show this help, then exit\n" - " --version output version information, then exit\n" + " -d DBNAME database to connect to\n" + " -f FILENODE show info for table with given file node\n" + " -H HOSTNAME database server host or socket directory\n" + " -i show indexes and sequences too\n" + " -o OID show info for table with given OID\n" + " -p PORT database server port number\n" + " -q quiet (don't show headers)\n" + " -s show all tablespaces\n" + " -S show system objects too\n" + " -t TABLE show info for named table\n" + " -U NAME connect as specified database user\n" + " -V, --version output version information, then exit\n" + " -x extended (show additional columns)\n" + " -?, --help show this help, then exit\n" "\nThe default action is to show all database OIDs.\n\n" "Report bugs to <pgsql-bugs@postgresql.org>.\n", progname, progname); diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c index a226101bbc4..8f77998de12 100644 --- a/contrib/pg_archivecleanup/pg_archivecleanup.c +++ b/contrib/pg_archivecleanup/pg_archivecleanup.c @@ -249,11 +249,11 @@ usage(void) printf("Usage:\n"); printf(" %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n", progname); printf("\nOptions:\n"); - printf(" -d generate debug output (verbose mode)\n"); - printf(" -n dry run, show the names of the files that would be removed\n"); - printf(" -x EXT clean up files if they have this extension\n"); - printf(" --help show this help, then exit\n"); - printf(" --version output version information, then exit\n"); + printf(" -d generate debug output (verbose mode)\n"); + printf(" -n dry run, show the names of the files that would be removed\n"); + printf(" -V, --version output version information, then exit\n"); + printf(" -x EXT clean up files if they have this extension\n"); + printf(" -?, --help show this help, then exit\n"); printf("\n" "For use as archive_cleanup_command in recovery.conf when standby_mode = on:\n" " archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n" diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index 57241ff8970..84941ede137 100644 --- a/contrib/pg_standby/pg_standby.c +++ b/contrib/pg_standby/pg_standby.c @@ -527,9 +527,9 @@ usage(void) printf(" -s SLEEPTIME seconds to wait between file checks (min=1, max=60,\n" " default=5)\n"); printf(" -t TRIGGERFILE trigger file to initiate failover (no default)\n"); + printf(" -V, --version output version information, then exit\n"); printf(" -w MAXWAITTIME max seconds to wait for a file (0=no limit) (default=0)\n"); - printf(" --help show this help, then exit\n"); - printf(" --version output version information, then exit\n"); + printf(" -?, --help show this help, then exit\n"); printf("\n" "Main intended use as restore_command in recovery.conf:\n" " restore_command = 'pg_standby [OPTION]... ARCHIVELOCATION %%f %%p %%r'\n" diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c index ccf00434d3b..43394a0fb4a 100644 --- a/contrib/pg_upgrade/option.c +++ b/contrib/pg_upgrade/option.c @@ -236,7 +236,7 @@ Options:\n\ -u, --user=NAME cluster superuser (default \"%s\")\n\ -v, --verbose enable verbose internal logging\n\ -V, --version display version information, then exit\n\ - -h, --help show this help, then exit\n\ + -?, -h, --help show this help, then exit\n\ \n\ Before running pg_upgrade you must:\n\ create a new database cluster (using the new version of initdb)\n\ diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 25fb15a8471..f2fdc6c56f6 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -368,12 +368,12 @@ usage(const char *progname) " -T NUM duration of benchmark test in seconds\n" " -v vacuum all four standard tables before tests\n" "\nCommon options:\n" - " -d print debugging output\n" - " -h HOSTNAME database server host or socket directory\n" - " -p PORT database server port number\n" - " -U USERNAME connect as specified database user\n" - " --help show this help, then exit\n" - " --version output version information, then exit\n" + " -d print debugging output\n" + " -h HOSTNAME database server host or socket directory\n" + " -p PORT database server port number\n" + " -U USERNAME connect as specified database user\n" + " -V, --version output version information, then exit\n" + " -?, --help show this help, then exit\n" "\n" "Report bugs to <pgsql-bugs@postgresql.org>.\n", progname, progname); diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index 958a496b24a..7f5287c27ae 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -384,16 +384,17 @@ usage(const char *progname) printf("%s removes unreferenced large objects from databases.\n\n", progname); printf("Usage:\n %s [OPTION]... DBNAME...\n\n", progname); printf("Options:\n"); - printf(" -h HOSTNAME database server host or socket directory\n"); - printf(" -l LIMIT commit after removing each LIMIT large objects\n"); - printf(" -n don't remove large objects, just show what would be done\n"); - printf(" -p PORT database server port\n"); - printf(" -U USERNAME user name to connect as\n"); - printf(" -w never prompt for password\n"); - printf(" -W force password prompt\n"); - printf(" -v write a lot of progress messages\n"); - printf(" --help show this help, then exit\n"); - printf(" --version output version information, then exit\n"); + printf(" -l LIMIT commit after removing each LIMIT large objects\n"); + printf(" -n don't remove large objects, just show what would be done\n"); + printf(" -v write a lot of progress messages\n"); + printf(" -V, --version output version information, then exit\n"); + printf(" -?, --help show this help, then exit\n"); + printf("\nConnection options:\n"); + printf(" -h HOSTNAME database server host or socket directory\n"); + printf(" -p PORT database server port\n"); + printf(" -U USERNAME user name to connect as\n"); + printf(" -w never prompt for password\n"); + printf(" -W force password prompt\n"); printf("\n"); printf("Report bugs to <pgsql-bugs@postgresql.org>.\n"); } |
