Sort the output of --help mostly alphabetical, make it align better, make

help of pg_dump and pg_dumpall more similar.

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 28fe6390361559970eb7894ba406061d97a10075..de18bc567c6974ede425eb33fae5aa383675f2d5 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2420,29 +2420,29 @@ usage(const char *progname)
        printf(_("Usage:\n"));
        printf(_("  %s [OPTION]... [DATADIR]\n"), progname);
        printf(_("\nOptions:\n"));
+       printf(_("  -A, --auth=METHOD         default authentication method for local connections\n"));
        printf(_(" [-D, --pgdata=]DATADIR     location for this database cluster\n"));
        printf(_("  -E, --encoding=ENCODING   set default encoding for new databases\n"));
-       printf(_("  --locale=LOCALE           set default locale for new databases\n"));
-       printf(_("  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
-                        "  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
-                        "                            set default locale in the respective\n"
-                        "                            category for new databases (default\n"
-                        "                            taken from environment)\n"));
-       printf(_("  --no-locale               equivalent to --locale=C\n"));
+       printf(_("      --locale=LOCALE       set default locale for new databases\n"));
+       printf(_("      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+                "      --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+                "                            set default locale in the respective category for\n"
+                "                            new databases (default taken from environment)\n"));
+       printf(_("      --no-locale           equivalent to --locale=C\n"));
+       printf(_("      --pwfile=FILE         read password for the new superuser from file\n"));
        printf(_("  -T, --text-search-config=CFG\n"
                 "                            default text search configuration\n"));
-       printf(_("  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"));
-       printf(_("  -A, --auth=METHOD         default authentication method for local connections\n"));
        printf(_("  -U, --username=NAME       database superuser name\n"));
        printf(_("  -W, --pwprompt            prompt for a password for the new superuser\n"));
-       printf(_("  --pwfile=FILE             read password for the new superuser from file\n"));
-       printf(_("  -?, --help                show this help, then exit\n"));
-       printf(_("  -V, --version             output version information, then exit\n"));
+       printf(_("  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"));
        printf(_("\nLess commonly used options:\n"));
        printf(_("  -d, --debug               generate lots of debugging output\n"));
-       printf(_("  -s, --show                show internal settings\n"));
        printf(_("  -L DIRECTORY              where to find the input files\n"));
        printf(_("  -n, --noclean             do not clean up after errors\n"));
+       printf(_("  -s, --show                show internal settings\n"));
+       printf(_("\nOther options:\n"));
+       printf(_("  -?, --help                show this help, then exit\n"));
+       printf(_("  -V, --version             output version information, then exit\n"));
        printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"
                         "is used.\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index b61eec3cba8fc2e0222ff196d3ac4650298af620..1a8b5983be4bc510053f6ca0ba9e3788017acd92 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -1546,15 +1546,15 @@ do_help(void)
        printf(_("If the -D option is omitted, the environment variable PGDATA is used.\n"));
 
        printf(_("\nOptions for start or restart:\n"));
-       printf(_("  -l, --log FILENAME     write (or append) server log to FILENAME\n"));
-       printf(_("  -o OPTIONS             command line options to pass to postgres\n"
-                        "                         (PostgreSQL server executable)\n"));
-       printf(_("  -p PATH-TO-POSTGRES    normally not necessary\n"));
 #if defined(HAVE_GETRLIMIT) && defined(RLIMIT_CORE)
        printf(_("  -c, --core-files       allow postgres to produce core files\n"));
 #else
        printf(_("  -c, --core-files       not applicable on this platform\n"));
 #endif
+       printf(_("  -l, --log FILENAME     write (or append) server log to FILENAME\n"));
+       printf(_("  -o OPTIONS             command line options to pass to postgres\n"
+                        "                         (PostgreSQL server executable)\n"));
+       printf(_("  -p PATH-TO-POSTGRES    normally not necessary\n"));
        printf(_("\nOptions for stop or restart:\n"));
        printf(_("  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"));
 

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 2ef634d739f87452b82c822529cc77bc49bee690..c39c68da36f0a4a008ca1e8564704ca1d064eaa2 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -816,11 +816,10 @@ help(const char *progname)
        printf(_("  -n, --schema=SCHEMA         dump the named schema(s) only\n"));
        printf(_("  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"));
        printf(_("  -o, --oids                  include OIDs in dump\n"));
-       printf(_("  -O, --no-owner              skip restoration of object ownership\n"
-                        "                              in plain text format\n"));
+       printf(_("  -O, --no-owner              skip restoration of object ownership in\n"
+                "                              plain-text format\n"));
        printf(_("  -s, --schema-only           dump only the schema, no data\n"));
-       printf(_("  -S, --superuser=NAME        specify the superuser user name to use in\n"
-                        "                              plain text format\n"));
+       printf(_("  -S, --superuser=NAME        superuser user name to use in plain-text format\n"));
        printf(_("  -t, --table=TABLE           dump the named table(s) only\n"));
        printf(_("  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"));
        printf(_("  -x, --no-privileges         do not dump privileges (grant/revoke)\n"));
@@ -829,8 +828,8 @@ help(const char *progname)
        printf(_("  --no-tablespaces            do not dump tablespace assignments\n"));
        printf(_("  --role=ROLENAME             do SET ROLE before dump\n"));
        printf(_("  --use-set-session-authorization\n"
-                        "                              use SESSION AUTHORIZATION commands instead of\n"
-       "                              ALTER OWNER commands to set ownership\n"));
+                "                              use SET SESSION AUTHORIZATION commands instead of\n"
+                "                              ALTER OWNER commands to set ownership\n"));
 
        printf(_("\nConnection options:\n"));
        printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 2255a6716b58f34762710a102dbd4533a812c4ca..8ff24b14ffaac88ea506193717d1aab3b32e300f 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -498,41 +498,40 @@ help(void)
        printf(_("  %s [OPTION]...\n"), progname);
 
        printf(_("\nGeneral options:\n"));
-       printf(_("  -f, --file=FILENAME      output file name\n"));
-       printf(_("  --help                   show this help, then exit\n"));
-       printf(_("  --version                output version information, then exit\n"));
-       printf(_("  --lock-wait-timeout=TIMEOUT\n"
-                        "                           fail after waiting TIMEOUT for a table lock\n"));
+       printf(_("  -f, --file=FILENAME         output file name\n"));
+       printf(_("  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"));
+       printf(_("  --help                      show this help, then exit\n"));
+       printf(_("  --version                   output version information, then exit\n"));
        printf(_("\nOptions controlling the output content:\n"));
-       printf(_("  -a, --data-only          dump only the data, not the schema\n"));
-       printf(_("  -c, --clean              clean (drop) databases before recreating\n"));
-       printf(_("  -d, --inserts            dump data as INSERT, rather than COPY, commands\n"));
-       printf(_("  -D, --column-inserts     dump data as INSERT commands with column names\n"));
-       printf(_("  -g, --globals-only       dump only global objects, no databases\n"));
-       printf(_("  -o, --oids               include OIDs in dump\n"));
-       printf(_("  -O, --no-owner           skip restoration of object ownership\n"));
-       printf(_("  -r, --roles-only         dump only roles, no databases or tablespaces\n"));
-       printf(_("  -s, --schema-only        dump only the schema, no data\n"));
-       printf(_("  -S, --superuser=NAME     specify the superuser user name to use in the dump\n"));
-       printf(_("  -t, --tablespaces-only   dump only tablespaces, no databases or roles\n"));
-       printf(_("  -x, --no-privileges      do not dump privileges (grant/revoke)\n"));
-       printf(_("  --disable-dollar-quoting\n"
-                        "                           disable dollar quoting, use SQL standard quoting\n"));
-       printf(_("  --disable-triggers       disable triggers during data-only restore\n"));
-       printf(_("  --no-tablespaces         do not dump tablespace assignments\n"));
-       printf(_("  --role=ROLENAME          do SET ROLE before dump\n"));
+       printf(_("  -a, --data-only             dump only the data, not the schema\n"));
+       printf(_("  -c, --clean                 clean (drop) databases before recreating\n"));
+       printf(_("  -d, --inserts               dump data as INSERT commands, rather than COPY\n"));
+       printf(_("  -D, --column-inserts        dump data as INSERT commands with column names\n"));
+       printf(_("  -g, --globals-only          dump only global objects, no databases\n"));
+       printf(_("  -o, --oids                  include OIDs in dump\n"));
+       printf(_("  -O, --no-owner              skip restoration of object ownership\n"));
+       printf(_("  -r, --roles-only            dump only roles, no databases or tablespaces\n"));
+       printf(_("  -s, --schema-only           dump only the schema, no data\n"));
+       printf(_("  -S, --superuser=NAME        superuser user name to use in the dump\n"));
+       printf(_("  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"));
+       printf(_("  -x, --no-privileges         do not dump privileges (grant/revoke)\n"));
+       printf(_("  --disable-dollar-quoting    disable dollar quoting, use SQL standard quoting\n"));
+       printf(_("  --disable-triggers          disable triggers during data-only restore\n"));
+       printf(_("  --no-tablespaces            do not dump tablespace assignments\n"));
+       printf(_("  --role=ROLENAME             do SET ROLE before dump\n"));
        printf(_("  --use-set-session-authorization\n"
-                        "                           use SESSION AUTHORIZATION commands instead of\n"
-                        "                           OWNER TO commands\n"));
+                "                              use SET SESSION AUTHORIZATION commands instead of\n"
+                "                              ALTER OWNER commands to set ownership\n"));
 
        printf(_("\nConnection options:\n"));
        printf(_("  -h, --host=HOSTNAME      database server host or socket directory\n"));
-       printf(_("  -l, --database=DBNAME    specify an alternative default database\n"));
+       printf(_("  -l, --database=DBNAME    alternative default database\n"));
        printf(_("  -p, --port=PORT          database server port number\n"));
        printf(_("  -U, --username=NAME      connect as specified database user\n"));
        printf(_("  -W, --password           force password prompt (should happen automatically)\n"));
 
-       printf(_("\nThe SQL script will be written to the standard output.\n\n"));
+       printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n"
+               "output.\n\n"));
        printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));
 }
 

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 85c67d8427865a5d6a4d39a7125aa0a51a42ef66..e5fdaa8cb198f9221412f5605f9509e687e15be3 100644 (file)
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -397,7 +397,7 @@ usage(const char *progname)
        printf(_("\nGeneral options:\n"));
        printf(_("  -d, --dbname=NAME        connect to database name\n"));
        printf(_("  -f, --file=FILENAME      output file name\n"));
-       printf(_("  -F, --format=c|t         specify backup file format\n"));
+       printf(_("  -F, --format=c|t         backup file format (should be automatic)\n"));
        printf(_("  -l, --list               print summarized TOC of the archive\n"));
        printf(_("  -v, --verbose            verbose mode\n"));
        printf(_("  --help                   show this help, then exit\n"));
@@ -407,17 +407,17 @@ usage(const char *progname)
        printf(_("  -a, --data-only          restore only the data, no schema\n"));
        printf(_("  -c, --clean              clean (drop) database objects before recreating\n"));
        printf(_("  -C, --create             create the target database\n"));
+       printf(_("  -e, --exit-on-error      exit on error, default is to continue\n"));
        printf(_("  -I, --index=NAME         restore named index\n"));
-       printf(_("  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
-                        "                           output from this file\n"));
+       printf(_("  -L, --use-list=FILENAME  use table of contents from this file for\n"
+                "                           selecting/ordering output\n"));
        printf(_("  -m, --multi-thread=NUM   use this many parallel connections to restore\n"));
        printf(_("  -n, --schema=NAME        restore only objects in this schema\n"));
        printf(_("  -O, --no-owner           skip restoration of object ownership\n"));
        printf(_("  -P, --function=NAME(args)\n"
                         "                           restore named function\n"));
        printf(_("  -s, --schema-only        restore only the schema, no data\n"));
-       printf(_("  -S, --superuser=NAME     specify the superuser user name to use for\n"
-                        "                           disabling triggers\n"));
+       printf(_("  -S, --superuser=NAME     superuser user name to use for disabling triggers\n"));
        printf(_("  -t, --table=NAME         restore named table\n"));
        printf(_("  -T, --trigger=NAME       restore named trigger\n"));
        printf(_("  -x, --no-privileges      skip restoration of access privileges (grant/revoke)\n"));
@@ -428,8 +428,8 @@ usage(const char *progname)
        printf(_("  --no-tablespaces         do not dump tablespace assignments\n"));
        printf(_("  --role=ROLENAME          do SET ROLE before restore\n"));
        printf(_("  --use-set-session-authorization\n"
-                        "                           use SESSION AUTHORIZATION commands instead of\n"
-                        "                           OWNER TO commands\n"));
+                "                           use SET SESSION AUTHORIZATION commands instead of\n"
+                "                           ALTER OWNER commands to set ownership\n"));
        printf(_("  -1, --single-transaction\n"
                         "                           restore as a single transaction\n"));
 
@@ -438,7 +438,6 @@ usage(const char *progname)
        printf(_("  -p, --port=PORT          database server port number\n"));
        printf(_("  -U, --username=NAME      connect as specified database user\n"));
        printf(_("  -W, --password           force password prompt (should happen automatically)\n"));
-       printf(_("  -e, --exit-on-error      exit on error, default is to continue\n"));
 
        printf(_("\nIf no input file name is supplied, then standard input is used.\n\n"));
        printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));

diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index 51cdde11450f4f960ae9d1b770b43655d85894b1..0d3c42693edc3215d451da9752bda1917d82234e 100644 (file)
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -921,6 +921,7 @@ usage(void)
        printf(_("%s resets the PostgreSQL transaction log.\n\n"), progname);
        printf(_("Usage:\n  %s [OPTION]... DATADIR\n\n"), progname);
        printf(_("Options:\n"));
+       printf(_("  -e XIDEPOCH     set next transaction ID epoch\n"));
        printf(_("  -f              force update to be done\n"));
        printf(_("  -l TLI,FILE,SEG force minimum WAL starting location for new transaction log\n"));
        printf(_("  -m XID          set next multitransaction ID\n"));
@@ -928,7 +929,6 @@ usage(void)
        printf(_("  -o OID          set next OID\n"));
        printf(_("  -O OFFSET       set next multitransaction offset\n"));
        printf(_("  -x XID          set next transaction ID\n"));
-       printf(_("  -e XIDEPOCH     set next transaction ID epoch\n"));
        printf(_("  --help          show this help, then exit\n"));
        printf(_("  --version       output version information, then exit\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index c56f68a9e73ca694c59ad24037a66cfed520733f..bdc8dc8de7232e0b3c6d41566701040c04a7d375 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -94,13 +94,13 @@ usage(void)
        env = getenv("PGDATABASE");
        if (!env)
                env = user;
-       printf(_("  -d DBNAME       specify database name to connect to (default: \"%s\")\n"), env);
        puts(_("  -c COMMAND      run only single command (SQL or internal) and exit"));
+       printf(_("  -d DBNAME       database name to connect to (default: \"%s\")\n"), env);
        puts(_("  -f FILENAME     execute commands from file, then exit"));
-       puts(_("  -1 (\"one\")      execute command file as a single transaction"));
        puts(_("  -l              list available databases, then exit"));
        puts(_("  -v NAME=VALUE   set psql variable NAME to VALUE"));
        puts(_("  -X              do not read startup file (~/.psqlrc)"));
+       puts(_("  -1 (\"one\")      execute command file as a single transaction"));
        puts(_("  --help          show this help, then exit"));
        puts(_("  --version       output version information, then exit"));
 
@@ -108,23 +108,23 @@ usage(void)
        puts(_("  -a              echo all input from script"));
        puts(_("  -e              echo commands sent to server"));
        puts(_("  -E              display queries that internal commands generate"));
-       puts(_("  -q              run quietly (no messages, only query output)"));
-       puts(_("  -o FILENAME     send query results to file (or |pipe)"));
+       puts(_("  -L FILENAME     send session log to file"));
        puts(_("  -n              disable enhanced command line editing (readline)"));
+       puts(_("  -o FILENAME     send query results to file (or |pipe)"));
+       puts(_("  -q              run quietly (no messages, only query output)"));
        puts(_("  -s              single-step mode (confirm each query)"));
        puts(_("  -S              single-line mode (end of line terminates SQL command)"));
-       puts(_("  -L FILENAME     send session log to file"));
 
        puts(_("\nOutput format options:"));
        puts(_("  -A              unaligned table output mode (-P format=unaligned)"));
+       printf(_("  -F STRING       set field separator (default: \"%s\") (-P fieldsep=)\n"),
+                  DEFAULT_FIELD_SEP);
        puts(_("  -H              HTML table output mode (-P format=html)"));
+       puts(_("  -P VAR[=ARG]    set printing option VAR to ARG (see \\pset command)"));
+       puts(_("  -R STRING       set record separator (default: newline) (-P recordsep=)"));
        puts(_("  -t              print rows only (-P tuples_only)"));
        puts(_("  -T TEXT         set HTML table tag attributes (width, border) (-P tableattr=)"));
        puts(_("  -x              turn on expanded table output (-P expanded)"));
-       puts(_("  -P VAR[=ARG]    set printing option VAR to ARG (see \\pset command)"));
-       printf(_("  -F STRING       set field separator (default: \"%s\") (-P fieldsep=)\n"),
-                  DEFAULT_FIELD_SEP);
-       puts(_("  -R STRING       set record separator (default: newline) (-P recordsep=)"));
 
        puts(_("\nConnection options:"));
        /* Display default host */

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index ac49bed92220f09ab6a94eeffe39932681ad39c6..7f6373f0b03c9698a024ecf5b7e835ac30142de9 100644 (file)
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -234,9 +234,9 @@ help(const char *progname)
        printf(_("\nOptions:\n"));
        printf(_("  -a, --all                 cluster all databases\n"));
        printf(_("  -d, --dbname=DBNAME       database to cluster\n"));
-       printf(_("  -t, --table=TABLE         cluster specific table only\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
        printf(_("  -q, --quiet               don't write any messages\n"));
+       printf(_("  -t, --table=TABLE         cluster specific table only\n"));
        printf(_("  -v, --verbose             write a lot of output\n"));
        printf(_("  --help                    show this help, then exit\n"));
        printf(_("  --version                 output version information, then exit\n"));

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index ebc133b85e4ddb6963a381e830f1c107a199d5d3..180dc5a6c4a1fd4e0771a271b58ab3bf4b7ba2f5 100644 (file)
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -246,13 +246,13 @@ help(const char *progname)
        printf(_("  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"), progname);
        printf(_("\nOptions:\n"));
        printf(_("  -D, --tablespace=TABLESPACE  default tablespace for the database\n"));
+       printf(_("  -e, --echo                   show the commands being sent to the server\n"));
        printf(_("  -E, --encoding=ENCODING      encoding for the database\n"));
        printf(_("  -l, --locale=LOCALE          locale settings for the database\n"));
-       printf(_("  --lc-collate=LOCALE          LC_COLLATE setting for the database\n"));
-       printf(_("  --lc-ctype=LOCALE            LC_CTYPE setting for the database\n"));
+       printf(_("      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"));
+       printf(_("      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"));
        printf(_("  -O, --owner=OWNER            database user to own the new database\n"));
        printf(_("  -T, --template=TEMPLATE      template database to copy\n"));
-       printf(_("  -e, --echo                   show the commands being sent to the server\n"));
        printf(_("  --help                       show this help, then exit\n"));
        printf(_("  --version                    output version information, then exit\n"));
        printf(_("\nConnection options:\n"));

diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index 3ecc2230761f61dfa552aad1072e1f71d46bdfa8..0bf96417ed2d91cf6adc2bb0ec1df0564551743f 100644 (file)
--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.c
@@ -214,11 +214,12 @@ help(const char *progname)
        printf(_("  -d, --dbname=DBNAME       database to install language in\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
        printf(_("  -l, --list                show a list of currently installed languages\n"));
+       printf(_("  --help                    show this help, then exit\n"));
+       printf(_("  --version                 output version information, then exit\n"));
+       printf(_("\nConnection options:\n"));
        printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
        printf(_("  -p, --port=PORT           database server port\n"));
        printf(_("  -U, --username=USERNAME   user name to connect as\n"));
        printf(_("  -W, --password            force password prompt\n"));
-       printf(_("  --help                    show this help, then exit\n"));
-       printf(_("  --version                 output version information, then exit\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 069fb4158ed9227b22a462822404a7c1c09ce4c0..84a0c6dcc62771b8b0525725642dd695de237b79 100644 (file)
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -307,22 +307,22 @@ help(const char *progname)
        printf(_("Usage:\n"));
        printf(_("  %s [OPTION]... [ROLENAME]\n"), progname);
        printf(_("\nOptions:\n"));
-       printf(_("  -s, --superuser           role will be superuser\n"));
-       printf(_("  -S, --no-superuser        role will not be superuser\n"));
+       printf(_("  -c, --connection-limit=N  connection limit for role (default: no limit)\n"));
        printf(_("  -d, --createdb            role can create new databases\n"));
        printf(_("  -D, --no-createdb         role cannot create databases\n"));
-       printf(_("  -r, --createrole          role can create new roles\n"));
-       printf(_("  -R, --no-createrole       role cannot create roles\n"));
-       printf(_("  -l, --login               role can login (default)\n"));
-       printf(_("  -L, --no-login            role cannot login\n"));
+       printf(_("  -e, --echo                show the commands being sent to the server\n"));
+       printf(_("  -E, --encrypted           encrypt stored password\n"));
        printf(_("  -i, --inherit             role inherits privileges of roles it is a\n"
                         "                            member of (default)\n"));
        printf(_("  -I, --no-inherit          role does not inherit privileges\n"));
-       printf(_("  -c, --connection-limit=N  connection limit for role (default: no limit)\n"));
-       printf(_("  -P, --pwprompt            assign a password to new role\n"));
-       printf(_("  -E, --encrypted           encrypt stored password\n"));
+       printf(_("  -l, --login               role can login (default)\n"));
+       printf(_("  -L, --no-login            role cannot login\n"));
        printf(_("  -N, --unencrypted         do not encrypt stored password\n"));
-       printf(_("  -e, --echo                show the commands being sent to the server\n"));
+       printf(_("  -P, --pwprompt            assign a password to new role\n"));
+       printf(_("  -r, --createrole          role can create new roles\n"));
+       printf(_("  -R, --no-createrole       role cannot create roles\n"));
+       printf(_("  -s, --superuser           role will be superuser\n"));
+       printf(_("  -S, --no-superuser        role will not be superuser\n"));
        printf(_("  --help                    show this help, then exit\n"));
        printf(_("  --version                 output version information, then exit\n"));
        printf(_("\nConnection options:\n"));
@@ -330,7 +330,7 @@ help(const char *progname)
        printf(_("  -p, --port=PORT           database server port\n"));
        printf(_("  -U, --username=USERNAME   user name to connect as (not the one to create)\n"));
        printf(_("  -W, --password            force password prompt\n"));
-       printf(_("\nIf one of -s, -S, -d, -D, -r, -R and ROLENAME is not specified, you will\n"
+       printf(_("\nIf one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you will\n"
                         "be prompted interactively.\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }

diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index 36e9554fdf2a95ad6bab728712c9ab538767f644..de537619e5e699ba812a14ed3c1fac7fa58d020c 100644 (file)
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -142,11 +142,12 @@ help(const char *progname)
        printf(_("\nOptions:\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
        printf(_("  -i, --interactive         prompt before deleting anything\n"));
+       printf(_("  --help                    show this help, then exit\n"));
+       printf(_("  --version                 output version information, then exit\n"));
+       printf(_("\nConnection options:\n"));
        printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
        printf(_("  -p, --port=PORT           database server port\n"));
        printf(_("  -U, --username=USERNAME   user name to connect as\n"));
        printf(_("  -W, --password            force password prompt\n"));
-       printf(_("  --help                    show this help, then exit\n"));
-       printf(_("  --version                 output version information, then exit\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }

diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index c1774406ffeb791dd08265b6550a93a2574473c1..6d24b5e85cb19579dc9e183599569fa1259e03eb 100644 (file)
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -331,11 +331,12 @@ help(const char *progname)
        printf(_("  -d, --dbname=DBNAME       database from which to remove the language\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
        printf(_("  -l, --list                show a list of currently installed languages\n"));
+       printf(_("  --help                    show this help, then exit\n"));
+       printf(_("  --version                 output version information, then exit\n"));
+       printf(_("\nConnection options:\n"));
        printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
        printf(_("  -p, --port=PORT           database server port\n"));
        printf(_("  -U, --username=USERNAME   user name to connect as\n"));
        printf(_("  -W, --password            force password prompt\n"));
-       printf(_("  --help                    show this help, then exit\n"));
-       printf(_("  --version                 output version information, then exit\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index fdf68b78e21f46084a8c9f1ddff8ec4a495328f3..bfdc642d0bdb3d64b88295794f44c2f21fc315dd 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -141,11 +141,12 @@ help(const char *progname)
        printf(_("\nOptions:\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
        printf(_("  -i, --interactive         prompt before deleting anything\n"));
+       printf(_("  --help                    show this help, then exit\n"));
+       printf(_("  --version                 output version information, then exit\n"));
+       printf(_("\nConnection options:\n"));
        printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
        printf(_("  -p, --port=PORT           database server port\n"));
        printf(_("  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"));
        printf(_("  -W, --password            force password prompt\n"));
-       printf(_("  --help                    show this help, then exit\n"));
-       printf(_("  --version                 output version information, then exit\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index bf51fa52e624e09cd1b21458d34baf863b97fa5c..2ebaadbb1bff3e26cf9febe07b4a1cb3531e03de 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -310,12 +310,12 @@ help(const char *progname)
        printf(_("  %s [OPTION]... [DBNAME]\n"), progname);
        printf(_("\nOptions:\n"));
        printf(_("  -a, --all                 reindex all databases\n"));
-       printf(_("  -s, --system              reindex system catalogs\n"));
        printf(_("  -d, --dbname=DBNAME       database to reindex\n"));
-       printf(_("  -t, --table=TABLE         reindex specific table only\n"));
-       printf(_("  -i, --index=INDEX         recreate specific index only\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
+       printf(_("  -i, --index=INDEX         recreate specific index only\n"));
        printf(_("  -q, --quiet               don't write any messages\n"));
+       printf(_("  -s, --system              reindex system catalogs\n"));
+       printf(_("  -t, --table=TABLE         reindex specific table only\n"));
        printf(_("  --help                    show this help, then exit\n"));
        printf(_("  --version                 output version information, then exit\n"));
        printf(_("\nConnection options:\n"));

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 55f1f415ddf1bab3e4f41249cff2099bfbab8335..b465409119a5a95260f4cd6f2eaa9eb1369f6a3e 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -260,13 +260,13 @@ help(const char *progname)
        printf(_("\nOptions:\n"));
        printf(_("  -a, --all                       vacuum all databases\n"));
        printf(_("  -d, --dbname=DBNAME             database to vacuum\n"));
-       printf(_("  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"));
+       printf(_("  -e, --echo                      show the commands being sent to the server\n"));
        printf(_("  -f, --full                      do full vacuuming\n"));
-       printf(_("  -z, --analyze                   update optimizer hints\n"));
        printf(_("  -F, --freeze                    freeze row transaction information\n"));
-       printf(_("  -e, --echo                      show the commands being sent to the server\n"));
        printf(_("  -q, --quiet                     don't write any messages\n"));
+       printf(_("  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"));
        printf(_("  -v, --verbose                   write a lot of output\n"));
+       printf(_("  -z, --analyze                   update optimizer hints\n"));
        printf(_("  --help                          show this help, then exit\n"));
        printf(_("  --version                       output version information, then exit\n"));
        printf(_("\nConnection options:\n"));

diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index 2ec89b0390314934d29ebe442ad95b117a9b27eb..435d32fe280e3a38593ce52433ad2377e5950f8c 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -53,9 +53,9 @@ help(const char *progname)
        printf(_("  -o OUTFILE     write result to OUTFILE\n"));
        printf(_("  -r OPTION      specify run-time behavior; OPTION can be:\n"
                         "                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"));
+       printf(_("  --regression   run in regression testing mode\n"));
        printf(_("  -t             turn on autocommit of transactions\n"));
        printf(_("  --help         show this help, then exit\n"));
-       printf(_("  --regression   run in regression testing mode\n"));
        printf(_("  --version      output version information, then exit\n"));
        printf(_("\nIf no output file is specified, the name is formed by adding .c to the\n"
                   "input file name, after stripping off .pgc if present.\n"));