doc: Fix option order in man pages and fix typos

petere · petere · commit 9b7bb106e023 · 2016-07-06T21:09:26.000-04:00
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
@@ -544,23 +544,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--strict-names</></term>
-      <listitem>
-       <para>
-        Require that each schema (-n / --schema) and table (-t / --table)
-        qualifier match at least one schema/table in the database to be dumped.
-        Note that if none of the schema/table qualifiers find matches pg_dump
-        will generate an error even without --strict-names.
-       </para>
-       <para>
-        This option has no effect on -N/--exclude-schema, -T/--exclude_table
-        or --exclude-table-date. An exclude pattern failing to match
-        any objects is not considered an error.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-T <replaceable class="parameter">table</replaceable></option></term>
       <term><option>--exclude-table=<replaceable class="parameter">table</replaceable></option></term>
@@ -925,6 +908,28 @@ PostgreSQL documentation
        </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--strict-names</></term>
+      <listitem>
+       <para>
+        Require that each schema
+        (<option>-n</option>/<option>--schema</option>) and table
+        (<option>-t</option>/<option>--table</option>) qualifier match at
+        least one schema/table in the database to be dumped.  Note that if
+        none of the schema/table qualifiers find
+        matches, <application>pg_dump</application> will generate an error
+        even without <option>--strict-names</option>.
+       </para>
+       <para>
+        This option has no effect
+        on <option>-N</option>/<option>--exclude-schema</option>,
+        <option>-T</option>/<option>--exclude-table</option>,
+        or <option>--exclude-table-data</option>.  An exclude pattern failing
+        to match any objects is not considered an error.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--use-set-session-authorization</></term>
       <listitem>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
@@ -431,16 +431,6 @@
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--strict-names</></term>
-      <listitem>
-       <para>
-        Require that each schema (-n / --schema) and table (-t / --table)
-        qualifier match at least one schema/table in the backup file.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-T <replaceable class="parameter">trigger</replaceable></option></term>
       <term><option>--trigger=<replaceable class="parameter">trigger</replaceable></option></term>
@@ -615,6 +605,18 @@
        </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--strict-names</></term>
+      <listitem>
+       <para>
+        Require that each schema
+        (<option>-n</option>/<option>--schema</option>) and table
+        (<option>-t</option>/<option>--table</option>) qualifier match at
+        least one schema/table in the backup file.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--use-set-session-authorization</option></term>
       <listitem>
diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
@@ -444,19 +444,6 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--progress-timestamp</option></term>
-      <listitem>
-       <para>
-        When showing progress (option <option>-P</>), use a timestamp
-        (Unix epoch) instead of the number of seconds since the
-        beginning of the run.  The unit is in seconds, with millisecond
-        precision after the dot.
-        This helps compare logs generated by various tools.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-r</option></term>
       <term><option>--report-latencies</option></term>
@@ -596,6 +583,19 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--progress-timestamp</option></term>
+      <listitem>
+       <para>
+        When showing progress (option <option>-P</>), use a timestamp
+        (Unix epoch) instead of the number of seconds since the
+        beginning of the run.  The unit is in seconds, with millisecond
+        precision after the dot.
+        This helps compare logs generated by various tools.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--sampling-rate=<replaceable>rate</></option></term>
       <listitem>
