Fix options listing of pg_restore --no-globals

The new pg_restore option --no-globals (commit 3c19983cc08) appeared
out of order in the documentation and help output.  Fix that.

diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 6ae2cdcfc10cd865600b9704e0644f48cad288f4..5e77ddd556f731c92a42dd4a282ec5530874b749 100644 (file)
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -296,26 +296,11 @@ PostgreSQL documentation
         <option>--schema-only</option>,
         <option>--statistics-only</option>,
         <option>--statistics</option>,
+        <option>--no-globals</option>,
         <option>--exit-on-error</option>,
         <option>--single-transaction</option>,
         <option>--clean</option>, or
-        <option>--transaction-size</option>,
-        <option>--no-globals</option>.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>--no-globals</option></term>
-      <listitem>
-       <para>
-        Do not restore global objects (roles and tablespaces).  When
-        <option>-C</option>/<option>--create</option> is not specified,
-        databases that do not already exist on the target server are skipped.
-       </para>
-       <para>
-        This option is only relevant when restoring from a non-plain-text
-        archive made using <application>pg_dumpall</application>.
+        <option>--transaction-size</option>.
        </para>
       </listitem>
      </varlistentry>
@@ -815,6 +800,21 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--no-globals</option></term>
+      <listitem>
+       <para>
+        Do not restore global objects (roles and tablespaces).  When
+        <option>-C</option>/<option>--create</option> is not specified,
+        databases that do not already exist on the target server are skipped.
+       </para>
+       <para>
+        This option is only relevant when restoring from a non-plain-text
+        archive made using <application>pg_dumpall</application>.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--no-policies</option></term>
       <listitem>

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 95f4ac110b93ae7aea665686497018efa442053c..48fdcb0fae17a410f188fcc8a4f14bc592b58ead 100644 (file)
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -788,13 +788,13 @@ usage(const char *progname)
        printf(_("  --no-data                    do not restore data\n"));
        printf(_("  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
                         "                               created\n"));
+       printf(_("  --no-globals                 do not restore global objects (roles and tablespaces)\n"));
        printf(_("  --no-policies                do not restore row security policies\n"));
        printf(_("  --no-publications            do not restore publications\n"));
        printf(_("  --no-schema                  do not restore schema\n"));
        printf(_("  --no-security-labels         do not restore security labels\n"));
        printf(_("  --no-statistics              do not restore statistics\n"));
        printf(_("  --no-subscriptions           do not restore subscriptions\n"));
-       printf(_("  --no-globals                 do not restore global objects (roles and tablespaces)\n"));
        printf(_("  --no-table-access-method     do not restore table access methods\n"));
        printf(_("  --no-tablespaces             do not restore tablespace assignments\n"));
        printf(_("  --restrict-key=RESTRICT_KEY  use provided string as psql \\restrict key\n"));