diff --git a/doc/src/sgml/pgarchivecleanup.sgml b/doc/src/sgml/pgarchivecleanup.sgml
index 4ae9c45f87..c6b5d7ad27 100644
--- a/doc/src/sgml/pgarchivecleanup.sgml
+++ b/doc/src/sgml/pgarchivecleanup.sgml
@@ -72,6 +72,8 @@ pg_archivecleanup:  keep WAL file "archive/000000010000003700000010" and later
 pg_archivecleanup:  removing file "archive/00000001000000370000000F"
 pg_archivecleanup:  removing file "archive/00000001000000370000000E"
 </programlisting>
+  </para>
+  <para>
    <application>pg_archivecleanup</application> assumes that
    <replaceable>archivelocation</> is a directory readable and writable by the
    server-owning user.
diff --git a/doc/src/sgml/pgbench.sgml b/doc/src/sgml/pgbench.sgml
index 16ac69f9ee..1b0905fa27 100644
--- a/doc/src/sgml/pgbench.sgml
+++ b/doc/src/sgml/pgbench.sgml
@@ -545,8 +545,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       Example:
 <programlisting>
 \set ntellers 10 * :scale
-</programlisting>
-     </para>
+</programlisting></para>
     </listitem>
    </varlistentry>
 
@@ -568,8 +567,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       Example:
 <programlisting>
 \setrandom aid 1 :naccounts
-</programlisting>
-     </para>
+</programlisting></para>
     </listitem>
    </varlistentry>
 
@@ -592,8 +590,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       Example:
 <programlisting>
 \sleep 10 ms
-</programlisting>
-     </para>
+</programlisting></para>
     </listitem>
    </varlistentry>
 
@@ -621,8 +618,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       Example:
 <programlisting>
 \setshell variable_to_be_assigned command literal_argument :variable ::literal_starting_with_colon
-</programlisting>
-     </para>
+</programlisting></para>
     </listitem>
    </varlistentry>
 
@@ -640,8 +636,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       Example:
 <programlisting>
 \shell command literal_argument :variable ::literal_starting_with_colon
-</programlisting>
-     </para>
+</programlisting></para>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -716,8 +711,7 @@ END;
  0 200 2465 0 1175850568 998079
  0 201 2513 0 1175850569 608
  0 202 2038 0 1175850569 2663
-</screen>
-  </para>
+</screen></para>
  </refsect2>
 
  <refsect2>
diff --git a/doc/src/sgml/pgtesttiming.sgml b/doc/src/sgml/pgtesttiming.sgml
index 4e124516d8..784f866b8d 100644
--- a/doc/src/sgml/pgtesttiming.sgml
+++ b/doc/src/sgml/pgtesttiming.sgml
@@ -192,8 +192,7 @@ Histogram of timing durations:
         4:       3010  0.00981%
         2:    2993204  9.75277%
         1:   27694571 90.23734%
-</screen>
-  </para>
+</screen></para>
 
  </refsect2>
 
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 99d248b43a..39f2917673 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -240,8 +240,7 @@ mv /usr/local/pgsql /usr/local/pgsql.old
 
 <programlisting>
 gmake prefix=/usr/local/pgsql.new install
-</programlisting>
-    </para>
+</programlisting></para>
    </step>
 
    <step>
@@ -311,8 +310,7 @@ NET STOP postgresql-9.0
 
 <programlisting>
 NET STOP pgsql-8.3  (<productname>PostgreSQL</> 8.3 and older used a different service name)
-</programlisting>
-    </para>
+</programlisting></para>
    </step>
 
    <step>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 491246fea6..969548ffd0 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -2264,8 +2264,7 @@ lo_import 152801
         unset a variable, use the <command>\unset</command> command.
         </para>
 
-        <para>
-        <command>\set</> without any arguments displays the names and values
+        <para><command>\set</> without any arguments displays the names and values
         of all currently-set <application>psql</> variables.
         </para>