doc: Move some new options into better positions on man pages

doc/src/sgml/ref/initdb.sgml

@@ -334,6 +334,17 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+      <varlistentry>
+      <term><option>-X <replaceable class="parameter">directory</replaceable></option></term>
+      <term><option>--waldir=<replaceable class="parameter">directory</replaceable></option></term>
+      <listitem>
+       <para>
+        This option specifies the directory where the write-ahead log
+        should be stored.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--wal-segsize=<replaceable>size</replaceable></option></term>
       <listitem>
@@ -354,18 +365,6 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
-
-      <varlistentry>
-      <term><option>-X <replaceable class="parameter">directory</replaceable></option></term>
-      <term><option>--waldir=<replaceable class="parameter">directory</replaceable></option></term>
-      <listitem>
-       <para>
-        This option specifies the directory where the write-ahead log
-        should be stored.
-       </para>
-      </listitem>
-     </varlistentry>
-
     </variablelist>
    </para>
 

doc/src/sgml/ref/pg_dump.sgml

@@ -789,21 +789,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--lock-wait-timeout=<replaceable class="parameter">timeout</replaceable></option></term>
-      <listitem>
-       <para>
-        Do not wait forever to acquire shared table locks at the beginning of
-        the dump. Instead fail if unable to lock a table within the specified
-        <replaceable class="parameter">timeout</replaceable>. The timeout may be
-        specified in any of the formats accepted by <command>SET
-        statement_timeout</command>.  (Allowed formats vary depending on the server
-        version you are dumping from, but an integer number of milliseconds
-        is accepted by all versions.)
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>--load-via-partition-root</option></term>
       <listitem>
@@ -819,6 +804,21 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--lock-wait-timeout=<replaceable class="parameter">timeout</replaceable></option></term>
+      <listitem>
+       <para>
+        Do not wait forever to acquire shared table locks at the beginning of
+        the dump. Instead fail if unable to lock a table within the specified
+        <replaceable class="parameter">timeout</replaceable>. The timeout may be
+        specified in any of the formats accepted by <command>SET
+        statement_timeout</command>.  (Allowed formats vary depending on the server
+        version you are dumping from, but an integer number of milliseconds
+        is accepted by all versions.)
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--no-comments</option></term>
       <listitem>

doc/src/sgml/ref/pg_dumpall.sgml

@@ -326,6 +326,21 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--load-via-partition-root</option></term>
+      <listitem>
+       <para>
+        When dumping a <command>COPY</command> or <command>INSERT</command> statement for a partitioned table,
+        target the root of the partitioning hierarchy which contains it rather
+        than the partition itself.  This may be useful when reloading data on
+        a server where rows do not always fall into the same partitions as
+        they did on the original server.  This could happen, for example, if
+        the partitioning column is of type text and the two system have
+        different definitions of the collation used to partition the data.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--lock-wait-timeout=<replaceable class="parameter">timeout</replaceable></option></term>
       <listitem>
@@ -342,21 +357,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--load-via-partition-root</option></term>
-      <listitem>
-       <para>
-        When dumping a <command>COPY</command> or <command>INSERT</command> statement for a partitioned table,
-        target the root of the partitioning hierarchy which contains it rather
-        than the partition itself.  This may be useful when reloading data on
-        a server where rows do not always fall into the same partitions as
-        they did on the original server.  This could happen, for example, if
-        the partitioning column is of type text and the two system have
-        different definitions of the collation used to partition the data.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>--no-comments</option></term>
       <listitem>