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 4aae8b193dea7fe4a1dabd588a6f15e84df46cdc..1f614111350b8b8030d4df17ad5e4b7ded690c94 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 3b6c32c8d32eaf9d4c72b40a7565366068d56510..338ec6b8e413f614f794b68d0af279aecb8dcaf8 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 574144533378d4eff173fece9d557c266d09cf63..a3b0f7ce3190bdc8c79735916a9e0c022266a26c 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 a90fc9322f99e9df0bbc61069477eb0f6eb1021c..efd1d6c1e64e317435f8a27687aa2cb4b36decfb 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>