doc: Fix man page whitespace issues

Whitespace between tags is significant, and in some cases it creates
extra vertical space in man pages.  The fix is to remove some newlines
in the markup.

diff --git a/doc/src/sgml/ref/alter_publication.sgml b/doc/src/sgml/ref/alter_publication.sgml
index 40366a10fede74c11424088497dad710f79f876f..db14d7a772c4892a99b60ad308a3da721d7c0641 100644 (file)
--- a/doc/src/sgml/ref/alter_publication.sgml
+++ b/doc/src/sgml/ref/alter_publication.sgml
@@ -218,8 +218,7 @@ ALTER PUBLICATION sales_publication ADD ALL TABLES IN SCHEMA marketing, sales;
    <structname>production_publication</structname>:
 <programlisting>
 ALTER PUBLICATION production_publication ADD TABLE users, departments, ALL TABLES IN SCHEMA production;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>

diff --git a/doc/src/sgml/ref/alter_subscription.sgml b/doc/src/sgml/ref/alter_subscription.sgml
index fe13ab9a2defbcdec59c283a73242973d450a304..c1994e3a94a14ff5a67e6844e835ab9b888857b1 100644 (file)
--- a/doc/src/sgml/ref/alter_subscription.sgml
+++ b/doc/src/sgml/ref/alter_subscription.sgml
@@ -249,8 +249,7 @@ ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> RENAME TO <
          </para>
         </listitem>
        </varlistentry>
-      </variablelist>
-     </para>
+      </variablelist></para>
     </listitem>
    </varlistentry>
 

diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index c2a458eb5dbe5792cee7e55552659b2f293ac01f..a3c62bf056eac47f56c2cac1fad6d325264de5a7 100644 (file)
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -923,8 +923,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
         </para>
        </listitem>
       </varlistentry>
-     </variablelist>
-     </para>
+     </variablelist></para>
     </listitem>
    </varlistentry>
 

diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml
index ebf7db57c58d309806a8c110e7c1f52a9995ea7b..203bb41844f5ff985e133b58f09e1fcb809e04c1 100644 (file)
--- a/doc/src/sgml/ref/create_subscription.sgml
+++ b/doc/src/sgml/ref/create_subscription.sgml
@@ -302,8 +302,7 @@ CREATE SUBSCRIPTION <replaceable class="parameter">subscription_name</replaceabl
          </para>
         </listitem>
        </varlistentry>
-      </variablelist>
-     </para>
+      </variablelist></para>
 
     </listitem>
    </varlistentry>

diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index e4afa1c01d3095e5abfe6bf53810888982a88154..ee42f413e9657799a9fffef2c8998cedc5fcda33 100644 (file)
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -175,12 +175,10 @@ CREATE [ OR REPLACE ] [ CONSTRAINT ] TRIGGER <replaceable class="parameter">name
   </para>
 
   <para>
-   <indexterm>
-    <primary>trigger</primary>
-    <secondary>constraint trigger</secondary>
-   </indexterm>
    When the <literal>CONSTRAINT</literal> option is specified, this command creates a
-   <firstterm>constraint trigger</firstterm>.  This is the same as a regular trigger
+   <firstterm>constraint trigger</firstterm>.<indexterm><primary>trigger</primary>
+   <secondary>constraint trigger</secondary></indexterm>
+   This is the same as a regular trigger
    except that the timing of the trigger firing can be adjusted using
    <link linkend="sql-set-constraints"><command>SET CONSTRAINTS</command></link>.
    Constraint triggers must be <literal>AFTER ROW</literal> triggers on plain

diff --git a/doc/src/sgml/ref/drop_procedure.sgml b/doc/src/sgml/ref/drop_procedure.sgml
index 4c86062f3430a7e66f3e36097048f6c974aaf3b8..84e6b09fee8aa842b4684eb603cd4e729d309b4e 100644 (file)
--- a/doc/src/sgml/ref/drop_procedure.sgml
+++ b/doc/src/sgml/ref/drop_procedure.sgml
@@ -194,8 +194,7 @@ DROP PROCEDURE do_db_maintenance(text, text);  -- potentially ambiguous
    However, the last example would be ambiguous if there is also, say,
 <programlisting>
 CREATE PROCEDURE do_db_maintenance(IN target_schema text, IN options text) ...
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="sql-dropprocedure-compatibility">

diff --git a/doc/src/sgml/ref/merge.sgml b/doc/src/sgml/ref/merge.sgml
index ac1c0a83dd25759b190854cb6722b17136f20818..f68aa09736c3f02e6a2c3ff92e7b8eed2b10930d 100644 (file)
--- a/doc/src/sgml/ref/merge.sgml
+++ b/doc/src/sgml/ref/merge.sgml
@@ -472,11 +472,9 @@ MERGE <replaceable class="parameter">total_count</replaceable>
              the action's event type.
             </para>
            </listitem>
-          </orderedlist>
-         </para>
+          </orderedlist></para>
         </listitem>
-       </orderedlist>
-      </para>
+       </orderedlist></para>
      </listitem>
      <listitem>
       <para>

diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index 6468f45cf383893eafee50dfed03199627311354..56ac7b754bec59a037b986d03d33ef244e676a03 100644 (file)
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -994,8 +994,7 @@ PostgreSQL documentation
    directory <filename>backup</filename>:
 <screen>
 <prompt>$</prompt> <userinput>pg_basebackup -D backup -Ft --compress=gzip:9</userinput>
-</screen>
-  </para>
+</screen></para>
 
  </refsect1>
 

diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
index d1818ff3161b6401df30d7aa576fd8007a52a306..9ba26e5e8643955b959a37e793b53b3a7a085589 100644 (file)
--- a/doc/src/sgml/ref/pgbench.sgml
+++ b/doc/src/sgml/ref/pgbench.sgml
@@ -2459,11 +2459,9 @@ END;
   <para>
    Here is some example output with following options:
 <screen>
-pgbench --aggregate-interval=10 --time=20 --client=10 --log --rate=1000
---latency-limit=10 --failures-detailed --max-tries=10 test
-</screen>
+<userinput>pgbench --aggregate-interval=10 --time=20 --client=10 --log --rate=1000
+--latency-limit=10 --failures-detailed --max-tries=10 test</userinput>
 
-<screen>
 1649114136 5815 27552565 177846919143 1078 21716 2756787 7264696105 0 9661 0 7854 31472 4022 4022 0
 1649114146 5958 28460110 182785513108 1083 20391 2539395 6411761497 0 7268 0 8127 32595 4101 4101 0
 </screen>
@@ -2581,8 +2579,7 @@ statement latencies in milliseconds, failures and retries:
   0.582  3363  41576  UPDATE pgbench_branches SET bbalance = bbalance + :delta WHERE bid = :bid;
   0.465     0      0  INSERT INTO pgbench_history (tid, bid, aid, delta, mtime) VALUES (:tid, :bid, :aid, :delta, CURRENT_TIMESTAMP);
   1.933     0      0  END;
- </screen>
-  </para>
+</screen></para>
 
   <para>
    If multiple script files are specified, all statistics are reported
@@ -2637,8 +2634,7 @@ statement latencies in milliseconds, failures and retries:
                supposed to never occur...).
              </para>
            </listitem>
-         </itemizedlist>
-       </para>
+         </itemizedlist></para>
      </listitem>
      <listitem>
        <para>