docs: list single-letter options first in command-line summary

In a few places, the long-version options were listed before the
single-letter ones in the command summary of a few commands.  This
didn't match other commands, and didn't match the option ordering later
in the same reference page.

Backpatch-through: 9.5

diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml
index 32081e9b91cc5674324b2302a73cf11343ebe979..295667ed36455677e673c400d5bc64fd5455d45f 100644 (file)
--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
@@ -25,8 +25,8 @@ PostgreSQL documentation
    <arg choice="opt"><replaceable class="parameter">option</replaceable></arg>
    <group choice="opt">
     <group choice="opt">
-     <arg choice="plain"><option>--pgdata</option></arg>
      <arg choice="plain"><option>-D</option></arg>
+     <arg choice="plain"><option>--pgdata</option></arg>
     </group>
     <replaceable class="parameter"> datadir</replaceable>
    </group>

diff --git a/doc/src/sgml/ref/pg_resetwal.sgml b/doc/src/sgml/ref/pg_resetwal.sgml
index 3f885bdd620c6a2be3f678852806410b6afecb9b..ed2b539582f204c9c5a107c080907dc53a643b3c 100644 (file)
--- a/doc/src/sgml/ref/pg_resetwal.sgml
+++ b/doc/src/sgml/ref/pg_resetwal.sgml
@@ -23,18 +23,18 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>pg_resetwal</command>
    <group choice="opt">
-    <arg choice="plain"><option>--force</option></arg>
     <arg choice="plain"><option>-f</option></arg>
+    <arg choice="plain"><option>--force</option></arg>
    </group>
    <group choice="opt">
-    <arg choice="plain"><option>--dry-run</option></arg>
     <arg choice="plain"><option>-n</option></arg>
+    <arg choice="plain"><option>--dry-run</option></arg>
    </group>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
    <group choice="plain">
     <group choice="opt">
-     <arg choice="plain"><option>--pgdata</option></arg>
      <arg choice="plain"><option>-D</option></arg>
+     <arg choice="plain"><option>--pgdata</option></arg>
     </group>
     <replaceable class="parameter"> datadir</replaceable>
    </group>

diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index e8faaa826a4bd65d4b3160e1a5c48a61e002bc80..23312cedc9726adeaca002178678d316eaedaed0 100644 (file)
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -28,8 +28,8 @@ PostgreSQL documentation
    <arg choice="plain" rep="repeat">
     <arg choice="opt">
      <group choice="plain">
-      <arg choice="plain"><option>--schema</option></arg>
       <arg choice="plain"><option>-S</option></arg>
+      <arg choice="plain"><option>--schema</option></arg>
      </group>
      <replaceable>schema</replaceable>
     </arg>
@@ -38,8 +38,8 @@ PostgreSQL documentation
    <arg choice="plain" rep="repeat">
     <arg choice="opt">
      <group choice="plain">
-      <arg choice="plain"><option>--table</option></arg>
       <arg choice="plain"><option>-t</option></arg>
+      <arg choice="plain"><option>--table</option></arg>
      </group>
      <replaceable>table</replaceable>
     </arg>
@@ -48,8 +48,8 @@ PostgreSQL documentation
    <arg choice="plain" rep="repeat">
     <arg choice="opt">
      <group choice="plain">
-      <arg choice="plain"><option>--index</option></arg>
       <arg choice="plain"><option>-i</option></arg>
+      <arg choice="plain"><option>--index</option></arg>
      </group>
      <replaceable>index</replaceable>
     </arg>
@@ -64,8 +64,8 @@ PostgreSQL documentation
    <arg rep="repeat"><replaceable>option</replaceable></arg>
 
    <group choice="plain">
-    <arg choice="plain"><option>--all</option></arg>
     <arg choice="plain"><option>-a</option></arg>
+    <arg choice="plain"><option>--all</option></arg>
    </group>
   </cmdsynopsis>
 
@@ -75,8 +75,8 @@ PostgreSQL documentation
    <arg rep="repeat"><replaceable>option</replaceable></arg>
 
    <group choice="plain">
-    <arg choice="plain"><option>--system</option></arg>
     <arg choice="plain"><option>-s</option></arg>
+    <arg choice="plain"><option>--system</option></arg>
    </group>
    <arg choice="opt"><replaceable>dbname</replaceable></arg>
   </cmdsynopsis>

diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 92f08b82b754ff88525a4695ebd408cbb4c3e2d4..093275e430fb7fc83c215e42d3aa095f218c7b76 100644 (file)
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -28,8 +28,8 @@ PostgreSQL documentation
    <arg choice="plain" rep="repeat">
     <arg choice="opt">
      <group choice="plain">
-      <arg choice="plain"><option>--table</option></arg>
       <arg choice="plain"><option>-t</option></arg>
+      <arg choice="plain"><option>--table</option></arg>
      </group>
      <replaceable>table</replaceable>
      <arg choice="opt">( <replaceable class="parameter">column</replaceable> [,...] )</arg>
@@ -44,8 +44,8 @@ PostgreSQL documentation
    <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
    <group choice="plain">
-    <arg choice="plain"><option>--all</option></arg>
     <arg choice="plain"><option>-a</option></arg>
+    <arg choice="plain"><option>--all</option></arg>
    </group>
   </cmdsynopsis>
  </refsynopsisdiv>