diff --git a/doc/src/sgml/bgworker.sgml b/doc/src/sgml/bgworker.sgml
index ad17b42c89..6e1cf121de 100644
--- a/doc/src/sgml/bgworker.sgml
+++ b/doc/src/sgml/bgworker.sgml
@@ -98,7 +98,7 @@ typedef struct BackgroundWorker
      <term><literal>BGWORKER_BACKEND_DATABASE_CONNECTION</literal></term>
      <listitem>
       <para>
-       <indexterm><primary>BGWORKER_BACKEND_DATABASE_CONNECTION</primary></indexterm>
+       <indexterm><primary>BGWORKER_BACKEND_&zwsp;DATABASE_CONNECTION</primary></indexterm>
        Requests the ability to establish a database connection through which it
        can later run transactions and queries.  A background worker using
        <literal>BGWORKER_BACKEND_DATABASE_CONNECTION</literal> to connect to a
diff --git a/doc/src/sgml/dblink.sgml b/doc/src/sgml/dblink.sgml
index 97dc3b8129..eba7fcfb98 100644
--- a/doc/src/sgml/dblink.sgml
+++ b/doc/src/sgml/dblink.sgml
@@ -147,7 +147,6 @@ SELECT dblink_connect('myconn', 'dbname=postgres options=-csearch_path=');
 -- FOREIGN DATA WRAPPER functionality
 -- Note: local connection must require password authentication for this to work properly
 --       Otherwise, you will receive the following error from dblink_connect():
---       ----------------------------------------------------------------------
 --       ERROR:  password is required
 --       DETAIL:  Non-superuser cannot connect if the server does not request a password.
 --       HINT:  Target server's authentication method must be changed.
diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml
index 3b32f0ae81..70ad1994f7 100644
--- a/doc/src/sgml/information_schema.sgml
+++ b/doc/src/sgml/information_schema.sgml
@@ -174,7 +174,7 @@
  </sect1>
 
  <sect1 id="infoschema-administrable-role-authorizations">
-  <title><literal>administrable_role_authorizations</literal></title>
+  <title><literal>administrable_role_&zwsp;authorizations</literal></title>
 
   <para>
    The view <literal>administrable_role_authorizations</literal>
@@ -888,7 +888,7 @@
  </sect1>
 
  <sect1 id="infoschema-collation-character-set-applicab"> <!-- max 44 characters -->
-  <title><literal>collation_character_set_applicability</literal></title>
+  <title><literal>collation_character_set_&zwsp;applicability</literal></title>
 
   <para>
    The view <literal>collation_character_set_applicability</literal>
diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
index b6b626a4af..cf4653fe0f 100644
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -712,7 +712,7 @@ SELECT lo_export(image.raster, '/tmp/motd') FROM image
   <example id="lo-example">
    <title>Large Objects with <application>libpq</application> Example Program</title>
 <programlisting><![CDATA[
-/*-------------------------------------------------------------------------
+/*-----------------------------------------------------------------
  *
  * testlo.c
  *    test using large objects with libpq
@@ -724,7 +724,7 @@ SELECT lo_export(image.raster, '/tmp/motd') FROM image
  * IDENTIFICATION
  *    src/test/examples/testlo.c
  *
- *-------------------------------------------------------------------------
+ *-----------------------------------------------------------------
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/doc/src/sgml/stylesheet-fo.xsl b/doc/src/sgml/stylesheet-fo.xsl
index 5a2734649e..52369cd672 100644
--- a/doc/src/sgml/stylesheet-fo.xsl
+++ b/doc/src/sgml/stylesheet-fo.xsl
@@ -12,6 +12,7 @@
 <xsl:param name="ulink.footnotes" select="1"></xsl:param>
 <xsl:param name="use.extensions" select="1"></xsl:param>
 <xsl:param name="variablelist.as.blocks" select="1"></xsl:param>
+<xsl:param name="orderedlist.label.width">1.5em</xsl:param>
 
 <xsl:attribute-set name="monospace.verbatim.properties"
                    use-attribute-sets="verbatim.properties monospace.properties">
diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml
index e3b70df6eb..b084a1853b 100644
--- a/doc/src/sgml/textsearch.sgml
+++ b/doc/src/sgml/textsearch.sgml
@@ -1891,8 +1891,8 @@ SELECT ts_rewrite('a &amp; b'::tsquery,
    </para>
 
 <synopsis>
-tsvector_update_trigger(<replaceable class="parameter">tsvector_column_name</replaceable>, <replaceable class="parameter">config_name</replaceable>, <replaceable class="parameter">text_column_name</replaceable> <optional>, ... </optional>)
-tsvector_update_trigger_column(<replaceable class="parameter">tsvector_column_name</replaceable>, <replaceable class="parameter">config_column_name</replaceable>, <replaceable class="parameter">text_column_name</replaceable> <optional>, ... </optional>)
+tsvector_update_trigger(<replaceable class="parameter">tsvector_column_name</replaceable>,&zwsp; <replaceable class="parameter">config_name</replaceable>, <replaceable class="parameter">text_column_name</replaceable> <optional>, ... </optional>)
+tsvector_update_trigger_column(<replaceable class="parameter">tsvector_column_name</replaceable>,&zwsp; <replaceable class="parameter">config_column_name</replaceable>, <replaceable class="parameter">text_column_name</replaceable> <optional>, ... </optional>)
 </synopsis>
 
    <para>