pg_upgrade: remove -h option

-h (help) is not needed;  pg_upgrade already supports --help and -?,
which is consistent with other tools.

diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
index c71db32ed1c9a68e60aae74eb8700c82165fc493..dee58ee28fc48f4af5c1d54245927ac7cc48ed47 100644 (file)
--- a/contrib/pg_upgrade/option.c
+++ b/contrib/pg_upgrade/option.c
@@ -82,8 +82,7 @@ parseCommandLine(int argc, char *argv[])
 
        if (argc > 1)
        {
-               if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ||
-                       strcmp(argv[1], "-?") == 0)
+               if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
                {
                        usage();
                        exit(0);
@@ -244,7 +243,7 @@ Options:\n\
   -U, --username=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\
+  -?, --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/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index d1677d45e9f36a65347c8a248fdbaf5791039e28..d3e26eec1d980529e7531ea12350153aa906eca1 100644 (file)
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -181,7 +181,6 @@
 
      <varlistentry>
       <term><option>-?</option></term>
-      <term><option>-h</option></term>
       <term><option>--help</option></term>
       <listitem><para>show help, then exit</para></listitem>
      </varlistentry>