From dfb68d359a8b61e018826074def10bd229a053e7 Mon Sep 17 00:00:00 2001
From: Peter Smith <peter.b.smith@fujitsu.com>
Date: Thu, 23 Jul 2026 18:30:57 +1000
Subject: [PATCH v1] Fix synopsis spacing

---
 doc/src/sgml/ref/initdb.sgml              |  6 +++---
 doc/src/sgml/ref/pg_checksums.sgml        |  4 ++--
 doc/src/sgml/ref/pg_controldata.sgml      |  4 ++--
 doc/src/sgml/ref/pg_createsubscriber.sgml | 10 +++++++---
 doc/src/sgml/ref/pg_resetwal.sgml         | 24 +++++++++++++----------
 doc/src/sgml/ref/pg_rewind.sgml           | 10 ++++++----
 6 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index bd0dbff8caa..5e3f8dd0076 100644
--- 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 8a18f447d15..ae66fad3f0f 100644
--- 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 22dc6161008..580a6a3641f 100644
--- 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 3b3038d1891..193f60628bc 100644
--- 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 41f2b1d480c..664c525f481 100644
--- 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 f704dc108e6..b95e3868e9d 100644
--- 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>
 
-- 
2.47.3