Index: server/databases/databases.xml
===================================================================
--- server/databases/databases.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/databases/databases.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -16,9 +16,11 @@
   <title>Databases</title>
 
-  <para>This chapter includes databases that range from single-user
-  read/write to industrial database servers with transaction support.
-  Generally, you will be sent here to satisfy dependencies to other
-  applications although building a SQL server on a base LFS system is
-  entirely possible.</para>
+  <para>
+    This chapter includes databases that range from single-user
+    read/write to industrial database servers with transaction support.
+    Generally, you will be sent here to satisfy dependencies to other
+    applications although building a SQL server on a base LFS system is
+    entirely possible.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="db.xml"/>
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/databases/db.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -365,5 +365,7 @@
         <term><command>db_log_verify</command></term>
         <listitem>
-          <para>verifies the log files of a database.</para>
+          <para>
+            verifies the log files of a database.
+          </para>
           <indexterm zone="db db_log_verify">
             <primary sortas="b-db_log_verify">db_log_verify</primary>
@@ -375,5 +377,7 @@
         <term><command>db_printlog</command></term>
         <listitem>
-          <para>converts database log files to human readable text.</para>
+          <para>
+            converts database log files to human readable text.
+          </para>
           <indexterm zone="db db_printlog">
             <primary sortas="b-db_printlog">db_printlog</primary>
@@ -410,5 +414,7 @@
         <term><command>db_stat</command></term>
         <listitem>
-          <para>displays database environment statistics.</para>
+          <para>
+            displays database environment statistics.
+          </para>
           <indexterm zone="db db_stat">
             <primary sortas="b-db_stat">db_stat</primary>
@@ -446,5 +452,7 @@
         <term><command>db_verify</command></term>
         <listitem>
-          <para>is used to run consistency checks on database files.</para>
+          <para>
+            is used to run consistency checks on database files.
+          </para>
           <indexterm zone="db db_verify">
             <primary sortas="b-db_verify">db_verify</primary>
Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/mail/dovecot.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -171,6 +171,8 @@
     <title>Command Explanations</title>
 
-    <para><command>CFLAGS+=...LDFLAGS+=...</command>: build with libtirpc
-    instead of the recently removed RPC code provided by GlibC.</para>
+    <para>
+      <command>CFLAGS+=...LDFLAGS+=...</command>: build with libtirpc
+      instead of the recently removed RPC code provided by GlibC.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/mail/exim.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -35,7 +35,9 @@
     <title>Introduction to Exim</title>
 
-    <para>The <application>Exim</application> package contains a Mail
-    Transport Agent written by the University of Cambridge, released
-    under the GNU Public License.</para>
+    <para>
+      The <application>Exim</application> package contains a Mail
+      Transport Agent written by the University of Cambridge, released
+      under the GNU Public License.
+    </para>
 
     &lfs91_checked;
@@ -44,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&exim-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&exim-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&exim-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&exim-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &exim-md5sum;</para>
+        <para>
+          Download MD5 sum: &exim-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &exim-size;</para>
+        <para>
+          Download size: &exim-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &exim-buildsize;</para>
+        <para>
+          Estimated disk space required: &exim-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &exim-time;</para>
+        <para>
+          Estimated build time: &exim-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,7 +80,9 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Additional formats of the documentation (text-based docs are
-        shipped with the sources) can be downloaded by following the links
-        shown at <ulink url="http://exim.org/docs.html"/>.</para>
+        <para>
+          Additional formats of the documentation (text-based docs are
+          shipped with the sources) can be downloaded by following the links
+          shown at <ulink url="http://exim.org/docs.html"/>.
+        </para>
       </listitem>
     </itemizedlist>
@@ -79,10 +95,5 @@
       <xref linkend="pcre"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -111,14 +122,17 @@
     <title>Installation of Exim</title>
 
-    <para>Before building <application>Exim</application>, as the
-    <systemitem class="username">root</systemitem> user you should create
-    the group and user <systemitem class="username">exim</systemitem> which
-    will run the <command>exim</command> daemon:</para>
+    <para>
+      Before building <application>Exim</application>, as the
+      <systemitem class="username">root</systemitem> user you should create
+      the group and user <systemitem class="username">exim</systemitem> which
+      will run the <command>exim</command> daemon:
+    </para>
 
 <screen role="root"><userinput>groupadd -g 31 exim &amp;&amp;
 useradd -d /dev/null -c "Exim Daemon" -g exim -s /bin/false -u 31 exim</userinput></screen>
 
-    <para>Install <application>Exim</application> with the following
-    commands:</para>
+    <para>
+      Install <application>Exim</application> with the following commands:
+    </para>
 
 <screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,'    \
@@ -132,7 +146,11 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <!-- dev note: make INSTALL_ARG=-no_chown DESTDIR=<DESTDIR> install -->
@@ -152,59 +170,80 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -e ... > Local/Makefile</command>: Most of
-    <application>Exim</application>'s configuration options are defined
-    in <filename>Local/Makefile</filename>, which is created from
-    the <filename>src/EDITME</filename> file. This command specifies the minimum
-    set of options. Descriptions for the options are listed below.</para>
-
-    <para><command>printf ... > Local/Makefile</command>: Setting those
-    variables allows to use GDBM instead of the default Berkeley DB. Remove
-    this command if you have installed <xref linkend="db"/>.</para>
-
-    <para><parameter>BIN_DIRECTORY=/usr/sbin</parameter>: This installs all of
-    <application>Exim</application>'s binaries and scripts in
-    <filename class='directory'>/usr/sbin</filename>.</para>
-
-    <para><parameter>CONFIGURE_FILE=/etc/exim.conf</parameter>: This installs
-    <application>Exim</application>'s main configuration file in
-    <filename class='directory'>/etc</filename>.</para>
-
-    <para><parameter>EXIM_USER=exim</parameter>: This tells
-    <application>Exim</application> that after the daemon no longer needs
-    <systemitem class="username">root</systemitem> privileges, the process
-    hands off the daemon to the <systemitem
-    class="username">exim</systemitem> user.</para>
-
-    <para><parameter>SUPPORT_TLS=yes</parameter>: This allows to support
-    STARTTLS connections. If you use this option, you need to select
-    whether <application>OpenSSL</application> or
-    <application>GnuTLS</application> is used (see
-    <filename>src/EDITME</filename>).</para>
-
-    <para><parameter>USE_OPENSSL_PC=openssl</parameter>: This tells the
-    build system to use <application>OpenSSL</application>, and to
-    find the needed libraries with <application>pkg-config</application>.
-    </para>
-
-    <para><parameter>#EXIM_MONITOR</parameter>: This defers building the
-    <application>Exim</application> monitor program, as it requires
-    <application>X Window System</application> support, by commenting out the
-    <parameter>EXIM_MONITOR</parameter> line in the <filename>Makefile</filename>.
-    If you wish to build the monitor program, omit this <command>sed</command>
-    command and issue the following command before building the package (modify
-    <filename>Local/eximon.conf</filename>, if necessary):
-    <command>cp exim_monitor/EDITME Local/eximon.conf</command>.</para>
-
-    <para><command>ln -sfv exim /usr/sbin/sendmail</command>: Creates a link to
-    <command>sendmail</command> for applications which need it.
-    <application>Exim</application> will accept most
-    <application>Sendmail</application> command-line options.</para>
-
-    <para><command>install -v -m750 -o exim -g exim /var/spool/exim</command>:
-    Since /var/spool is owned by root and this version of <command>exim</command>
-    drops <systemitem class="username">root</systemitem> privileges early, to
-    run as user <systemitem class="username">exim</systemitem>, it cannot create
-    the <filename class="directory">/var/spool/exim</filename> directory. As a
-    work around, it is created manually.</para>
+    <para>
+      <command>sed -e ... > Local/Makefile</command>: Most of
+      <application>Exim</application>'s configuration options are defined
+      in <filename>Local/Makefile</filename>, which is created from
+      the <filename>src/EDITME</filename> file. This command specifies the
+      minimum set of options. Descriptions for the options are listed below.
+    </para>
+
+    <para>
+      <command>printf ... > Local/Makefile</command>: Setting those
+      variables allows to use GDBM instead of the default Berkeley DB. Remove
+      this command if you have installed <xref linkend="db"/>.
+    </para>
+
+    <para>
+      <parameter>BIN_DIRECTORY=/usr/sbin</parameter>: This installs all of
+      <application>Exim</application>'s binaries and scripts in
+      <filename class='directory'>/usr/sbin</filename>.
+    </para>
+
+    <para>
+      <parameter>CONFIGURE_FILE=/etc/exim.conf</parameter>: This installs
+      <application>Exim</application>'s main configuration file in
+      <filename class='directory'>/etc</filename>.
+    </para>
+
+    <para>
+      <parameter>EXIM_USER=exim</parameter>: This tells
+      <application>Exim</application> that after the daemon no longer needs
+      <systemitem class="username">root</systemitem> privileges, the process
+      hands off the daemon to the <systemitem
+      class="username">exim</systemitem> user.
+    </para>
+
+    <para>
+      <parameter>SUPPORT_TLS=yes</parameter>: This allows to support
+      STARTTLS connections. If you use this option, you need to select
+      whether <application>OpenSSL</application> or
+      <application>GnuTLS</application> is used (see
+      <filename>src/EDITME</filename>).
+    </para>
+
+    <para>
+      <parameter>USE_OPENSSL_PC=openssl</parameter>: This tells the
+      build system to use <application>OpenSSL</application>, and to
+      find the needed libraries with <application>pkg-config</application>.
+    </para>
+
+    <para>
+      <parameter>#EXIM_MONITOR</parameter>: This defers building the
+      <application>Exim</application> monitor program, as it requires
+      <application>X Window System</application> support, by commenting out the
+      <parameter>EXIM_MONITOR</parameter> line in the
+      <filename>Makefile</filename>. If you wish to build the monitor program,
+      omit this <command>sed</command> command and issue the following command
+      before building the package (modify
+      <filename>Local/eximon.conf</filename>, if necessary):
+      <command>cp exim_monitor/EDITME Local/eximon.conf</command>.
+    </para>
+
+    <para>
+      <command>ln -sfv exim /usr/sbin/sendmail</command>: Creates a link to
+      <command>sendmail</command> for applications which need it.
+      <application>Exim</application> will accept most
+      <application>Sendmail</application> command-line options.
+    </para>
+
+    <para>
+      <command>install -v -m750 -o exim -g exim /var/spool/exim</command>:
+      Since /var/spool is owned by root and this version of
+      <command>exim</command> drops
+      <systemitem class="username">root</systemitem> privileges early, to run
+      as user <systemitem class="username">exim</systemitem>, it cannot create
+      the <filename class="directory">/var/spool/exim</filename> directory. As
+      a work around, it is created manually.
+    </para>
 
   </sect2>
@@ -213,61 +252,87 @@
     <title>Adding Additional Functionality</title>
 
-    <para>To utilize some or all of the dependency packages, you'll need to
-    modify <filename>Local/Makefile</filename> to include the appropriate
-    directives and parameters to link additional libraries before you build
-    <application>Exim</application>. <filename>Local/Makefile</filename> is
-    heavily commented with instructions on how to do this. Listed below is
-    additional information to help you link these dependency packages or
-    add additional functionality.</para>
-
-    <para>If you wish to build and install the
-    <filename class='extension'>.info</filename> documentation, refer to <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinsinfdoc"/>.</para>
-
-    <para>If you wish to build in Exim's interfaces for calling virus and spam
-    scanning software directly from access control lists, uncomment the
-    <option>WITH_CONTENT_SCAN=yes</option> parameter and review the information
-    found at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch45.html"/>.</para>
-
-    <para>To use a backend database other than <application>Berkeley
-    DB</application>, see the instructions at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTdb"/>.</para>
-
-    <para>For SSL functionality, see the instructions at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinctlsssl"/>
-    and <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch42.html"/>.</para>
-
-    <para>For <application>tcpwrappers</application> functionality, see the
-    instructions at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECID27"/>.</para>
-
-    <para>For information about adding authentication mechanisms to the
-    build, see chapters 33&mdash;41 of <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/index.html"/>.</para>
-
-    <para>For information about linking <application>Linux-PAM</application>,
-    refer to the instructions <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch11.html#SECTexpcond"/>.</para>
-
-    <para>For information about linking database engine libraries used for
-    <application>Exim</application> name lookups, see the instructions at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch09.html"/>.</para>
-
-    <para>If you wish to add <application>Readline</application> support to
-    <application>Exim</application> when invoked in <quote>test expansion</quote>
-    (<option>-be</option>) mode, see the information in the <option>-be</option>
-    section of <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch05.html#id2525974"/>.</para>
-
-    <para>You may wish to modify the default configuration and send log files to
-    syslog instead of the default
-    <filename class='directory'>/var/spool/exim/log</filename> directory. See the
-    information at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch52.html"/>.</para>
-
-    <para>A wealth of information can be also found at the <ulink url=
-    "https://github.com/Exim/exim/wiki">Exim Wiki</ulink>.</para>
+    <para>
+      To utilize some or all of the dependency packages, you'll need to
+      modify <filename>Local/Makefile</filename> to include the appropriate
+      directives and parameters to link additional libraries before you build
+      <application>Exim</application>. <filename>Local/Makefile</filename> is
+      heavily commented with instructions on how to do this. Listed below is
+      additional information to help you link these dependency packages or
+      add additional functionality.
+    </para>
+
+    <para>
+      If you wish to build and install the
+      <filename class='extension'>.info</filename> documentation, refer to
+      <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinsinfdoc"/>.
+    </para>
+
+    <para>
+      If you wish to build in Exim's interfaces for calling virus and spam
+      scanning software directly from access control lists, uncomment the
+      <option>WITH_CONTENT_SCAN=yes</option> parameter and review the
+      information found at <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch45.html"/>.
+    </para>
+
+    <para>
+      To use a backend database other than <application>Berkeley
+      DB</application>, see the instructions at <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTdb"/>.
+    </para>
+
+    <para>
+      For SSL functionality, see the instructions at <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinctlsssl"/>
+      and <ulink url="
+      http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch42.html"/>.
+    </para>
+
+    <para>
+      For <application>tcpwrappers</application> functionality, see the
+      instructions at <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECID27"/>.
+    </para>
+
+    <para>
+      For information about adding authentication mechanisms to the
+      build, see chapters 33&mdash;41 of <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/index.html"/>.
+    </para>
+
+    <para>
+      For information about linking <application>Linux-PAM</application>,
+      refer to the instructions <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch11.html#SECTexpcond"/>.
+    </para>
+
+    <para>
+      For information about linking database engine libraries used for
+      <application>Exim</application> name lookups, see the instructions at
+      <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch09.html"/>.
+    </para>
+
+    <para>
+      If you wish to add <application>Readline</application> support to
+      <application>Exim</application> when invoked in <quote>test
+      expansion</quote> (<option>-be</option>) mode, see the information in
+      the <option>-be</option> section of <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch05.html#id2525974"/>.
+    </para>
+
+    <para>
+      You may wish to modify the default configuration and send log files to
+      syslog instead of the default
+      <filename class='directory'>/var/spool/exim/log</filename> directory. See
+      the information at <ulink url=
+      "http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch52.html"/>.
+    </para>
+
+    <para>
+      A wealth of information can be also found at the <ulink url=
+      "https://github.com/Exim/exim/wiki">Exim Wiki</ulink>.
+    </para>
 
   </sect2>
@@ -279,6 +344,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/exim.conf</filename> and
-      <filename>/etc/aliases</filename></para>
+      <para>
+        <filename>/etc/exim.conf</filename> and
+        <filename>/etc/aliases</filename>
+      </para>
 
       <indexterm zone="exim exim-config">
@@ -321,13 +388,17 @@
 
       <note>
-        <para>To protect an existing <filename>/etc/aliases</filename> file,
-        the command above appends these aliases to it. This file should be
-        checked and duplicate aliases removed, if present.</para>
+        <para>
+          To protect an existing <filename>/etc/aliases</filename> file,
+          the command above appends these aliases to it. This file should be
+          checked and duplicate aliases removed, if present.
+        </para>
       </note>
 
-      <para>The <command>/usr/sbin/exim -bd -q15m</command> command starts
-      the <application>Exim</application> daemon with a 15 minute interval
-      in processing the mail queue. Adjust this parameter to suit your
-      desires.</para>
+      <para>
+        The <command>/usr/sbin/exim -bd -q15m</command> command starts
+        the <application>Exim</application> daemon with a 15 minute interval
+        in processing the mail queue. Adjust this parameter to suit your
+        desires.
+      </para>
 
     </sect3>
@@ -337,11 +408,13 @@
              <phrase revision="systemd">Systemd Unit</phrase></title>
 
-      <para>To automatically start <command>exim</command> at boot,
-      install the
-      <phrase revision="sysv"><filename>/etc/rc.d/init.d/exim</filename>
-      init script</phrase>
-      <phrase revision="systemd"><filename>exim.service</filename> unit</phrase>
-      included in the <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/> package.</para>
+      <para>
+        To automatically start <command>exim</command> at boot, install the
+        <phrase revision="sysv"><filename>/etc/rc.d/init.d/exim</filename>
+        init script</phrase>
+        <phrase revision="systemd"><filename>exim.service</filename>
+        unit</phrase>
+        included in the <xref linkend="bootscripts" revision="sysv"/>
+        <xref linkend="systemd-units" revision="systemd"/> package.
+      </para>
 
       <indexterm zone="exim exim-init">
@@ -351,10 +424,11 @@
 <screen role="root"><userinput>make install-exim</userinput></screen>
 
-      <para revision="sysv">The bootscript also starts the
-      <application>Exim</application> daemon and dispatches a queue runner
-      process every 15 minutes. Modify the
-      <option>-q<replaceable>&lt;time interval&gt;</replaceable></option>
-      parameter in <filename>/etc/rc.d/init.d/exim</filename>, if necessary
-      for your installation.</para>
+      <para revision="sysv">
+        The bootscript also starts the <application>Exim</application> daemon
+        and dispatches a queue runner process every 15 minutes. Modify the
+        <option>-q<replaceable>&lt;time interval&gt;</replaceable></option>
+        parameter in <filename>/etc/rc.d/init.d/exim</filename>, if necessary
+        for your installation.
+      </para>
 
     </sect3>
@@ -388,5 +462,7 @@
         <term><command>exicyclog</command></term>
         <listitem>
-          <para>cycles <application>Exim</application> log files.</para>
+          <para>
+            cycles <application>Exim</application> log files.
+          </para>
           <indexterm zone="exim exicyclog">
             <primary sortas="b-exicyclog">exicyclog</primary>
@@ -398,5 +474,7 @@
         <term><command>exigrep</command></term>
         <listitem>
-          <para>searches <application>Exim</application> log files.</para>
+          <para>
+            searches <application>Exim</application> log files.
+          </para>
           <indexterm zone="exim exigrep">
             <primary sortas="b-exigrep">exigrep</primary>
@@ -408,6 +486,8 @@
         <term><command>exim</command></term>
         <listitem>
-          <para>is a symlink to the <command>exim-&exim-daemon-version;</command>
-          MTA daemon.</para>
+          <para>
+            is a symlink to the <command>exim-&exim-daemon-version;</command>
+            MTA daemon.
+          </para>
           <indexterm zone="exim exim-prog">
             <primary sortas="b-exim">exim</primary>
@@ -419,6 +499,7 @@
         <term><command>exim-&exim-daemon-version;</command></term>
         <listitem>
-          <para>is the <application>Exim</application> mail transport
-          agent daemon.</para>
+          <para>
+            is the <application>Exim</application> mail transport agent daemon.
+          </para>
           <indexterm zone="exim exim-current_version">
             <primary sortas="b-exim-&exim-daemon-version;">exim-&exim-daemon-version;</primary>
@@ -430,6 +511,8 @@
         <term><command>exim_checkaccess</command></term>
         <listitem>
-          <para>states whether a given recipient address from a given host is
-          acceptable or not.</para>
+          <para>
+            states whether a given recipient address from a given host is
+            acceptable or not.
+          </para>
           <indexterm zone="exim exim_checkaccess">
             <primary sortas="b-exim_checkaccess">exim_checkaccess</primary>
@@ -441,6 +524,7 @@
         <term><command>exim_dbmbuild</command></term>
         <listitem>
-          <para> creates and rebuilds <application>Exim</application>
-          databases.</para>
+          <para>
+            creates and rebuilds <application>Exim</application> databases.
+          </para>
           <indexterm zone="exim exim_dbmbuild">
             <primary sortas="b-exim_dbmbuild">exim_dbmbuild</primary>
@@ -452,6 +536,8 @@
         <term><command>exim_dumpdb</command></term>
         <listitem>
-          <para> writes the contents of <application>Exim</application>
-          databases to the standard output.</para>
+          <para>
+            writes the contents of <application>Exim</application>
+            databases to the standard output.
+          </para>
           <indexterm zone="exim exim_dumpdb">
             <primary sortas="b-exim_dumpdb">exim_dumpdb</primary>
@@ -463,6 +549,7 @@
         <term><command>exim_fixdb</command></term>
         <listitem>
-          <para>modifies data in <application>Exim</application>
-          databases.</para>
+          <para>
+            modifies data in <application>Exim</application> databases.
+          </para>
           <indexterm zone="exim exim_fixdb">
             <primary sortas="b-exim_fixdb">exim_fixdb</primary>
@@ -474,5 +561,7 @@
         <term><command>exim_lock</command></term>
         <listitem>
-          <para>locks a mailbox file.</para>
+          <para>
+            locks a mailbox file.
+          </para>
           <indexterm zone="exim exim_lock">
             <primary sortas="b-exim_lock">exim_lock</primary>
@@ -484,6 +573,8 @@
         <term><command>exim_tidydb</command></term>
         <listitem>
-          <para>removes old records from <application>Exim</application>
-          databases.</para>
+          <para>
+            removes old records from <application>Exim</application>
+            databases.
+          </para>
           <indexterm zone="exim exim_tidydb">
             <primary sortas="b-exim_tidydb">exim_tidydb</primary>
@@ -495,6 +586,8 @@
         <term><command>eximstats</command></term>
         <listitem>
-          <para>generates mail statistics from <application>Exim</application>
-          log files.</para>
+          <para>
+            generates mail statistics from <application>Exim</application>
+            log files.
+          </para>
           <indexterm zone="exim eximstats">
             <primary sortas="b-eximstats">eximstats</primary>
@@ -506,5 +599,7 @@
         <term><command>exinext</command></term>
         <listitem>
-          <para>queries remote host retry times.</para>
+          <para>
+            queries remote host retry times.
+          </para>
           <indexterm zone="exim exinext">
             <primary sortas="b-exinext">exinext</primary>
@@ -516,5 +611,7 @@
         <term><command>exipick</command></term>
         <listitem>
-          <para>selects messages based on various criteria.</para>
+          <para>
+            selects messages based on various criteria.
+          </para>
           <indexterm zone="exim exipick">
             <primary sortas="b-exipick">exipick</primary>
@@ -526,5 +623,7 @@
         <term><command>exiqgrep</command></term>
         <listitem>
-          <para>is a utility for selective queue listing.</para>
+          <para>
+            is a utility for selective queue listing.
+          </para>
           <indexterm zone="exim exiqgrep">
             <primary sortas="b-exiqgrep">exiqgrep</primary>
@@ -536,5 +635,7 @@
         <term><command>exiqsumm</command></term>
         <listitem>
-          <para>produces a summary of the messages in the mail queue.</para>
+          <para>
+            produces a summary of the messages in the mail queue.
+          </para>
           <indexterm zone="exim exiqsumm">
             <primary sortas="b-exiqsumm">exiqsumm</primary>
@@ -546,6 +647,8 @@
         <term><command>exiwhat</command></term>
         <listitem>
-          <para>queries running <application>Exim</application>
-          processes.</para>
+          <para>
+            queries running <application>Exim</application>
+          processes.
+          </para>
           <indexterm zone="exim exiwhat">
             <primary sortas="b-exiwhat">exiwhat</primary>
@@ -557,7 +660,9 @@
         <term><command>eximon</command></term>
         <listitem>
-          <para>is a start-up shell script for <command>eximon.bin</command>
-          used to set the required environment variables before running the
-          program.</para>
+          <para>
+            is a start-up shell script for <command>eximon.bin</command>
+            used to set the required environment variables before running the
+            program.
+          </para>
           <indexterm zone="exim eximon">
             <primary sortas="b-eximon">eximon</primary>
@@ -569,8 +674,10 @@
         <term><command>eximon.bin</command></term>
         <listitem>
-          <para>is a monitor program which displays current information in an
-          <application>X</application> window, and also contains a menu interface
-          to <application>Exim</application>'s command line administration
-          options.</para>
+          <para>
+            is a monitor program which displays current information in an
+            <application>X</application> window, and also contains a menu
+            interface to <application>Exim</application>'s command line
+            administration options.
+          </para>
           <indexterm zone="exim eximon.bin">
             <primary sortas="b-eximon.bin">eximon.bin</primary>
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/mail/mail.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -16,10 +16,14 @@
   <title>Mail Server Software</title>
 
-  <para>MTAs are the programs which transport mail from one machine to the
-  other. The traditional MTA is <application>Sendmail</application>, however
-  there are several other choices.</para>
+  <para>
+    MTAs are the programs which transport mail from one machine to the
+    other. The traditional MTA is <application>Sendmail</application>, however
+    there are several other choices.
+  </para>
 
-  <para>As well as SMTP servers there is a POP server (qpopper) and an IMAP
-  server (Courier-IMAP).</para>
+  <para>
+    As well as SMTP servers there is a POP server (qpopper) and an IMAP
+    server (Courier-IMAP).
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dovecot.xml"/>
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/mail/sendmail.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -32,6 +32,8 @@
     <title>Introduction to sendmail</title>
 
-    <para>The <application>sendmail</application> package contains a Mail
-    Transport Agent (MTA).</para>
+    <para>
+      The <application>sendmail</application> package contains a Mail
+      Transport Agent (MTA).
+    </para>
 
     &lfs91_checked;
@@ -40,22 +42,35 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&sendmail-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sendmail-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sendmail-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sendmail-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sendmail-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sendmail-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&sendmail-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sendmail-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sendmail-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sendmail-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sendmail-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sendmail-time;
+        </para>
       </listitem>
     </itemizedlist>
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
 
@@ -97,7 +112,9 @@
     <title>Installation of sendmail</title>
 
-    <para>Before building <application>sendmail</application>, create the
-    required user, group and directory with the following commands issued as
-    the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Before building <application>sendmail</application>, create the
+      required user, group and directory with the following commands issued as
+      the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>groupadd -g 26 smmsp                               &amp;&amp;
@@ -107,10 +124,14 @@
 install -v -m700 -d /var/spool/mqueue</userinput></screen>
 
-    <note><para>See the source tree <filename>sendmail/README</filename> file
-    for information on linking optional packages into the build. Use the
-    example below, which adds support for SASL, StartTLS
-    (<application>OpenSSL</application>) and
-    <application>OpenLDAP</application>, as a starting point.  Of course,
-    modify it to suit your particular needs.</para></note>
+    <note>
+      <para>
+        See the source tree <filename>sendmail/README</filename> file
+        for information on linking optional packages into the build. Use the
+        example below, which adds support for SASL, StartTLS
+        (<application>OpenSSL</application>) and
+        <application>OpenLDAP</application>, as a starting point.  Of course,
+        modify it to suit your particular needs.
+      </para>
+    </note>
 
 <screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
@@ -120,6 +141,7 @@
 EOF</userinput></screen>
 
-    <para>Install <application>sendmail</application> with the following
-    commands:</para>
+    <para>
+      Install <application>sendmail</application> with the following commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../sendmail.&sendmail-version;-openssl-1.patch &amp;&amp;
@@ -142,7 +164,11 @@
 sh Build sendmail.cf</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>install -v -d -m755 /etc/mail &amp;&amp;
@@ -175,11 +201,16 @@
 install -v -m644 vacation/vacation.1   /usr/share/man/man1</userinput></screen>
 
-    <para>Install the <application>sendmail</application> Installation and
-    Operations Guide with the following commands:</para>
-
-    <note><para>Remove <filename>op.pdf</filename> from the
-    <command>make</command> and <command>install</command> commands below if
-    you don't have <application>Ghostscript</application>
-    installed.</para></note>
+    <para>
+      Install the <application>sendmail</application> Installation and
+      Operations Guide with the following commands:
+    </para>
+
+    <note>
+      <para>
+        Remove <filename>op.pdf</filename> from the <command>make</command>
+        and <command>install</command> commands below if
+        you don't have <application>Ghostscript</application> installed.
+      </para>
+    </note>
 
 <screen remap="doc"><userinput>cd doc/op                                       &amp;&amp;
@@ -187,5 +218,7 @@
 make op.txt op.pdf</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"
@@ -199,24 +232,34 @@
     <title>Command Explanations</title>
 
-    <para><command>cat &gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"</command>:
-    This creates a configuration file changing some of the default settings.</para>
-
-    <para><command>sed ... devtools/OS/Linux</command>: The site.config.m4
-    does not honor a change to the man directory, so fix it in the OS
-    definitions.</para>
-
-    <para><command>sed ... include/sm/bdb.h</command>: This allows sendmail to
-    build properly with <xref linkend='db'/> versions 5 and above.</para>
-
-    <para><command>sh Build; sh Build sendmail.cf; sh Build install-cf;
-    sh Build install</command>: <application>sendmail</application> uses an
-    <application>m4</application> based build script to create the various
-    <filename>Makefile</filename>s. These commands build and install the
-    package.</para>
-
-    <para><command>for manpage in...;do...;done; install ...</command>: The man
-    pages are installed already formatted and <command>man</command> displays
-    them somewhat garbled. These commands replace the formatted pages with
-    pages <command>man</command> can display properly.</para>
+    <para>
+      <command>cat &gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"</command>:
+      This creates a configuration file changing some of the default settings.
+    </para>
+
+    <para>
+      <command>sed ... devtools/OS/Linux</command>: The site.config.m4
+      does not honor a change to the man directory, so fix it in the OS
+      definitions.
+    </para>
+
+    <para>
+      <command>sed ... include/sm/bdb.h</command>: This allows sendmail to
+      build properly with <xref linkend='db'/> versions 5 and above.
+    </para>
+
+    <para>
+      <command>sh Build; sh Build sendmail.cf; sh Build install-cf;
+      sh Build install</command>: <application>sendmail</application> uses an
+      <application>m4</application> based build script to create the various
+      <filename>Makefile</filename>s. These commands build and install the
+      package.
+    </para>
+
+    <para>
+      <command>for manpage in...;do...;done; install ...</command>: The man
+      pages are installed already formatted and <command>man</command> displays
+      them somewhat garbled. These commands replace the formatted pages with
+      pages <command>man</command> can display properly.
+    </para>
 
   </sect2>
@@ -228,5 +271,7 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/mail/*</filename></para>
+      <para>
+        <filename>/etc/mail/*</filename>
+      </para>
 
       <indexterm zone="sendmail sendmail-config">
@@ -239,12 +284,16 @@
       <title>Configuration Information</title>
 
-      <note><para>Ensure you have a fully qualified domain name defined
-      in <filename>/etc/hosts</filename> for your system before proceeding.
-      </para></note>
-
-      <para>Create the <filename>/etc/mail/local-host-names</filename> and
-      <filename>/etc/mail/aliases</filename> files using the following
-      commands as the <systemitem class="username">root</systemitem>
-      user:</para>
+      <note>
+        <para>
+          Ensure you have a fully qualified domain name defined
+          in <filename>/etc/hosts</filename> for your system before proceeding.
+        </para>
+      </note>
+
+      <para>
+        Create the <filename>/etc/mail/local-host-names</filename> and
+        <filename>/etc/mail/aliases</filename> files using the following
+        commands as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>echo $(hostname) > /etc/mail/local-host-names
@@ -256,17 +305,21 @@
 newaliases</userinput></screen>
 
-      <para><application>sendmail</application>'s primary configuration file,
-      <filename>/etc/mail/sendmail.cf</filename>, is complex and not meant to be
-      directly edited. The recommended method for changing it is to modify
-      <filename>/etc/mail/sendmail.mc</filename> and various
-      <application>m4</application> files, then run the <command>m4</command>
-      macro processor from within
-      <filename class='directory'>/etc/mail</filename> as follows:</para>
+      <para>
+        <application>sendmail</application>'s primary configuration file,
+        <filename>/etc/mail/sendmail.cf</filename>, is complex and not meant to
+        be directly edited. The recommended method for changing it is to modify
+        <filename>/etc/mail/sendmail.mc</filename> and various
+        <application>m4</application> files, then run the <command>m4</command>
+        macro processor from within
+        <filename class='directory'>/etc/mail</filename> as follows:
+      </para>
 
 <screen role="root"><userinput>cd /etc/mail &amp;&amp;
 m4 m4/cf.m4 sendmail.mc > sendmail.cf</userinput></screen>
 
-      <para>A full explanation of the files to modify, and the available
-      parameters can be found in <filename>/etc/mail/README</filename>.</para>
+      <para>
+        A full explanation of the files to modify, and the available
+        parameters can be found in <filename>/etc/mail/README</filename>.
+      </para>
 
     </sect3>
@@ -276,12 +329,14 @@
              <phrase revision="systemd">Systemd Unit</phrase></title>
 
-      <para>To automate the running of <application>sendmail</application>
-      at startup, install the 
-      <phrase revision="sysv"><filename>/etc/rc.d/init.d/sendmail</filename>
-      init script</phrase>
-      <phrase revision="systemd"><filename>sendmail.service</filename>
-      unit</phrase> included in the
-      <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/> package.</para>
+      <para>
+        To automate the running of <application>sendmail</application>
+        at startup, install the 
+        <phrase revision="sysv"><filename>/etc/rc.d/init.d/sendmail</filename>
+        init script</phrase>
+        <phrase revision="systemd"><filename>sendmail.service</filename>
+        unit</phrase> included in the
+        <xref linkend="bootscripts" revision="sysv"/>
+        <xref linkend="systemd-units" revision="systemd"/> package.
+      </para>
 
       <indexterm zone="sendmail sendmail-init">
@@ -292,11 +347,13 @@
 
       <note>
-        <para>The -qNm option to <command>sendmail</command>, where N is number
-        of minutes, controls how often <application>sendmail</application> will
-        process the mail queue. A default of 5 minutes is used in the
-        <phrase revision="sysv">init script.</phrase>
-        <phrase revision="systemd">systemd unit.</phrase> Individual
-        workstation users may want to set this as low as 1 minute, large
-        installations handling more mail may want to set it higher.</para>
+        <para>
+          The -qNm option to <command>sendmail</command>, where N is number
+          of minutes, controls how often <application>sendmail</application>
+          will process the mail queue. A default of 5 minutes is used in the
+          <phrase revision="sysv">init script.</phrase>
+          <phrase revision="systemd">systemd unit.</phrase> Individual
+          workstation users may want to set this as low as 1 minute, large
+          installations handling more mail may want to set it higher.
+        </para>
       </note>
 
@@ -331,6 +388,7 @@
         <term><command>editmap</command></term>
         <listitem>
-          <para>queries and edits <application>sendmail</application> map
-          files.</para>
+          <para>
+            queries and edits <application>sendmail</application> map files.
+          </para>
           <indexterm zone="sendmail editmap">
             <primary sortas="b-editmap">editmap</primary>
@@ -342,6 +400,7 @@
         <term><command>hoststat</command></term>
         <listitem>
-          <para>prints <application>sendmail</application>'s persistent host
-          status.</para>
+          <para>
+            prints <application>sendmail</application>'s persistent host status.
+          </para>
           <indexterm zone="sendmail hoststat">
             <primary sortas="b-hoststat">hoststat</primary>
@@ -353,5 +412,7 @@
         <term><command>mailstats</command></term>
         <listitem>
-          <para>displays <application>sendmail</application> statistics.</para>
+          <para>
+            displays <application>sendmail</application> statistics.
+          </para>
           <indexterm zone="sendmail mailstats">
             <primary sortas="b-mailstats">mailstats</primary>
@@ -363,6 +424,7 @@
         <term><command>mailq</command></term>
         <listitem>
-          <para>prints a summary of outbound mail messages waiting for
-          delivery.</para>
+          <para>
+            prints a summary of outbound mail messages waiting for delivery.
+          </para>
           <indexterm zone="sendmail mailq-sendmail">
             <primary sortas="b-mailq">mailq</primary>
@@ -374,5 +436,7 @@
         <term><command>makemap</command></term>
         <listitem>
-          <para>creates <application>sendmail</application> map files.</para>
+          <para>
+            creates <application>sendmail</application> map files.
+          </para>
           <indexterm zone="sendmail makemap">
             <primary sortas="b-makemap">makemap</primary>
@@ -384,6 +448,8 @@
         <term><command>newaliases</command></term>
         <listitem>
-          <para>rebuilds <filename>/etc/mail/aliases.db</filename> from the
-          contents of <filename>/etc/mail/aliases</filename>.</para>
+          <para>
+            rebuilds <filename>/etc/mail/aliases.db</filename> from the
+            contents of <filename>/etc/mail/aliases</filename>.
+          </para>
           <indexterm zone="sendmail newaliases-sendmail">
             <primary sortas="b-newaliases">newaliases</primary>
@@ -395,6 +461,7 @@
         <term><command>praliases</command></term>
         <listitem>
-          <para>displays current <application>sendmail</application>
-          aliases.</para>
+          <para>
+            displays current <application>sendmail</application> aliases.
+          </para>
           <indexterm zone="sendmail praliases">
             <primary sortas="b-praliases">praliases</primary>
@@ -406,6 +473,8 @@
         <term><command>purgestat</command></term>
         <listitem>
-          <para> causes <application>sendmail</application> to clear (purge)
-          all its host-status information.</para>
+          <para>
+            causes <application>sendmail</application> to clear (purge)
+            all its host-status information.
+          </para>
           <indexterm zone="sendmail purgestat">
             <primary sortas="b-purgestat">purgestat</primary>
@@ -417,6 +486,7 @@
         <term><command>sendmail</command></term>
         <listitem>
-          <para>is the <application>sendmail</application> mail transport
-          agent.</para>
+          <para>
+            is the <application>sendmail</application> mail transport agent.
+          </para>
           <indexterm zone="sendmail sendmail-prog-sendmail">
             <primary sortas="b-sendmail">sendmail</primary>
@@ -428,6 +498,7 @@
         <term><command>smrsh</command></term>
         <listitem>
-          <para>is a restricted shell for
-          <application>sendmail</application>.</para>
+          <para>
+            is a restricted shell for <application>sendmail</application>.
+          </para>
           <indexterm zone="sendmail smrsh">
             <primary sortas="b-smrsh">smrsh</primary>
@@ -439,5 +510,7 @@
         <term><command>vacation</command></term>
         <listitem>
-          <para>is an email auto responder.</para>
+          <para>
+            is an email auto responder.
+          </para>
           <indexterm zone="sendmail vacation-sendmail">
             <primary sortas="b-vacation">vacation</primary>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/other/openldap.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -140,13 +140,14 @@
 
     <warning>
-      <para>If upgrading from a previous installation that used Berkeley DB as
-      the backend, you will need to dump the database(s) using the
-      <command>slapcat</command> utility, relocate all files in
-      <filename class="directory">/var/lib/openldap</filename>, change all
-      instances of <option>bdb</option> to <option>mdb</option> in
-      <filename>/etc/openldap/slapd.conf</filename> and any files in
-      <filename class="directory">/etc/openldap/slapd.d</filename>, and import
-      using the <command>slapadd</command> utility after the installation is
-      completed.
+      <para>
+        If upgrading from a previous installation that used Berkeley DB as
+        the backend, you will need to dump the database(s) using the
+        <command>slapcat</command> utility, relocate all files in
+        <filename class="directory">/var/lib/openldap</filename>, change all
+        instances of <option>bdb</option> to <option>mdb</option> in
+        <filename>/etc/openldap/slapd.conf</filename> and any files in
+        <filename class="directory">/etc/openldap/slapd.d</filename>, and import
+        using the <command>slapadd</command> utility after the installation is
+        completed.
       </para>
     </warning>
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/other/other.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -16,10 +16,12 @@
   <title>Other Server Software</title>
 
-  <para>Here you will find many ways to share your machine with the rest
-  of the world or your local network.  Before installing
-  any packages in this chapter, you need to be sure you understand what
-  the package does and how to set it up correctly.  It might also be
-  helpful to learn about the consequences of an improper setup so
-  that you can analyze the risks.</para>
+  <para>
+    Here you will find many ways to share your machine with the rest
+    of the world or your local network.  Before installing
+    any packages in this chapter, you need to be sure you understand what
+    the package does and how to set it up correctly.  It might also be
+    helpful to learn about the consequences of an improper setup so
+    that you can analyze the risks.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openldap.xml"/>
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision f0d1db940ded79844ed91bb980fe7754df19868d)
+++ server/other/unbound.xml	(revision 27b601aca6ad9934609b5c5e5c179919173cbf5e)
@@ -132,5 +132,7 @@
 <screen remap="doc"><userinput>make doc</userinput></screen>
 
-    <para>To test the results, issue <command>make check</command>.</para>
+    <para>
+      To test the results, issue <command>make check</command>.
+    </para>
 
     <para>
@@ -176,5 +178,7 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/unbound/unbound.conf</filename></para>
+      <para>
+        <filename>/etc/unbound/unbound.conf</filename>
+      </para>
 
       <indexterm zone="unbound unbound-config">
@@ -231,12 +235,14 @@
              <phrase revision="systemd">Systemd Unit</phrase></title>
 
-      <para>If you want the <application>Unbound</application> server to
-      start automatically when the system is booted, install the
-      <phrase revision="sysv"><filename>/etc/rc.d/init.d/unbound</filename>
-      init script</phrase>
-      <phrase revision="systemd"><filename>unbound.service</filename>
-      unit</phrase> included
-      in the <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/> package.</para>
+      <para>
+        If you want the <application>Unbound</application> server to
+        start automatically when the system is booted, install the
+        <phrase revision="sysv"><filename>/etc/rc.d/init.d/unbound</filename>
+        init script</phrase>
+        <phrase revision="systemd"><filename>unbound.service</filename>
+        unit</phrase> included
+        in the <xref linkend="bootscripts" revision="sysv"/>
+        <xref linkend="systemd-units" revision="systemd"/> package.
+      </para>
 
       <indexterm zone="unbound unbound-init">
