doc: remove added space within synopsis replaceable tags

Restructuring the tags makes the output consistent and doesn't require
added spaces.

Reported-by: Peter Smith
Author: Peter Smith

Discussion: https://postgr.es/m/CAHut+Pu8JahGm76CMdpzH350pHJedA4R2b8JmOim3+m3yxft3Q@mail.gmail.com

Backpatch-through: 19

diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index bd0dbff8caa56818c5438276197cef6ebb7c87b9..5e3f8dd0076d45c6114e475338f0ab0c83ed38ff 100644 (file)
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -23,13 +23,13 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>initdb</command>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
-   <group choice="plain">
+   <arg choice="plain">
     <group choice="opt">
      <arg choice="plain"><option>--pgdata</option></arg>
      <arg choice="plain"><option>-D</option></arg>
     </group>
-    <replaceable> datadir</replaceable>
-   </group>
+    <replaceable>datadir</replaceable>
+   </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 

diff --git a/doc/src/sgml/ref/pg_checksums.sgml b/doc/src/sgml/ref/pg_checksums.sgml
index 8a18f447d15fe28d9a5cc44368b42a9d75490f88..ae66fad3f0ffe31844076f482408b07409e2f04a 100644 (file)
--- a/doc/src/sgml/ref/pg_checksums.sgml
+++ b/doc/src/sgml/ref/pg_checksums.sgml
@@ -23,13 +23,13 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>pg_checksums</command>
    <arg rep="repeat" choice="opt"><replaceable class="parameter">option</replaceable></arg>
-   <group choice="opt">
+   <arg choice="opt">
     <group choice="opt">
      <arg choice="plain"><option>-D</option></arg>
      <arg choice="plain"><option>--pgdata</option></arg>
     </group>
     <replaceable class="parameter">datadir</replaceable>
-   </group>
+   </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 

diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml
index 22dc61610083ec7bc10751c5eddbc42170e83223..580a6a3641ff515af92a4ac4fd97afbb3a108ded 100644 (file)
--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
@@ -23,13 +23,13 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>pg_controldata</command>
    <arg choice="opt"><replaceable class="parameter">option</replaceable></arg>
-   <group choice="opt">
+   <arg choice="opt">
     <group choice="opt">
      <arg choice="plain"><option>-D</option></arg>
      <arg choice="plain"><option>--pgdata</option></arg>
     </group>
     <replaceable class="parameter">datadir</replaceable>
-   </group>
+   </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 

diff --git a/doc/src/sgml/ref/pg_createsubscriber.sgml b/doc/src/sgml/ref/pg_createsubscriber.sgml
index 3b3038d18914eb00b7d3152ad22276b300fdd61d..193f60628bce348c20cff59a23f7ae30b9652d75 100644 (file)
--- a/doc/src/sgml/ref/pg_createsubscriber.sgml
+++ b/doc/src/sgml/ref/pg_createsubscriber.sgml
@@ -23,23 +23,27 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>pg_createsubscriber</command>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
-   <group choice="plain">
+   <arg choice="plain">
     <group choice="req">
      <arg choice="plain"><option>-d</option></arg>
      <arg choice="plain"><option>--database</option></arg>
     </group>
     <replaceable>dbname</replaceable>
+   </arg>
+   <arg choice="plain">
     <group choice="req">
-     <arg choice="plain"><option>-D</option> </arg>
+     <arg choice="plain"><option>-D</option></arg>
      <arg choice="plain"><option>--pgdata</option></arg>
     </group>
     <replaceable>datadir</replaceable>
+   </arg>
+   <arg choice="plain">
     <group choice="req">
      <arg choice="plain"><option>-P</option></arg>
      <arg choice="plain"><option>--publisher-server</option></arg>
     </group>
     <replaceable>connstr</replaceable>
-   </group>
+   </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 

diff --git a/doc/src/sgml/ref/pg_resetwal.sgml b/doc/src/sgml/ref/pg_resetwal.sgml
index 41f2b1d480c513ea30efcf9f38c25964cefd5c7e..664c525f481cfbd0e4722553bef53ce1be6ff443 100644 (file)
--- a/doc/src/sgml/ref/pg_resetwal.sgml
+++ b/doc/src/sgml/ref/pg_resetwal.sgml
@@ -22,22 +22,26 @@ PostgreSQL documentation
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_resetwal</command>
-   <group choice="opt">
-    <arg choice="plain"><option>-f</option></arg>
-    <arg choice="plain"><option>--force</option></arg>
-   </group>
-   <group choice="opt">
-    <arg choice="plain"><option>-n</option></arg>
-    <arg choice="plain"><option>--dry-run</option></arg>
-   </group>
+   <arg choice="opt">
+    <group choice="plain">
+     <arg choice="plain"><option>-f</option></arg>
+     <arg choice="plain"><option>--force</option></arg>
+    </group>
+   </arg>
+   <arg choice="opt">
+    <group choice="plain">
+     <arg choice="plain"><option>-n</option></arg>
+     <arg choice="plain"><option>--dry-run</option></arg>
+    </group>
+   </arg>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
-   <group choice="plain">
+   <arg choice="plain">
     <group choice="opt">
      <arg choice="plain"><option>-D</option></arg>
      <arg choice="plain"><option>--pgdata</option></arg>
     </group>
     <replaceable class="parameter">datadir</replaceable>
-   </group>
+   </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 

diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml
index f704dc108e63fc5fd71f3fb49a80343d068e5ef5..b95e3868e9dd59bdbea1e8590aa85862e6411d88 100644 (file)
--- a/doc/src/sgml/ref/pg_rewind.sgml
+++ b/doc/src/sgml/ref/pg_rewind.sgml
@@ -23,17 +23,19 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>pg_rewind</command>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
-   <group choice="plain">
+   <arg choice="plain">
     <group choice="req">
      <arg choice="plain"><option>-D</option></arg>
      <arg choice="plain"><option>--target-pgdata</option></arg>
     </group>
-    <replaceable> datadir</replaceable>
-    <group choice="req">
+    <replaceable>datadir</replaceable>
+   </arg>
+   <arg choice="req">
+    <group choice="plain">
      <arg choice="plain"><option>--source-pgdata=<replaceable>datadir</replaceable></option></arg>
      <arg choice="plain"><option>--source-server=<replaceable>connstr</replaceable></option></arg>
     </group>
-   </group>
+   </arg>
   </cmdsynopsis>
  </refsynopsisdiv>