Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/printing/cups.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -307,5 +307,7 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/cups/*</filename></para>
+      <para>
+        <filename>/etc/cups/*</filename>
+      </para>
 
       <indexterm zone="cups cups-config">
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/printing/gs.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -43,7 +43,9 @@
     <title>Introduction to Ghostscript</title>
 
-    <para><application>Ghostscript</application> is a versatile processor
-    for PostScript data with the ability to render PostScript to different
-    targets. It is a mandatory part of the cups printing stack.</para>
+    <para>
+      <application>Ghostscript</application> is a versatile processor
+      for PostScript data with the ability to render PostScript to different
+      targets. It is a mandatory part of the cups printing stack.
+    </para>
 
     &lfs91_checked;
@@ -52,36 +54,56 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gs-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&gs-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gs-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gs-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gs-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gs-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gs-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-      <para>If you wish, you can download additional fonts.</para>
+    <para>
+      If you wish, you can download additional fonts.
+    </para>
 
     <itemizedlist spacing="compact">
       <title>Standard Fonts</title>
       <listitem>
-        <para>Download (HTTP): <ulink url="&gs-standard-fonts-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gs-standard-fonts-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gs-standard-fonts-size;</para>
+        <para>
+          Download (HTTP): <ulink url="&gs-standard-fonts-download;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gs-standard-fonts-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gs-standard-fonts-size;
+        </para>
       </listitem>
     </itemizedlist>
@@ -90,11 +112,17 @@
       <title>Other Fonts</title>
       <listitem>
-        <para>Download (HTTP): <ulink url="&gs-other-fonts-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gs-other-fonts-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gs-other-fonts-size;</para>
+        <para>
+          Download (HTTP): <ulink url="&gs-other-fonts-download;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gs-other-fonts-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gs-other-fonts-size;
+        </para>
       </listitem>
     </itemizedlist>
@@ -161,5 +189,7 @@
 <screen><userinput>rm -rf freetype lcms2mt jpeg libpng openjpeg</userinput></screen>
 
-    <para>Compile <application>Ghostscript</application>:</para>
+    <para>
+      Compile <application>Ghostscript</application>:
+    </para>
 
 <screen><userinput>rm -rf zlib &amp;&amp;
@@ -200,5 +230,7 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you want the shared library too:</para>
+    <para>
+      If you want the shared library too:
+    </para>
 
 <screen role="root"><userinput>make soinstall &amp;&amp;
@@ -206,5 +238,7 @@
 ln -sfvn ghostscript /usr/include/ps</userinput></screen>
 
-    <para>Now make the documentation accessible from the normal place:</para>
+    <para>
+      Now make the documentation accessible from the normal place:
+    </para>
 <!-- Starting with 9.23, the install does not seem to copy the examples any more -->
 
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/printing/gutenprint.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -31,11 +31,12 @@
     <title>Introduction to Gutenprint</title>
 
-    <para>The <application>Gutenprint</application> (formerly
-    <application>Gimp-Print</application>) package contains high
-    quality drivers for many brands and models of printers for use with
-    <xref linkend="cups"/>
-    and the
-    <application>GIMP-2.0</application>. See a list of supported printers at
-    <ulink url="http://gutenprint.sourceforge.net/p_Supported_Printers.php"/>.
+    <para>
+      The <application>Gutenprint</application> (formerly
+      <application>Gimp-Print</application>) package contains high
+      quality drivers for many brands and models of printers for use with
+      <xref linkend="cups"/>
+      and the
+      <application>GIMP-2.0</application>. See a list of supported printers at
+      <ulink url="http://gutenprint.sourceforge.net/p_Supported_Printers.php"/>.
     </para>
 
@@ -45,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gutenprint-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gutenprint-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gutenprint-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gutenprint-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gutenprint-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gutenprint-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&gutenprint-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gutenprint-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gutenprint-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gutenprint-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gutenprint-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gutenprint-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -137,6 +150,8 @@
     <title>Installation of Gutenprint</title>
 
-    <para>Install <application>Gutenprint</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Gutenprint</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>sed -i 's|$(PACKAGE)/doc|doc/$(PACKAGE)-$(VERSION)|' \
@@ -150,12 +165,16 @@
     the package - but the tests in 5.2.12 have changed and I thought I read they
     were more parallel -->
-    <para>To test the results, issue: <command>make check</command>.  The tests
-    take a very long time and use a lot of disk space.  When last tested
-    (version 5.2.15 in June 2019) this needed 75 SBU and 13.5 GB
-    to complete the tests (one test, rastertogutenprint failed because the CUPS
-    ppds are for a previous version. Maybe genppds should be run before the
-    tests). Note that the tests used only one CPU.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.  The tests
+      take a very long time and use a lot of disk space.  When last tested
+      (version 5.2.15 in June 2019) this needed 75 SBU and 13.5 GB
+      to complete the tests (one test, rastertogutenprint failed because the
+      CUPS ppds are for a previous version. Maybe genppds should be run before
+      the tests). Note that the tests used only one CPU.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -171,9 +190,11 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i '...' ...Makefile.in</command>: This
-    command is used so that the package documentation is installed in the
-    conventional <filename class='directory'>/usr/share/doc</filename>
-    directory structure instead of
-    <filename class='directory'>/usr/share/gutenprint/doc</filename>.</para>
+    <para>
+      <command>sed -i '...' ...Makefile.in</command>: This
+      command is used so that the package documentation is installed in the
+      conventional <filename class='directory'>/usr/share/doc</filename>
+      directory structure instead of
+      <filename class='directory'>/usr/share/gutenprint/doc</filename>.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -188,7 +209,9 @@
       <title>Configuration Information</title>
 
-      <para>For <application>CUPS</application> to see newly installed print
-      drivers, it has to be restarted (as the <systemitem
-      class="username">root</systemitem> user):</para>
+      <para>
+        For <application>CUPS</application> to see newly installed print
+        drivers, it has to be restarted (as the <systemitem
+        class="username">root</systemitem> user):
+      </para>
 
 <screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/cups restart</userinput></screen>
@@ -196,11 +219,15 @@
 <screen role="root" revision="systemd"><userinput>systemctl restart org.cups.cupsd</userinput></screen>
 
-      <!-- <para>This command may take a long time (up to 10 minutes)
-      to complete. Don't panic while <application>CUPS</application>
-      is rescanning the list of PPD files. The long delay will happen
-      only once.</para> -->
-
-      <para>Then point your web browser to <ulink url="http://localhost:631/"/>
-      to add a new printer to <application>CUPS</application>.</para>
+      <!-- <para>
+        This command may take a long time (up to 10 minutes)
+        to complete. Don't panic while <application>CUPS</application>
+        is rescanning the list of PPD files. The long delay will happen
+        only once.
+      </para> -->
+
+      <para>
+        Then point your web browser to <ulink url="http://localhost:631/"/>
+        to add a new printer to <application>CUPS</application>.
+      </para>
 
     </sect3>
@@ -242,8 +269,10 @@
         <term><command>cups-calibrate</command></term>
         <listitem>
-          <para>calibrates the color output of printers using the
-          <application>Gutenprint</application>,
-          <application>CUPS</application> or
-          <application>ESP Print Pro</application> drivers.</para>
+          <para>
+            calibrates the color output of printers using the
+            <application>Gutenprint</application>,
+            <application>CUPS</application> or
+            <application>ESP Print Pro</application> drivers.
+          </para>
           <indexterm zone="gutenprint cups-calibrate">
             <primary sortas="b-cups-calibrate">cups-calibrate</primary>
@@ -279,6 +308,8 @@
         <term><command>escputil</command></term>
         <listitem>
-          <para>is a command line utility to perform various maintenance
-          tasks on Epson Stylus inkjet printers.</para>
+          <para>
+            is a command line utility to perform various maintenance
+            tasks on Epson Stylus inkjet printers.
+          </para>
           <indexterm zone="gutenprint escputil">
             <primary sortas="b-escputil">escputil</primary>
@@ -292,5 +323,7 @@
         <term><command>ijsgutenprint.5.2</command></term>
         <listitem>
-          <para>is a Ghostscript driver for HP InkJet and LaserJet printers.</para>
+          <para>
+            is a Ghostscript driver for HP InkJet and LaserJet printers.
+          </para>
           <indexterm zone="gutenprint ijsgutenprint.5.2">
             <primary sortas="b-ijsgutenprint.5.2">ijsgutenprint.5.2</primary>
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/printing/printing.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -16,7 +16,9 @@
   <title>Printing</title>
 
-  <para>This chapter contains spooling printer management systems and
-  ghostscript applications to render PostScript for display on terminals
-  or paper.</para>
+  <para>
+    This chapter contains spooling printer management systems and
+    ghostscript applications to render PostScript for display on terminals
+    or paper.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups.xml"/>
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/ps/a2ps.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -32,19 +32,23 @@
     <title>Introduction to a2ps</title>
 
-    <para><application>a2ps</application> is a filter utilized mainly
-    in the background and primarily by printing scripts to convert almost
-    every input format into PostScript output. The application's name
-    expands appropriately to <quote>all to PostScript</quote>.</para>
+    <para>
+      <application>a2ps</application> is a filter utilized mainly
+      in the background and primarily by printing scripts to convert almost
+      every input format into PostScript output. The application's name
+      expands appropriately to <quote>all to PostScript</quote>.
+    </para>
 
     &lfs91_checked;
 
     <caution>
-      <para><application>a2ps</application> cannot convert UTF-8 encoded
-      text to PostScript. The issue is discussed in detail in the
-      <xref linkend="locale-not-valid-option"/> section of the
-      <xref linkend="locale-issues"/> page.
-      The solution is to use <xref linkend="paps"/> instead of
-      <application>a2ps</application> for converting
-      UTF-8 encoded text to PostScript.</para>
+      <para>
+        <application>a2ps</application> cannot convert UTF-8 encoded
+        text to PostScript. The issue is discussed in detail in the
+        <xref linkend="locale-not-valid-option"/> section of the
+        <xref linkend="locale-issues"/> page.
+        The solution is to use <xref linkend="paps"/> instead of
+        <application>a2ps</application> for converting
+        UTF-8 encoded text to PostScript.
+      </para>
     </caution>
 
@@ -52,20 +56,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&a2ps-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&a2ps-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &a2ps-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &a2ps-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &a2ps-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &a2ps-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&a2ps-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&a2ps-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &a2ps-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &a2ps-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &a2ps-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &a2ps-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -74,6 +90,8 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>International fonts: <ulink
-        url="&sources-anduin-http;/i18n-fonts/i18n-fonts-&i18n-fonts-version;.tar.bz2"/></para>
+        <para>
+          International fonts: <ulink url=
+            "&sources-anduin-http;/i18n-fonts/i18n-fonts-&i18n-fonts-version;.tar.bz2"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -108,6 +126,8 @@
     <title>Installation of a2ps</title>
 
-    <para>Install <application>a2ps</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>a2ps</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>autoconf &amp;&amp;
@@ -122,18 +142,25 @@
 touch doc/*.info</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.
-    The <filename>printers.tst</filename> test will fail, as there is no default
-    test printer.  The <filename>styles.tst</filename> may also fail, as the
-    tests report some inconsistencies between the generated postscript and the
-    reference sets.  This is caused by version number differences between the
-    postscript test files and those generated by the tests &mdash; these do not
-    affect the operation of the program and can be ignored.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+      The <filename>printers.tst</filename> test will fail, as there is no
+      default test printer.  The <filename>styles.tst</filename> may also
+      fail, as the tests report some inconsistencies between the generated
+      postscript and the reference sets.  This is caused by version number
+      differences between the postscript test files and those generated by
+      the tests &mdash; these do not affect the operation of the program
+      and can be ignored.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If desired, install the downloaded i18n-fonts by running the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If desired, install the downloaded i18n-fonts by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>tar -xf ../i18n-fonts-&i18n-fonts-version;.tar.bz2 &amp;&amp;
@@ -150,38 +177,52 @@
     <title>Command Explanations</title>
 
-    <para><command>autoconf</command>: This command is used to recreate the
-    <command>configure</command> script. This is required because there is
-    an issue in the mktime test which causes the
-    <command>configure</command> script to hang for 60 seconds and then report
-    that there is no working mktime function.</para>
-
-    <para><command>sed -i "s/GPERF --version |/&amp; head -n 1 |/" configure</command>:
-    This fixes a bug in the handling of the version output of
-    <command>gperf</command>.</para>
-
-    <para><command>sed -i "s|/usr/local/share|/usr/share|" configure</command>:
-    This command modifies the <command>configure</command> script to search for
-    <application>Ghostscript</application> fonts at the location where they were
-    installed by the BLFS instructions.</para>
-
-    <para><parameter>--sysconfdir=/etc/a2ps</parameter>: Configuration data
-    is installed in <filename class="directory">/etc/a2ps</filename> instead of
-    <filename class="directory">/usr/etc</filename>.</para>
-
-    <para><parameter>--enable-shared</parameter>: This switch enables building
-    the dynamic <filename class='libraryfile'>liba2ps</filename> library.</para>
-
-    <para><parameter>--with-medium=letter</parameter>: This switch changes the
-    default paper format to US letter. It can either be given here or set
-    in <filename>/etc/a2ps/a2ps-site.cfg</filename> after installation. The
-    default is A4, but there are several other options, in particular: A4dj or
-    letterdj are good settings for HP Deskjet and other printers that need
-    wider paper-handling margins. See <filename>/etc/a2ps/a2ps.cfg</filename>
-    after installation.</para>
-
-    <para><command>touch doc/*.info</command>: This command avoids trying to
-    regenerate the info files. This is an older package and the current
-    .texi files will produce errors preventing <command>make install</command>
-    from working properly.</para>
+    <para>
+      <command>autoconf</command>: This command is used to recreate the
+      <command>configure</command> script. This is required because there is
+      an issue in the mktime test which causes the
+      <command>configure</command> script to hang for 60 seconds and then
+      report that there is no working mktime function.
+    </para>
+
+    <para>
+      <command>sed -i "s/GPERF --version |/&amp; head -n 1 |/" configure</command>:
+      This fixes a bug in the handling of the version output of
+      <command>gperf</command>.
+    </para>
+
+    <para>
+      <command>sed -i "s|/usr/local/share|/usr/share|" configure</command>:
+      This command modifies the <command>configure</command> script to search
+      for <application>Ghostscript</application> fonts at the location where
+      they were installed by the BLFS instructions.
+    </para>
+
+    <para>
+      <parameter>--sysconfdir=/etc/a2ps</parameter>: Configuration data is
+      installed in <filename class="directory">/etc/a2ps</filename> instead of
+      <filename class="directory">/usr/etc</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-shared</parameter>: This switch enables building
+      the dynamic <filename class='libraryfile'>liba2ps</filename> library.
+    </para>
+
+    <para>
+      <parameter>--with-medium=letter</parameter>: This switch changes the
+      default paper format to US letter. It can either be given here or set
+      in <filename>/etc/a2ps/a2ps-site.cfg</filename> after installation. The
+      default is A4, but there are several other options, in particular: A4dj
+      or letterdj are good settings for HP Deskjet and other printers that need
+      wider paper-handling margins. See <filename>/etc/a2ps/a2ps.cfg</filename>
+      after installation.
+    </para>
+
+    <para>
+      <command>touch doc/*.info</command>: This command avoids trying to
+      regenerate the info files. This is an older package and the current
+      <filename class="extension">.texi</filename> files will produce errors
+      preventing <command>make install</command> from working properly.
+    </para>
 
   </sect2>
@@ -193,6 +234,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/a2ps/a2ps.cfg</filename>,
-      <filename>/etc/a2ps/a2ps-site.cfg</filename></para>
+      <para>
+        <filename>/etc/a2ps/a2ps.cfg</filename> and
+        <filename>/etc/a2ps/a2ps-site.cfg</filename>
+      </para>
 
       <indexterm zone="a2ps a2ps-config">
@@ -209,7 +252,9 @@
       <title>Configuration Information</title>
 
-      <para>Information about configuring <application>a2ps</application>
-      can be found in the comments contained in the above files, and also
-      by running <command>info a2ps</command>.</para>
+      <para>
+        Information about configuring <application>a2ps</application>
+        can be found in the comments contained in the above files, and also
+        by running <command>info a2ps</command>.
+      </para>
 
     </sect3>
@@ -241,6 +286,8 @@
         <term><command>a2ps</command></term>
         <listitem>
-          <para>is a filter, utilized primarily by printing scripts,
-          that converts standard input or supported files to PostScript.</para>
+          <para>
+            is a filter, utilized primarily by printing scripts,
+            that converts standard input or supported files to PostScript.
+          </para>
           <indexterm zone="a2ps a2ps-prog">
             <primary sortas="b-a2ps">a2ps</primary>
@@ -252,5 +299,7 @@
         <term><command>card</command></term>
         <listitem>
-          <para>prints a reference card of a given program's options.</para>
+          <para>
+            prints a reference card of a given program's options.
+          </para>
           <indexterm zone="a2ps card">
             <primary sortas="b-card">card</primary>
@@ -262,5 +311,7 @@
         <term><command>composeglyphs</command></term>
         <listitem>
-          <para>creates a composite font program.</para>
+          <para>
+            creates a composite font program.
+          </para>
           <indexterm zone="a2ps composeglyphs">
             <primary sortas="b-composeglyphs">composeglyphs</primary>
@@ -272,7 +323,9 @@
         <term><command>fixnt</command></term>
         <listitem>
-          <para>is supposed to fix the problems in the PostScript files
-          generated by the Microsoft PostScript driver under Windows NT
-          (3.5 and 4.0).</para>
+          <para>
+            is supposed to fix the problems in the PostScript files
+            generated by the Microsoft PostScript driver under Windows NT
+            (3.5 and 4.0).
+          </para>
           <indexterm zone="a2ps fixnt">
             <primary sortas="b-fixnt">fixnt</primary>
@@ -284,6 +337,8 @@
         <term><command>fixps</command></term>
         <listitem>
-          <para>tries to fix common PostScript problems that break
-          postprocessing.</para>
+          <para>
+            tries to fix common PostScript problems that break
+            postprocessing.
+          </para>
           <indexterm zone="a2ps fixps">
             <primary sortas="b-fixps">fixps</primary>
@@ -295,7 +350,9 @@
         <term><command>ogonkify</command></term>
         <listitem>
-          <para>provides international support for Postscript by performing
-          various munging of PostScript files related to printing in different
-          languages.</para>
+          <para>
+            provides international support for Postscript by performing various
+            munging of PostScript files related to printing in different
+            languages.
+          </para>
           <indexterm zone="a2ps ogonkify">
             <primary sortas="b-ogonkify">ogonkify</primary>
@@ -307,5 +364,7 @@
         <term><command>pdiff</command></term>
         <listitem>
-          <para>produces a pretty comparison between files.</para>
+          <para>
+            produces a pretty comparison between files.
+          </para>
           <indexterm zone="a2ps pdiff">
             <primary sortas="b-pdiff">pdiff</primary>
@@ -317,6 +376,8 @@
         <term><command>psmandup</command></term>
         <listitem>
-          <para>tries to produce a version of a given PostScript file to
-          print in manual duplex.</para>
+          <para>
+            tries to produce a version of a given PostScript file to
+            print in manual duplex.
+          </para>
           <indexterm zone="a2ps psmandup">
             <primary sortas="b-psmandup">psmandup</primary>
@@ -328,8 +389,10 @@
         <term><command>psset</command></term>
         <listitem>
-          <para>produces a version of a given PostScript file with a
-          protected call to the PostScript operator 'setpagedevice'.
-          Typical use is making a file print duplex, or on the manual
-          tray, etc.</para>
+          <para>
+            produces a version of a given PostScript file with a
+            protected call to the PostScript operator 'setpagedevice'.
+            Typical use is making a file print duplex, or on the manual
+            tray, etc.
+          </para>
           <indexterm zone="a2ps psset">
             <primary sortas="b-psset">psset</primary>
@@ -341,5 +404,7 @@
         <term><command>texi2dvi4a2ps</command></term>
         <listitem>
-          <para>compiles Texinfo and LaTeX files to DVI or PDF</para>
+          <para>
+            compiles Texinfo and LaTeX files to DVI or PDF.
+          </para>
           <indexterm zone="a2ps texi2dvi4a2ps">
             <primary sortas="b-texi2dvi4a2ps">texi2dvi4a2ps</primary>
Index: pst/ps/enscript.xml
===================================================================
--- pst/ps/enscript.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/ps/enscript.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -34,17 +34,21 @@
     <title>Introduction to Enscript</title>
 
-    <para><application>Enscript</application> converts ASCII text files
-    to PostScript, HTML, RTF, ANSI and overstrikes.</para>
+    <para>
+      <application>Enscript</application> converts ASCII text files
+      to PostScript, HTML, RTF, ANSI and overstrikes.
+    </para>
 
     &lfs91_checked;
 
     <caution>
-      <para><application>Enscript</application> cannot convert UTF-8 encoded
-      text to PostScript. The issue is discussed in detail in the
-      <xref linkend="locale-not-valid-option"/> section of the
-      <xref linkend="locale-issues"/> page.
-      The solution is to use <xref linkend="paps"/>, instead of
-      <application>Enscript</application>, for converting
-      UTF-8 encoded text to PostScript.</para>
+      <para>
+        <application>Enscript</application> cannot convert UTF-8 encoded
+        text to PostScript. The issue is discussed in detail in the
+        <xref linkend="locale-not-valid-option"/> section of the
+        <xref linkend="locale-issues"/> page.
+        The solution is to use <xref linkend="paps"/>, instead of
+        <application>Enscript</application>, for converting
+        UTF-8 encoded text to PostScript.
+      </para>
     </caution>
 
@@ -52,20 +56,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&enscript-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&enscript-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &enscript-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &enscript-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &enscript-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &enscript-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&enscript-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&enscript-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &enscript-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &enscript-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &enscript-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &enscript-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -74,6 +90,8 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/enscript-&enscript-version;-security_fixes-1.patch"/></para>
+        <para>
+          Required patch: <ulink url=
+            "&patch-root;/enscript-&enscript-version;-security_fixes-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist> -->
@@ -93,6 +111,8 @@
     <title>Installation of Enscript</title>
 
-    <para>Install <application>Enscript</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Enscript</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr              \
@@ -106,13 +126,19 @@
 popd</userinput></screen>
 
-    <para>If you have <xref linkend="texlive"/> installed, you can create
-    Postscript and PDF documentation by issuing (does not support parallel
-    make):</para>
+    <para>
+      If you have <xref linkend="texlive"/> installed, you can create
+      Postscript and PDF documentation by issuing (does not support parallel
+      make):
+    </para>
 
 <screen remap="doc"><userinput>make -j1 -C docs ps pdf</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -122,7 +148,9 @@
                     /usr/share/doc/enscript-&enscript-version;</userinput></screen>
 
-    <para>If you built Postscript and PDF documentation, install it
-    using the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you built Postscript and PDF documentation, install it
+      using the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"
@@ -134,14 +162,20 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=/etc/enscript</parameter>: This switch puts
-    configuration data in <filename class="directory">/etc/enscript</filename>
-    instead of <filename class="directory">/usr/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var</parameter>: This switch sets the
-    directory for runtime data to <filename class="directory">/var</filename>
-    instead of <filename class="directory">/usr/var</filename>.</para>
-
-    <para><parameter>--with-media=Letter</parameter>: This switch sets the
-    medium format to letter size instead of the A4 default.</para>
+    <para>
+      <parameter>--sysconfdir=/etc/enscript</parameter>: This switch puts
+      configuration data in <filename class="directory">/etc/enscript</filename>
+      instead of <filename class="directory">/usr/etc</filename>.
+    </para>
+
+    <para>
+      <parameter>--localstatedir=/var</parameter>: This switch sets the
+      directory for runtime data to <filename class="directory">/var</filename>
+      instead of <filename class="directory">/usr/var</filename>.
+    </para>
+
+    <para>
+      <parameter>--with-media=Letter</parameter>: This switch sets the
+      medium format to letter size instead of the A4 default.
+    </para>
   </sect2>
 
@@ -171,6 +205,8 @@
         <term><command>diffpp</command></term>
         <listitem>
-          <para>converts <command>diff</command> output files to a format
-          suitable to be printed with <command>enscript</command>.</para>
+          <para>
+            converts <command>diff</command> output files to a format
+            suitable to be printed with <command>enscript</command>.
+          </para>
           <indexterm zone="enscript diffpp">
             <primary sortas="b-diffpp">diffpp</primary>
@@ -182,7 +218,9 @@
         <term><command>enscript</command></term>
         <listitem>
-          <para>is a filter, used primarily by printing scripts, that
-          converts ASCII text files to PostScript, HTML, RTF, ANSI and
-          overstrikes.</para>
+          <para>
+            is a filter, used primarily by printing scripts, that
+            converts ASCII text files to PostScript, HTML, RTF, ANSI and
+            overstrikes.
+          </para>
           <indexterm zone="enscript enscript-prog">
             <primary sortas="b-enscript">enscript</primary>
@@ -194,5 +232,7 @@
         <term><command>mkafmmap</command></term>
         <listitem>
-          <para>creates a font map from a given file.</para>
+          <para>
+            creates a font map from a given file.
+          </para>
           <indexterm zone="enscript mkafmmap">
             <primary sortas="b-mkafmmap">mkafmmap</primary>
@@ -204,6 +244,8 @@
         <term><command>over</command></term>
         <listitem>
-          <para>is a script which calls <command>enscript</command> and
-          passes the correct parameters to create overstriked fonts.</para>
+          <para>
+            is a script which calls <command>enscript</command> and
+            passes the correct parameters to create overstriked fonts.
+          </para>
           <indexterm zone="enscript over">
             <primary sortas="b-over">over</primary>
@@ -215,5 +257,7 @@
         <term><command>sliceprint</command></term>
         <listitem>
-          <para>slices documents with long lines.</para>
+          <para>
+            slices documents with long lines.
+          </para>
           <indexterm zone="enscript sliceprint">
             <primary sortas="b-sliceprint">sliceprint</primary>
@@ -225,8 +269,10 @@
         <term><command>states</command></term>
         <listitem>
-          <para>is an <command>awk</command>-like text processing tool
-          with some state machine extensions. It is designed for program
-          source code highlighting and for similar tasks where state
-          information helps input processing.</para>
+          <para>
+            is an <command>awk</command>-like text processing tool
+            with some state machine extensions. It is designed for program
+            source code highlighting and for similar tasks where state
+            information helps input processing.
+          </para>
           <indexterm zone="enscript states">
             <primary sortas="b-states">states</primary>
Index: pst/ps/epdfview.xml
===================================================================
--- pst/ps/epdfview.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/ps/epdfview.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -77,6 +77,8 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/epdfview-&epdfview-version;-fixes-2.patch"/></para>
+        <para>
+          Required patch: <ulink url=
+          "&patch-root;/epdfview-&epdfview-version;-fixes-2.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/ps/fop.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -58,20 +58,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&fop-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&fop-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &fop-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &fop-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &fop-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &fop-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&fop-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&fop-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &fop-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &fop-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &fop-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &fop-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -81,5 +93,6 @@
       <title>Required Additional Downloads:</title>
       <listitem>
-        <para>PDFBox:
+        <para>
+          PDFBox:
           <simplelist>
             <member><ulink url="&pdfbox-download;"/></member>
@@ -90,5 +103,6 @@
       </listitem>
       <listitem>
-        <para>PDFBox Fonts:
+        <para>
+          PDFBox Fonts:
           <simplelist>
             <member><ulink url="&fontbox-download;"/></member>
@@ -103,5 +117,6 @@
       <title>Recommended packages</title>
       <listitem>
-        <para>Objects for Formatting Objects (OFFO) hyphenation patterns:
+        <para>
+          Objects for Formatting Objects (OFFO) hyphenation patterns:
           <simplelist>
             <member><ulink url="&offo-download;"/></member>
@@ -394,7 +409,9 @@
         <term><command>fop</command></term>
         <listitem>
-          <para>is a wrapper script to the <command>java</command> command
+          <para>
+            is a wrapper script to the <command>java</command> command
           which sets up the <application>fop</application>
-          environment and passes the required parameters.</para>
+          environment and passes the required parameters.
+          </para>
           <indexterm zone="fop fop-prog">
             <primary sortas="b-fop">fop</primary>
@@ -406,6 +423,8 @@
         <term><filename class='libraryfile'>fop.jar</filename></term>
         <listitem>
-          <para>contains all the <application>fop</application>
-          <application>Java</application> classes.</para>
+          <para>
+            contains all the <application>fop</application>
+          <application>Java</application> classes.
+          </para>
           <indexterm zone="fop fop.jar">
             <primary sortas="c-fop.jar">fop.jar</primary>
Index: pst/ps/ps.xml
===================================================================
--- pst/ps/ps.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/ps/ps.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -16,7 +16,9 @@
   <title>PostScript</title>
 
-  <para>This chapter includes applications that create, manipulate or view
-  PostScript files and create or view Portable Document Format
-  PDF files.</para>
+  <para>
+    This chapter includes applications that create, manipulate or view
+    PostScript files and create or view Portable Document Format
+    PDF files.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="a2ps.xml"/>
Index: pst/ps/psutils.xml
===================================================================
--- pst/ps/psutils.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/ps/psutils.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -31,6 +31,8 @@
     <title>Introduction to PSUtils</title>
 
-    <para><application>PSUtils</application> is a set of utilities to manipulate
-    PostScript files.</para>
+    <para>
+      <application>PSUtils</application> is a set of utilities to manipulate
+      PostScript files.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&psutils-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&psutils-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &psutils-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &psutils-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &psutils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &psutils-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&psutils-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&psutils-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &psutils-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &psutils-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &psutils-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &psutils-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,13 +80,19 @@
     <title>Installation of PSUtils</title>
 
-    <para>Install <application>PSUtils</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>PSUtils</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>sed 's@/usr/local@/usr@g' Makefile.unix &gt; Makefile &amp;&amp;
 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>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -83,8 +103,10 @@
     <title>Command Explanations</title>
 
-    <para><command>sed 's@/usr/local@/usr@g' Makefile.unix &gt; Makefile</command>:
-    This command creates a <filename>Makefile</filename> that installs the
-    program to the <filename class="directory">/usr</filename> prefix instead
-    of the <filename class="directory">/usr/local</filename> prefix.</para>
+    <para>
+      <command>sed 's@/usr/local@/usr@g' Makefile.unix &gt; Makefile</command>:
+      This command creates a <filename>Makefile</filename> that installs the
+      program to the <filename class="directory">/usr</filename> prefix instead
+      of the <filename class="directory">/usr/local</filename> prefix.
+    </para>
 
   </sect2>
@@ -108,10 +130,12 @@
     </segmentedlist>
 
-    <para>Sometimes <command>psnup</command> and other utilities from this
-    package produce PostScript files that don't conform to Adobe's DSC
-    standard. <application>CUPS</application> may print them incorrectly.
-    On the other hand, <application>CUPS</application> has builtin
-    replacements for most commands from this package. For example, to print
-    a document 2-up, you can issue this command:</para>
+    <para>
+      Sometimes <command>psnup</command> and other utilities from this
+      package produce PostScript files that don't conform to Adobe's DSC
+      standard. <application>CUPS</application> may print them incorrectly.
+      On the other hand, <application>CUPS</application> has builtin
+      replacements for most commands from this package. For example, to print
+      a document 2-up, you can issue this command:
+    </para>
 
 <screen><userinput>lp -o number-up=2 <replaceable>&lt;filename&gt;</replaceable></userinput></screen>
@@ -125,5 +149,7 @@
         <term><command>epsffit</command></term>
         <listitem>
-          <para>fits an EPSF file to a given bounding box.</para>
+          <para>
+            fits an EPSF file to a given bounding box.
+          </para>
           <indexterm zone="psutils epsffit">
             <primary sortas="b-epsffit">epsffit</primary>
@@ -183,5 +209,7 @@
         <term><command>psbook</command></term>
         <listitem>
-          <para>rearranges pages into signatures.</para>
+          <para>
+            rearranges pages into signatures.
+          </para>
           <indexterm zone="psutils psbook">
             <primary sortas="b-psbook">psbook</primary>
@@ -205,5 +233,7 @@
         <term><command>psnup</command></term>
         <listitem>
-          <para>puts multiple pages per physical sheet of paper.</para>
+          <para>
+            puts multiple pages per physical sheet of paper.
+          </para>
           <indexterm zone="psutils psnup">
             <primary sortas="b-psnup">psnup</primary>
@@ -215,5 +245,7 @@
         <term><command>psresize</command></term>
         <listitem>
-          <para>alters the document paper size.</para>
+          <para>
+            alters the document paper size.
+          </para>
           <indexterm zone="psutils psresize">
             <primary sortas="b-psresize">psresize</primary>
@@ -225,5 +257,7 @@
         <term><command>psselect</command></term>
         <listitem>
-          <para>selects pages and page ranges.</para>
+          <para>
+            selects pages and page ranges.
+          </para>
           <indexterm zone="psutils psselect">
             <primary sortas="b-psselect">psselect</primary>
@@ -235,5 +269,7 @@
         <term><command>pstops</command></term>
         <listitem>
-          <para>performs general page rearrangements and selection.</para>
+          <para>
+            performs general page rearrangements and selection.
+          </para>
           <indexterm zone="psutils pstops">
             <primary sortas="b-pstops">pstops</primary>
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/scanning/sane.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -37,14 +37,18 @@
     <title>Introduction to SANE</title>
 
-    <para><application>SANE</application> is short for Scanner Access Now Easy.
-    Scanner access, however, is far from easy, since every vendor has their own
-    protocols. The only known protocol that should bring some unity into this
-    chaos is the TWAIN interface, but this is too imprecise to allow a stable
-    scanning framework. Therefore, <application>SANE</application> comes with
-    its own protocol, and the vendor drivers can't be used.</para>
-
-    <para><application>SANE</application> is split into back ends and front
-    ends. The back ends are drivers for the supported scanners and cameras. The
-    front ends are user interfaces to access the backends.</para>
+    <para>
+      <application>SANE</application> is short for Scanner Access Now Easy.
+      Scanner access, however, is far from easy, since every vendor has their
+      own protocols. The only known protocol that should bring some unity into
+      this chaos is the TWAIN interface, but this is too imprecise to allow a
+      stable scanning framework. Therefore, <application>SANE</application>
+      comes with its own protocol, and the vendor drivers can't be used.
+    </para>
+
+    <para>
+      <application>SANE</application> is split into back ends and front ends.
+      The back ends are drivers for the supported scanners and cameras. The
+      front ends are user interfaces to access the backends.
+    </para>
 
     &lfs91_checked;
@@ -53,20 +57,32 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Download (HTTP): <ulink url="&sane-be-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sane-be-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sane-be-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sane-be-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sane-be-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sane-be-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&sane-be-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sane-be-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sane-be-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sane-be-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sane-be-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sane-be-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -75,20 +91,32 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Download (HTTP): <ulink url="&sane-fe-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sane-fe-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Downlaod MD5 sum: &sane-fe-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sane-fe-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sane-fe-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sane-fe-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&sane-fe-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sane-fe-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Downlaod MD5 sum: &sane-fe-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sane-fe-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sane-fe-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sane-fe-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -129,14 +157,16 @@
     </indexterm>
 
-    <para>To access your scanner, you will probably need the related kernel
-    drivers and/or additional support packages. A SCSI scanner will need SCSI
-    drivers, a parallel port scanner needs parallel port support (you should
-    use enhanced EPP modes) and perhaps <ulink
-    url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>, and a USB
-    scanner will need the <xref linkend="libusb"/> package. For HP devices, you
-    may need <ulink
-    url="http://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>.
-    Ensure you have the necessary drivers properly configured to access
-    the devices.</para>
+    <para>
+      To access your scanner, you will probably need the related kernel
+      drivers and/or additional support packages. A SCSI scanner will need SCSI
+      drivers, a parallel port scanner needs parallel port support (you should
+      use enhanced EPP modes) and perhaps <ulink
+      url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>, and a USB
+      scanner will need the <xref linkend="libusb"/> package. For HP devices,
+      you may need <ulink
+      url="http://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>.
+      Ensure you have the necessary drivers properly configured to access
+      the devices.
+    </para>
 
   </sect2>
@@ -148,7 +178,9 @@
       <title>Installation of SANE Back Ends</title>
 
-      <para>The <application>SANE</application> daemon should run with its own
-      group.  Create this group by issuing the following commands as the
-      <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        The <application>SANE</application> daemon should run with its own
+        group.  Create this group by issuing the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>groupadd -g 70 scanner</userinput></screen>
@@ -167,8 +199,10 @@
       </note>
 
-      <para>For a USB scanner, if you are linking to <xref linkend="libusb"/>,
-      include the configure switch --enable-libusb_1_0. Install
-      <application>SANE</application>-backends by running the following
-      commands:</para>
+      <para>
+        For a USB scanner, if you are linking to <xref linkend="libusb"/>,
+        include the configure switch --enable-libusb_1_0. Install
+        <application>SANE</application>-backends by running the following
+        commands:
+      </para>
 
 <screen><userinput>sg scanner -c "                  \
@@ -180,7 +214,11 @@
 make</userinput></screen>
 
-      <para>To test the results, issue: <command>make check</command>.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        To test the results, issue: <command>make check</command>.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>make install                                         &amp;&amp;
@@ -189,7 +227,9 @@
 chgrp -v scanner  /var/lock/sane</userinput></screen>
 
-      <para>With the scanner on, run <command>scanimage -L</command> and the
-      name and location of the device should appear. Of course, you need the
-      device drivers configured, in order to run this test.</para>
+      <para>
+        With the scanner on, run <command>scanimage -L</command> and the
+        name and location of the device should appear. Of course, you need the
+        device drivers configured, in order to run this test.
+      </para>
 
     </sect3>
@@ -198,14 +238,18 @@
       <title>Installation of SANE Front Ends</title>
 
-      <para>The <application>SANE</application>-frontends package
-      includes the graphical frontends <command>xscanimage</command> and
-      <command>xcam</command>, and a command-line frontend
-      <command>scanadf</command>. You don't need this package if you intend
-      to use one of the more advanced graphical frontends like
-      <xref linkend="xsane"/>. For a list of frontend packages, see
-      <ulink url="http://www.sane-project.org/sane-frontends.html"/>.</para>
-
-      <para>To install <application>SANE</application>-frontends,
-      use the following commands:</para>
+      <para>
+        The <application>SANE</application>-frontends package
+        includes the graphical frontends <command>xscanimage</command> and
+        <command>xcam</command>, and a command-line frontend
+        <command>scanadf</command>. You don't need this package if you intend
+        to use one of the more advanced graphical frontends like
+        <xref linkend="xsane"/>. For a list of frontend packages, see
+        <ulink url="http://www.sane-project.org/sane-frontends.html"/>.
+      </para>
+
+      <para>
+        To install <application>SANE</application>-frontends,
+        use the following commands:
+      </para>
 
 <screen><userinput>tar -xf ../sane-frontends-&sane-fe-version;.tar.gz &amp;&amp;
@@ -216,7 +260,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>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -224,8 +272,10 @@
     /usr/share/sane</userinput></screen>
 
-      <para>If <application>GIMP</application> was linked into the build and
-      you wish <application>GIMP</application> to use
-      <command>xscanimage</command> as a scanning plugin, issue the following
-      command as the <systemitem class="username">root</systemitem> user:</para>
+      <para>
+        If <application>GIMP</application> was linked into the build and
+        you wish <application>GIMP</application> to use
+        <command>xscanimage</command> as a scanning plugin, issue the following
+        command as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>ln -v -s ../../../../bin/xscanimage /usr/lib/gimp/2.0/plug-ins</userinput></screen>
@@ -254,15 +304,21 @@
     </para>
 
-    <para><parameter>--sysconfdir=/etc</parameter>: This switch installs the
-    configuration files in <filename class="directory">/etc/sane.d</filename>
-    instead of <filename class="directory">/usr/etc/sane.d</filename>.</para>
-
-    <para><parameter>--with-group=scanner</parameter>: This parameter causes
-    the directory created for the locking files to be group owned by the
-    <systemitem class="groupname">scanner</systemitem> group instead of the
-    default <systemitem class="groupname">uucp</systemitem> group.</para>
-
-    <para><command>exit</command>: This command is used to exit the shell
-    created by the <command>su</command> command.</para>
+    <para>
+      <parameter>--sysconfdir=/etc</parameter>: This switch installs the
+      configuration files in <filename class="directory">/etc/sane.d</filename>
+      instead of <filename class="directory">/usr/etc/sane.d</filename>.
+    </para>
+
+    <para>
+      <parameter>--with-group=scanner</parameter>: This parameter causes
+      the directory created for the locking files to be group owned by the
+      <systemitem class="groupname">scanner</systemitem> group instead of the
+      default <systemitem class="groupname">uucp</systemitem> group.
+    </para>
+
+    <para>
+      <command>exit</command>: This command is used to exit the shell
+      created by the <command>su</command> command.
+    </para>
   </sect2>
 
@@ -273,5 +329,7 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/sane.d/*.conf</filename></para>
+      <para>
+        <filename>/etc/sane.d/*.conf</filename>
+      </para>
 
       <indexterm zone="sane sane-config">
@@ -287,17 +345,25 @@
         <title>Backend Configuration</title>
 
-        <para>The backend configuration files are located in
-        <filename class='directory'>/etc/sane.d</filename>. Information
-        for configuring the various backends can be found by using the man(5)
-        page for the desired backend. Run
-        <command>man sane-<replaceable>&lt;backend&gt;</replaceable></command>,
-        substituting the desired backend.</para>
-
-        <para>Add any desired users to the <systemitem
-        class="groupname">scanner</systemitem> group.</para>
-
-        <para>If you want to access a network scanner, include two lines in
-        <filename>net.conf</filename>, as <systemitem class="username">root</systemitem> user
-        (make sure to replace &lt;server_ip&gt; by the actual value, below):</para>
+        <para>
+          The backend configuration files are located in
+          <filename class='directory'>/etc/sane.d</filename>. Information
+          for configuring the various backends can be found by using the man(5)
+          page for the desired backend. Run
+          <command>
+            man sane-<replaceable>&lt;backend&gt;</replaceable></command>,
+          substituting the desired backend.
+        </para>
+
+        <para>
+          Add any desired users to the <systemitem
+          class="groupname">scanner</systemitem> group.
+        </para>
+
+        <para>
+          If you want to access a network scanner, include two lines in
+          <filename>net.conf</filename>, as <systemitem
+          class="username">root</systemitem> user (make sure to replace
+          &lt;server_ip&gt; by the actual value, below):
+        </para>
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/sane.d/net.conf &lt;&lt; "EOF"
@@ -306,8 +372,10 @@
 EOF</userinput></screen>
 
-        <para>On the server side, include the client ip in the access list of
-        <filename>/etc/sane.d/saned.conf</filename>, restart the
-        <command>saned</command> daemon, and make sure the firewall, if any, is
-        open to the client.</para>
+        <para>
+          On the server side, include the client ip in the access list of
+          <filename>/etc/sane.d/saned.conf</filename>, restart the
+          <command>saned</command> daemon, and make sure the firewall, if any,
+          is open to the client.
+        </para>
 
       </sect4>
@@ -344,12 +412,11 @@
         <title>General Information</title>
 
-        <para>For general information about configuring and using
-        <application>SANE</application>, see <command>man sane</command>.
-        Linux-2.6.x brings some special issues into the picture. See
-        <ulink url="http://www.sane-project.org/README.linux"/> for
-        information about using <application>SANE</application> with the
-        Linux-2.6.x kernel. For information about USB scanning devices,
-        run <command>man sane-usb</command>. For information about SCSI
-        devices, run <command>man sane-scsi</command>.</para>
+        <para>
+          For general information about configuring and using
+          <application>SANE</application>, see <command>man sane</command>.
+          For information about USB scanning devices,
+          run <command>man sane-usb</command>. For information about SCSI
+          devices, run <command>man sane-scsi</command>.
+        </para>
 
       </sect4>
@@ -358,16 +425,16 @@
         <title>Configuration and setup of the 'saned' daemon</title>
 
-        <para>The <command>saned</command> daemon is not meant to be used for
-        untrusted clients. You should provide <xref linkend="fw-firewall"/>
-        protection to ensure only trusted
-        clients access the daemon. Due to the complex security requirements to
-        ensure only trusted clients access the daemon, BLFS does not provide
-        instructions to configure the <command>saned</command> daemon. If you
-        desire to make the daemon available, ensure you provide adequate
-        security, configure your <filename>[x]inetd.conf</filename> file and
-        send a <userinput>SIGHUP</userinput> to the [x]inetd daemon. Some good
-        information for setting up and securing the <command>saned</command>
-        daemon can be found at
-        <ulink url="http://penguin-breeder.org/sane/saned/"/>.</para>
+        <para>
+          The <command>saned</command> daemon is not meant to be used for
+          untrusted clients. You should provide <xref linkend="fw-firewall"/>
+          protection to ensure only trusted clients access the daemon. Due to
+          the complex security requirements to ensure only trusted clients
+          access the daemon, BLFS does not provide
+          instructions to configure the <command>saned</command> daemon.
+          Some good (but outdated)
+          information for setting up and securing the <command>saned</command>
+          daemon can be found at
+          <ulink url="http://penguin-breeder.org/sane/saned/"/>.
+        </para>
 
       </sect4>
@@ -417,6 +484,8 @@
         <term><command>gamma4scanimage</command></term>
         <listitem>
-          <para>creates a gamma table in the format expected by
-          <command>scanimage</command>.</para>
+          <para>
+            creates a gamma table in the format expected by
+            <command>scanimage</command>.
+          </para>
           <indexterm zone="sane gamma4scanimage">
             <primary sortas="b-gamma4scanimage">gamma4scanimage</primary>
@@ -428,7 +497,9 @@
         <term><command>sane-config</command></term>
         <listitem>
-          <para>is a tool used to determine the compiler and linker
-          flags that should be used to compile and link
-          <application>SANE</application>.</para>
+          <para>
+            is a tool used to determine the compiler and linker
+            flags that should be used to compile and link
+            <application>SANE</application>.
+          </para>
           <indexterm zone="sane sane-config-prog">
             <primary sortas="b-sane-config">sane-config</primary>
@@ -440,7 +511,9 @@
         <term><command>saned</command></term>
         <listitem>
-          <para>is the <application>SANE</application> daemon that
-          allows remote clients to access image acquisition devices
-          available on the local host.</para>
+          <para>
+            is the <application>SANE</application> daemon that
+            allows remote clients to access image acquisition devices
+            available on the local host.
+          </para>
           <indexterm zone="sane saned">
             <primary sortas="b-saned">saned</primary>
@@ -452,8 +525,10 @@
         <term><command>sane-find-scanner</command></term>
         <listitem>
-          <para>is a command-line tool to find SCSI and
-          USB scanners and determine their device files. Its primary
-          purpose is to make sure that scanners can be detected by
-          <application>SANE</application> backends.</para>
+          <para>
+            is a command-line tool to find SCSI and
+            USB scanners and determine their device files. Its primary
+            purpose is to make sure that scanners can be detected by
+            <application>SANE</application> backends.
+          </para>
           <indexterm zone="sane sane-find-scanner">
             <primary sortas="b-sane-find-scanner">sane-find-scanner</primary>
@@ -465,7 +540,8 @@
         <term><command>scanadf</command></term>
         <listitem>
-          <para>is a command-line interface to control image acquisition
-          devices which are equipped with an automatic document feeder
-          (ADF).</para>
+          <para>
+            is a command-line interface to control image acquisition
+            devices which are equipped with an automatic document feeder (ADF).
+          </para>
           <indexterm zone="sane scanadf">
             <primary sortas="b-scanadf">scanadf</primary>
@@ -477,7 +553,9 @@
         <term><command>scanimage</command></term>
         <listitem>
-          <para>is a command line interface for scanning from image acquisition
-          devices such as flatbed scanners or cameras. It is also used to list
-          the available backend devices.</para>
+          <para>
+            is a command line interface for scanning from image acquisition
+            devices such as flatbed scanners or cameras. It is also used to
+            list the available backend devices.
+          </para>
           <indexterm zone="sane scanimage">
             <primary sortas="b-scanimage">scanimage</primary>
@@ -489,6 +567,8 @@
         <term><command>xcam</command></term>
         <listitem>
-          <para>is a graphical camera front end for
-          <application>SANE</application>.</para>
+          <para>
+            is a graphical camera front end for
+            <application>SANE</application>.
+          </para>
           <indexterm zone="sane xcam">
             <primary sortas="b-xcam">xcam</primary>
@@ -500,5 +580,7 @@
         <term><command>xscanimage</command></term>
         <listitem>
-          <para>is a graphical user interface for scanning.</para>
+          <para>
+            is a graphical user interface for scanning.
+          </para>
           <indexterm zone="sane xscanimage">
             <primary sortas="b-xscanimage">xscanimage</primary>
@@ -510,6 +592,8 @@
         <term><filename class='libraryfile'>libsane.so</filename></term>
         <listitem>
-          <para>is the application programming interface that is used to
-          communicate between frontends and backends.</para>
+          <para>
+            is the application programming interface that is used to
+            communicate between frontends and backends.
+          </para>
           <indexterm zone="sane libsane">
             <primary sortas="c-libsane">libsane.so</primary>
@@ -521,8 +605,10 @@
         <term><filename class='libraryfile'>libsane-*.so</filename></term>
         <listitem>
-          <para>modules are backend scanning library plugins used to interface
-          with scanning devices. See
-          <ulink url="http://www.sane-project.org/sane-supported-devices.html"/>
-          for a list of supported backends.</para>
+          <para>
+            modules are backend scanning library plugins used to interface
+            with scanning devices. See <ulink
+            url="http://www.sane-project.org/sane-supported-devices.html"/>
+            for a list of supported backends.
+          </para>
           <indexterm zone="sane libsane-module">
             <primary sortas="c-libsane-module">libsane-*.so</primary>
Index: pst/scanning/scanning.xml
===================================================================
--- pst/scanning/scanning.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/scanning/scanning.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -16,7 +16,9 @@
   <title>Scanning</title>
 
-  <para>This chapter contains scanning applications which allow you to
-  convert printed documents into formatted documents readable by other
-  applications.</para>
+  <para>
+    This chapter contains scanning applications which allow you to
+    convert printed documents into formatted documents readable by other
+    applications.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sane.xml"/>
Index: pst/scanning/xsane.xml
===================================================================
--- pst/scanning/xsane.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/scanning/xsane.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -30,7 +30,9 @@
     <title>Introduction to XSane</title>
 
-    <para><application>XSane</application> is another front end for
-    <xref linkend="sane"/>. It has additional features to improve the image
-    quality and ease of use compared to <command>xscanimage</command>.</para>
+    <para>
+      <application>XSane</application> is another front end for
+      <xref linkend="sane"/>. It has additional features to improve the image
+      quality and ease of use compared to <command>xscanimage</command>.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xsane-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xsane-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xsane-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xsane-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xsane-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xsane-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&xsane-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xsane-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xsane-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xsane-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xsane-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xsane-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -85,6 +99,8 @@
     <title>Installation of XSane</title>
 
-    <para>Install <application>XSane</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>XSane</application> by running the following
+      commands:
+    </para>
 
 <!--sed -i -e 's/netscape/xdg-open/'                   src/xsane.h      &amp;&amp;-->
@@ -93,30 +109,47 @@
 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>
 
 <screen role="root"><userinput>make xsanedocdir=/usr/share/doc/xsane-&xsane-version; install &amp;&amp;
 ln -v -s ../../doc/xsane-&xsane-version; /usr/share/sane/xsane/doc</userinput></screen>
 <!--
-    <para>If you have not installed <xref linkend="xdg-utils"/> and have not
-    issued the first sed:</para>-->
-    <para>A browser of your choice can be used to get inline help, using the
-    following command,  as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      If you have not installed <xref linkend="xdg-utils"/> and have not
+      issued the first sed:
+    </para>-->
+    <para>
+      A browser of your choice can be used to get inline help, using the
+      following command,  as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
 <screen role="root"><userinput>ln -v -s &lt;browser&gt; /usr/bin/netscape</userinput></screen>
 
-    <note><para>Be sure to replace &lt;browser&gt; with the browser of your
-    choice on your system.</para></note>
-
-    <para>Alternatively, if the environment variable BROWSER is set to the
-    browser you want to use, eg, BROWSER="/usr/bin/firefox", the first time you
-    run <command>xsane</command>, it will be recorded in ~/.sane/xsane/xsane.rc.
-    If you wish to change it, edit this file, or remove it, and use the
-    instructions above, so that a new one is created.</para>
-
-    <para>If <application>GIMP</application> is installed, issue the following
-    command as the <systemitem class="username">root</systemitem> user:</para>
+    <note>
+      <para>
+        Be sure to replace &lt;browser&gt; with the browser of your
+        choice on your system.
+      </para>
+    </note>
+
+    <para>
+      Alternatively, if the environment variable BROWSER is set to the browser
+      you want to use, eg, BROWSER="/usr/bin/firefox", the first time you run
+      <command>xsane</command>, it will be recorded in <filename>
+      ~/.sane/xsane/xsane.rc</filename>. If you wish to change it, edit this
+      file, or remove it, and use the instructions above, so that a new one is
+      created.
+    </para>
+
+    <para>
+      If <application>GIMP</application> is installed, issue the following
+      command as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>ln -v -s /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</userinput></screen>
@@ -127,24 +160,30 @@
     <title>Command Explanations</title>
 <!--
-    <para><command>sed -i -e 's/netscape/xdg-open/' src/xsane.h </command>:
-    This is to use <command>xdg-open</command> for the help documentation,
-    instead of the hardcoded browser.</para>-->
-
-    <para><command>ln -v -s ../../doc/xsane-&xsane-version;
-    /usr/share/sane/xsane/doc</command>: This symlink is created to ensure that
-    any program that looks for the <application>XSane</application>
-    documentation in the default location will find it, as the documentation
-    is installed in an alternate location specified in the
-    <command>make install</command> command.</para>
-
-    <para><command>ln -v -s /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</command>:
-    This creates a link in the system-wide <application>GIMP</application>
-    <filename class='directory'>plug-ins</filename> directory so that users can
-    access <application>XSane</application> directly from
-    <application>GIMP</application>. <application>GIMP</application> must be
-    available before building <application>XSane</application> for this to work.
-    Alternatively, create the link in <filename
-    class='directory'>~/.gimp-2.0/plug-ins/</filename> to provide individual
-    user access. <command>man xsane</command> for additional information.</para>
+    <para>
+      <command>sed -i -e 's/netscape/xdg-open/' src/xsane.h </command>:
+      This is to use <command>xdg-open</command> for the help documentation,
+      instead of the hardcoded browser.
+    </para>-->
+
+    <para>
+      <command>ln -v -s ../../doc/xsane-&xsane-version;
+      /usr/share/sane/xsane/doc</command>: This symlink is created to ensure
+      that any program that looks for the <application>XSane</application>
+      documentation in the default location will find it, as the documentation
+      is installed in an alternate location specified in the <command>make
+      install</command> command.
+    </para>
+
+    <para>
+      <command>ln -v -s /usr/bin/xsane /usr/lib/gimp/2.0/plug-ins/</command>:
+      This creates a link in the system-wide <application>GIMP</application>
+      <filename class='directory'>plug-ins</filename> directory so that users
+      can access <application>XSane</application> directly from
+      <application>GIMP</application>. <application>GIMP</application> must
+      be available before building <application>XSane</application> for this
+      to work. Alternatively, create the link in <filename
+      class='directory'>~/.gimp-2.0/plug-ins/</filename> to provide individual
+      user access. <command>man xsane</command> for additional information.
+    </para>
 
   </sect2>
@@ -174,6 +213,8 @@
         <term><command>xsane</command></term>
         <listitem>
-          <para>is a graphical user-interface to control an image acquisition
-          device such as a flatbed scanner.</para>
+          <para>
+            is a graphical user-interface to control an image acquisition
+            device such as a flatbed scanner.
+          </para>
           <indexterm zone="xsane xsane-prog">
             <primary sortas="b-xsane">xsane</primary>
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/sgml/docbook-utils.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -30,11 +30,13 @@
     <title>Introduction to DocBook-utils</title>
 
-    <para>The <application>DocBook-utils</application> package is a collection
-    of utility scripts used to convert and analyze SGML documents in general,
-    and DocBook files in particular. The scripts are used to convert from
-    DocBook or other SGML formats into <quote>classical</quote> file formats
-    like HTML, man, info, RTF and many more. There's also a utility to compare
-    two SGML files and only display the differences in markup. This is useful
-    for comparing documents prepared for different languages.</para>
+    <para>
+      The <application>DocBook-utils</application> package is a collection
+      of utility scripts used to convert and analyze SGML documents in general,
+      and DocBook files in particular. The scripts are used to convert from
+      DocBook or other SGML formats into <quote>classical</quote> file formats
+      like HTML, man, info, RTF and many more. There's also a utility to compare
+      two SGML files and only display the differences in markup. This is useful
+      for comparing documents prepared for different languages.
+    </para>
 
     &lfs91_checked;
@@ -43,20 +45,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&docbook-utils-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&docbook-utils-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &docbook-utils-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &docbook-utils-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &docbook-utils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &docbook-utils-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&docbook-utils-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&docbook-utils-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &docbook-utils-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &docbook-utils-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &docbook-utils-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &docbook-utils-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -65,6 +79,8 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/docbook-utils-&docbook-utils-version;-grep_fix-1.patch"/></para>
+        <para>
+          Required patch: <ulink url=
+           "&patch-root;/docbook-utils-&docbook-utils-version;-grep_fix-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -97,6 +113,8 @@
     <title>Installation of DocBook-utils</title>
 
-    <para>Install <application>DocBook-utils</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>DocBook-utils</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch &amp;&amp;
@@ -106,14 +124,20 @@
 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>
 
 <screen role="root"><userinput>make docdir=/usr/share/doc install</userinput></screen>
 
-    <para>Many packages use an alternate name for the
-    <application>DocBook-utils</application> scripts. If you wish to create
-    these alternate names, use the following command as
-    the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Many packages use an alternate name for the
+      <application>DocBook-utils</application> scripts. If you wish to create
+      these alternate names, use the following command as
+      the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>for doctype in html ps dvi man pdf rtf tex texi txt
@@ -123,8 +147,10 @@
 
     <note>
-      <para>The <command>jw</command> script uses the <command>which</command>
-      command to locate required utilities. You must install
-      <xref linkend="which"/> before attempting to use any of the
-      <application>DocBook-utils</application> programs.</para>
+      <para>
+        The <command>jw</command> script uses the <command>which</command>
+        command to locate required utilities. You must install
+        <xref linkend="which"/> before attempting to use any of the
+        <application>DocBook-utils</application> programs.
+      </para>
     </note>
 
@@ -134,15 +160,21 @@
     <title>Command Explanations</title>
 
-    <para><command>patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch</command>:
-    This patch corrects the syntax in the jw (Jade Wrapper) script which is at
-    the heart of much db2* processing, so that the current version of
-    <application>Grep</application> will not reject it.</para>
-
-    <para><command>sed -i 's:/html::' doc/HTML/Makefile.in</command>:
-    This command changes the installation directory of the HTML documents.</para>
-
-    <para><option>docdir=/usr/share/doc</option>:
-    This option is placed on the <command>make install</command> line because is is not
-    recognized by <command>configure</command>.</para>
+    <para>
+      <command>patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch</command>:
+      This patch corrects the syntax in the jw (Jade Wrapper) script which is
+      at the heart of much db2* processing, so that the current version of
+      <application>grep</application> will not reject it.
+    </para>
+
+    <para>
+      <command>sed -i 's:/html::' doc/HTML/Makefile.in</command>:
+      This command changes the installation directory of the HTML documents.
+    </para>
+
+    <para>
+      <option>docdir=/usr/share/doc</option>: This option is placed on the
+      <command>make install</command> line because is is not
+      recognized by <command>configure</command>.
+    </para>
 
   </sect2>
@@ -177,7 +209,9 @@
         <term><command>docbook2*</command></term>
         <listitem>
-          <para>are simple one-line wrapper scripts to <command>jw</command>.
-          They are provided as easy-to-remember names used to convert DocBook or
-          other SGML files to the respective format.</para>
+          <para>
+            are simple one-line wrapper scripts to <command>jw</command>.
+            They are provided as easy-to-remember names used to convert
+            DocBook or other SGML files to the respective format.
+          </para>
           <indexterm zone="docbook-utils docbook2">
             <primary sortas="b-docbook2-star">docbook2*</primary>
@@ -189,7 +223,9 @@
         <term><command>db2*</command></term>
         <listitem>
-          <para>are symlinks pointing at the respectively named
-          <command>docbook2*</command> commands, created to satisfy some
-          program's use of these names.</para>
+          <para>
+            are symlinks pointing at the respectively named
+            <command>docbook2*</command> commands, created to satisfy some
+            program's use of these names.
+          </para>
           <indexterm zone="docbook-utils db2">
             <primary sortas="b-db2-star">db2*</primary>
@@ -201,7 +237,10 @@
         <term><command>jw</command></term>
         <listitem>
-          <para>is a script used to convert DocBook or other SGML files to various
-          output formats. It hides most of <application>OpenJade</application>'s
-          complexity and adds comfortable features.</para>
+          <para>
+            is a script used to convert DocBook or other SGML files to various
+            output formats. It hides most of
+            <application>OpenJade</application>'s complexity and adds
+            comfortable features.
+          </para>
           <indexterm zone="docbook-utils jw">
             <primary sortas="b-jw">jw</primary>
@@ -213,7 +252,9 @@
         <term><command>sgmldiff</command></term>
         <listitem>
-          <para>is used to compare two SGML files and only return the differences
-          in the markup. This is especially useful to compare files that should be
-          identical except for language differences in the content.</para>
+          <para>
+            is used to compare two SGML files and only return the differences
+            in the markup. This is especially useful to compare files that
+            should be identical except for language differences in the content.
+          </para>
           <indexterm zone="docbook-utils sgmldiff">
             <primary sortas="b-sgmldiff">sgmldiff</primary>
Index: pst/sgml/sgml-common.xml
===================================================================
--- pst/sgml/sgml-common.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/sgml/sgml-common.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -30,7 +30,9 @@
     <title>Introduction to SGML Common</title>
 
-    <para>The <application>SGML Common</application> package contains
-    <command>install-catalog</command>. This is useful for creating and
-    maintaining centralized SGML catalogs.</para>
+    <para>
+      The <application>SGML Common</application> package contains
+      <command>install-catalog</command>. This is useful for creating and
+      maintaining centralized SGML catalogs.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&sgml-common-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sgml-common-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sgml-common-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sgml-common-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sgml-common-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sgml-common-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&sgml-common-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sgml-common-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sgml-common-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sgml-common-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sgml-common-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sgml-common-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -61,6 +75,8 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/sgml-common-&sgml-common-version;-manpage-1.patch"/></para>
+        <para>
+          Required patch: <ulink url=
+            "&patch-root;/sgml-common-&sgml-common-version;-manpage-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -74,5 +90,6 @@
     <title>Installation of SGML Common</title>
 
-      <para>Instead of the normal convention of including the autotools files
+    <para>
+      Instead of the normal convention of including the autotools files
       in the package, the maintainers included symlinks to the files in
       <filename class="directory">/usr/share/automake</filename>. For previous
@@ -84,18 +101,25 @@
       <filename>Makefile.am</filename> file uses a syntax not supported by
       current versions of <application>Automake</application>, a patch is
-      required to fix the syntax.</para>
+      required to fix the syntax.
+    </para>
 
 <screen><userinput>patch -Np1 -i ../sgml-common-0.6.3-manpage-1.patch &amp;&amp;
 autoreconf -f -i</userinput></screen>
 
-    <para>Install <application>SGML Common</application> by
-    running the following commands:</para>
+    <para>
+      Install <application>SGML Common</application> by
+      running the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 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>
 
 <screen role="root"><userinput>make docdir=/usr/share/doc install &amp;&amp;
@@ -110,6 +134,8 @@
       <title>Update Hint</title>
 
-      <para>Remove the above catalog items prior to upgrading (as the
-      <systemitem class='username'>root</systemitem> user) with:</para>
+      <para>
+        Remove the above catalog items prior to upgrading (as the
+        <systemitem class='username'>root</systemitem> user) with:
+      </para>
 
 <screen role="nodump"><userinput>install-catalog --remove /etc/sgml/sgml-ent.cat \
@@ -129,5 +155,7 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/sgml/sgml.conf</filename></para>
+      <para>
+        <filename>/etc/sgml/sgml.conf</filename>
+      </para>
 
       <indexterm zone="sgml-common sgml-common-config">
@@ -140,5 +168,7 @@
       <title>Configuration Information</title>
 
-      <para>No change in this file is necessary.</para>
+      <para>
+        No change in this file is necessary.
+      </para>
 
     </sect3>
@@ -172,8 +202,10 @@
         <term><command>install-catalog</command></term>
         <listitem>
-          <para>creates a centralized catalog that maintains references to
-          catalogs scattered throughout the
-          <filename class="directory">/usr/share/sgml</filename> directory
-          tree.</para>
+          <para>
+            creates a centralized catalog that maintains references to
+            catalogs scattered throughout the
+            <filename class="directory">/usr/share/sgml</filename> directory
+          tree.
+          </para>
           <indexterm zone="sgml-common install-catalog">
             <primary sortas="b-install-catalog">install-catalog</primary>
@@ -185,6 +217,7 @@
         <term><command>sgmlwhich</command></term>
         <listitem>
-          <para>will print to standard output the name of the main
-          configuration file.</para>
+          <para>
+            prints to standard output the name of the main configuration file.
+          </para>
           <indexterm zone="sgml-common sgmlwhich">
             <primary sortas="b-sgmlwhich">sgmlwhich</primary>
@@ -196,6 +229,7 @@
         <term><filename>SGML entities files</filename></term>
         <listitem>
-          <para>contain the basic character entities defined with
-          SDATA entries.</para>
+          <para>
+            contains the basic character entities defined with SDATA entries.
+          </para>
           <indexterm zone="sgml-common SGML-entities">
             <primary sortas="g-SGML-ENT-files">SGML entity files</primary>
@@ -207,6 +241,8 @@
         <term><filename>XML entities files</filename></term>
         <listitem>
-        <para> contain the basic character entities defined by a hexadecimal
-          representation of the Unicode character number.</para>
+          <para>
+            contains the basic character entities defined by a hexadecimal
+            representation of the Unicode character number.
+          </para>
           <indexterm zone="sgml-common XML-entities">
             <primary sortas="g-XML-ENT-files">XML entity files</primary>
Index: pst/sgml/sgml.xml
===================================================================
--- pst/sgml/sgml.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/sgml/sgml.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -16,7 +16,9 @@
   <title>Standard Generalized Markup Language (SGML)</title>
 
-  <para>This chapter contains DocBook SGML document type definitions (DTDs),
-  DocBook DSSSL Stylesheets and DocBook tools to validate, transform, format
-  and publish DocBook documents.</para>
+  <para>
+    This chapter contains DocBook SGML document type definitions (DTDs),
+    DocBook DSSSL Stylesheets and DocBook tools to validate, transform, format
+    and publish DocBook documents.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml-common.xml"/>
Index: pst/typesetting/asymptote.xml
===================================================================
--- pst/typesetting/asymptote.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/typesetting/asymptote.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -159,16 +159,23 @@
      href="../../xincludes/tex-prefix.xml"/>
 
-    <para><parameter>--libdir=/opt/texlive/&texlive-year;/texmf-dist;</parameter>:
-    This parameter ensures that the <filename class="directory">asymptote</filename>
-    directory will similarly overwrite any files installed by install-tl-unx.</para>
-
-    <para><parameter>--enable-gc=system</parameter>: this ensures that the system
-    version of <filename class="libraryfile">libgc.so</filename> will be used
-    instead of the version shipped with this package.</para>
-
-    <para><parameter>--with-latex= ... --with-context=</parameter>: These switches
-    ensure that style files and a tex file will be installed into the
-    <application>texlive</application> directories instead of creating a
-    <filename class="directory">texmf-local</filename> directory for them.</para>
+    <para>
+      <parameter>--libdir=/opt/texlive/&texlive-year;/texmf-dist;</parameter>:
+      This parameter ensures that the <filename
+      class="directory">asymptote</filename> directory will similarly
+      overwrite any files installed by install-tl-unx.
+    </para>
+
+    <para>
+      <parameter>--enable-gc=system</parameter>: this ensures that the system
+      version of <filename class="libraryfile">libgc.so</filename> will be used
+      instead of the version shipped with this package.
+    </para>
+
+    <para>
+      <parameter>--with-latex= ... --with-context=</parameter>: These switches
+      ensure that style files and a tex file will be installed into the
+      <application>texlive</application> directories instead of creating a
+      <filename class="directory">texmf-local</filename> directory for them.
+    </para>
 
     <!-- commenting for now: 2.44 installs asymptote.info in both places
Index: pst/typesetting/biber.xml
===================================================================
--- pst/typesetting/biber.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/typesetting/biber.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -47,6 +47,8 @@
     <title>Introduction to biber</title>
 
-    <para>Biber is a BibTeX replacement for users of biblatex, written in
-    <application>Perl</application>, with full Unicode support.</para>
+    <para>
+      Biber is a BibTeX replacement for users of biblatex, written in
+      <application>Perl</application>, with full Unicode support.
+    </para>
 
     &lfs91_checked;
@@ -72,20 +74,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&biber-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&biber-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &biber-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &biber-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &biber-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &biber-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&biber-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&biber-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &biber-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &biber-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &biber-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &biber-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -106,17 +120,17 @@
 -->
       <para>
-       If you have updated to a new release of texlive-source, biber and its
-       perl dependencies are still in present in <filename
-       class="directory">/usr</filename> and do not need to be rebuilt. However,
-       biblatex installs in <filename
-       class="directory">/opt/texlive/&texlive-year;</filename> and does need to
-       be reinstalled.
+        If you have updated to a new release of texlive-source, biber and its
+        perl dependencies are still in present in <filename
+        class="directory">/usr</filename> and do not need to be rebuilt.
+        However, biblatex installs in <filename
+        class="directory">/opt/texlive/&texlive-year;</filename> and does
+        need to be reinstalled.
       </para>
 
       <para>
-      This version of biber requires <application>perl-5.30</application> or later.
-      If you are still using the 8.4 version of BLFS you may wish to build the
-      2.13 version: see the 8.4 book noting that biblatex-3.13 has been replaced by
-      biblatex-3.13a upstream.
+        This version of biber requires <application>perl-5.30</application>
+        or later.  If you are still using the 8.4 version of BLFS you may
+        wish to build the 2.13 version: see the 8.4 book noting that
+        biblatex-3.13 has been replaced by biblatex-3.13a upstream.
       </para>
     </note>
@@ -126,14 +140,20 @@
     <itemizedlist spacing="compact">
       <listitem>
-      <para>The corresponding version of <application>biblatex</application> is
-      a separate project - the tds tarball is pre-packaged for untarring into
-      the <filename class="directory">texmf-dist</filename> directory.
-      Download (HTTP): <ulink url="&biblatex-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &biblatex-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &biblatex-size;</para>
+        <para>
+          The corresponding version of <application>biblatex</application> is
+          a separate project - the tds tarball is pre-packaged for untarring
+          into the <filename class="directory">texmf-dist</filename>
+          directory. Download (HTTP): <ulink url="&biblatex-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &biblatex-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &biblatex-size;
+        </para>
       </listitem>
     </itemizedlist>
@@ -195,5 +215,5 @@
       <xref linkend="texlive"/>
       (or <xref linkend="tl-installer"/>, but for that you can use
-       <command>tlmgr update </command>)
+       <command>tlmgr update</command>)
     </para>
 
@@ -208,7 +228,7 @@
         It is possible to install all missing dependencies automatically. You
         must first install <xref linkend="perl-module-build"/> using <xref
-        linkend="perl-auto-install"/>. then run <command>perl ./Build.PL</command>
-        and when it prompts you, become the root user and run
-        <command>./Build installdeps</command>
+        linkend="perl-auto-install"/>. Then run <command>perl
+        ./Build.PL</command> and when it prompts you, become the root user
+        and run <command>./Build installdeps</command>
       </para>
     </note>
@@ -222,13 +242,19 @@
     <title>Installation of Biber</title>
 
-    <para>Install <application>Biber</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Biber</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>perl ./Build.PL &amp;&amp;
 ./Build</userinput></screen>
 
-    <para>To test the results, enter: <command>./Build test</command></para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, enter: <command>./Build test</command>
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>tar -xf ../biblatex-&biblatex-version;.tds.tgz -C /opt/texlive/&texlive-year;/texmf-dist &amp;&amp;
@@ -278,5 +304,7 @@
         <term><command>biber</command></term>
         <listitem>
-          <para>is used for producing bibliographies in LaTeX documents.</para>
+          <para>
+            is used for producing bibliographies in LaTeX documents.
+          </para>
           <indexterm zone="biber biber-prog">
             <primary sortas="b-biber">biber</primary>
Index: pst/typesetting/tex-path.xml
===================================================================
--- pst/typesetting/tex-path.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/typesetting/tex-path.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -16,5 +16,6 @@
   <title>Setting the PATH for TeX Live</title>
 
-    <para>Before starting to build TeX Live, set up your PATH so
+  <para>
+    Before starting to build TeX Live, set up your PATH so
     that the system can properly find the files.  If you set up your login
     scripts as recommended in <xref linkend='postlfs-config-profile'/>, update
@@ -23,5 +24,5 @@
     installed in an &lt;ARCH&gt;-linux subdirectory and on 32-bit x86 this is
     always i386-linux. For x86_64 and i?86 we can generate this as $TEXARCH:
-    </para>
+  </para>
 
 <!-- EOF should NOT be in double quotes, we want it to evaluate $TEXARCH -->
@@ -43,16 +44,24 @@
 unset TEXARCH</userinput></screen>
 
-    <!-- commented, they have been removed
-    <note><para>The standard MANPATH and INFOPATH path are specified above to
-    ensure they are included.  If they are already set in the boot script
-    procedure, the pathappend function will ensure duplicates are
-    removed, so including them here will do no harm.</para></note> -->
 
-    <para>The new paths can be immediately activated by running <command>source
-    /etc/profile</command>.</para>
+  <note>
+    <para>
+      The standard MANPATH and INFOPATH path are specified above to
+      ensure they are included.  If they are already set in the boot script
+      procedure, the pathappend function will ensure duplicates are
+      removed, so including them here will do no harm.
+    </para>
+  </note>
 
-    <para>You should now proceed either to <xref linkend="tl-installer"/> for
+  <para>
+    The new paths can be immediately activated by running <command>source
+    /etc/profile</command>.
+  </para>
+
+  <para>
+    You should now proceed either to <xref linkend="tl-installer"/> for
     a binary installation of texlive, or to <xref linkend="texlive"/> to begin
-    installing from source.</para>
+    installing from source.
+  </para>
 
 </sect1>
Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/typesetting/texlive.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -38,16 +38,21 @@
     <title>Introduction to TeX Live from source</title>
 
-    <para>Most of TeX Live can be built from source without a pre-existing
-    installation, but <application>xindy</application> (for indexing) needs
-    working versions of <command>latex</command> and <command>pdflatex</command>
-    when configure is run, and the testsuite and install for
-    <command>asy</command> (for vector graphics) will fail if TeX has not
-    already been installed. Additionally, <application>biber</application> is
-    not provided within the <application>texlive</application> source.</para>
-
-    <para>All of those packages are dealt with on their own pages and can be
-    built after installing this package. If you have not already done so, you
-    should start at <xref linkend="tex-path"/> so that the final commands to
-    initialise the new installation will be found.</para>
+    <para>
+      Most of TeX Live can be built from source without a pre-existing
+      installation, but <application>xindy</application> (for indexing) needs
+      working versions of <command>latex</command> and
+      <command>pdflatex</command> when configure is run, and the testsuite
+      and install for <command>asy</command> (for vector graphics) will fail
+      if TeX has not already been installed. Additionally,
+      <application>biber</application> is not provided within the
+      <application>texlive</application> source.
+    </para>
+
+    <para>
+      All of those packages are dealt with on their own pages and can be
+      built after installing this package. If you have not already done so, you
+      should start at <xref linkend="tex-path"/> so that the final commands to
+      initialise the new installation will be found.
+    </para>
 
     &lfs91_checked;
@@ -56,20 +61,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&texlive-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texlive-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texlive-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texlive-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &texlive-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &texlive-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&texlive-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&texlive-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &texlive-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &texlive-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &texlive-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &texlive-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -77,9 +94,12 @@
     <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
 
-      <para>Much of the texlive environment (including scripts, documentation,
-      fonts and various other files) is not part of the source tarball. You must
-      download it separately. This will give you all of the additional files
-      which are provided by a full install of the binary version, there is no
-      realistic way to restrict which parts get installed.</para>
+      <para>
+        Much of the texlive environment (including scripts, documentation,
+        fonts, and various other files) is not part of the source tarball.
+        You must download it separately. This will give you all of the
+        additional files which are provided by a full install of the binary
+        version, there is no realistic way to restrict which parts get
+        installed.
+      </para>
 
       <para>
@@ -91,18 +111,28 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&texlive-texmf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&texlive-texmf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &texlive-texmf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &texlive-texmf-size;</para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/></para>
+        <para>
+          Download (HTTP): <ulink url="&texlive-texmf-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&texlive-texmf-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &texlive-texmf-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &texlive-texmf-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch: <ulink url=
+          "&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -114,5 +144,5 @@
       <xref linkend="gs"/> <emphasis>including
       <filename>libgs.so</filename></emphasis>, <!--(for dvisvgm, which is used by e.g.
-      <xref role="nodep" linkend="asymptote"/>), : still referenced for dynamic loading,
+      <xref role="nodep" linkend="asymptote"/>); still referenced for dynamic loading,
       even without dvisvgm - e.fg. by dvipsk -->
       <xref linkend="x-window-system"/>
@@ -152,7 +182,9 @@
     </para>
 
-    <para>The shared libraries will be installed into a texlive directory.
-    As the <systemitem class="username">root</systemitem> user, add it to
-    your <filename>/etc/ld.so.conf</filename>:</para>
+    <para>
+      The shared libraries will be installed into a texlive directory.
+      As the <systemitem class="username">root</systemitem> user, add it to
+      your <filename>/etc/ld.so.conf</filename>:
+    </para>
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
@@ -171,17 +203,8 @@
       </para>
 
-<!--
-      <para>
-        If you came here to update an old system (because of the recent
-        vulnerability) where the poppler version is before 0.62.0, such as
-        BLFS-8.1, do NOT use the commands in the <literal>MYPOPPLER</literal>
-        block of instructions, nor the <literal>\-\-with-system-poppler</literal>
-        or <literal>\-\-with-system-xpdf</literal> options when configuring.
-      </para>-->
-
       <para>
         In the 2019 release, <application>dvisvgm</application> cannot be built
-        if shared system libraries are used. This means that <xref linkend="asymptote"/>
-        will not be able to create svg files.
+        if shared system libraries are used. This means that
+        <xref linkend="asymptote"/> will not be able to create svg files.
       </para>
     </note>
@@ -193,15 +216,5 @@
 
 patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;
-<!--
-let MYPOPPLER=$(pkg-config \-\-modversion poppler | cut -d '.' -f2)
-mv -v texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc
-if [ $MYPOPPLER -lt 68 ]; then
-  mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc
-elif [ $MYPOPPLER -lt 69 ]; then
-  mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.68.0,}.cc
-else
-  mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.69.0,}.cc
-fi &amp;&amp;
-unset MYPOPPLER &amp;&amp;-->
+
 mkdir texlive-build &amp;&amp;
 cd texlive-build    &amp;&amp;
@@ -240,10 +253,13 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>
-    A few tests may SKIP because kpathsea
-    has not yet been installed.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>
+      A few tests may SKIP because kpathsea
+      has not yet been installed.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <!-- Editors, you can run 'make texlinks' in a DESTDIR by passing
@@ -263,6 +279,8 @@
     </note>
 
-    <para>Now install the additional files as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now install the additional files as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <!-- if texmf does not need to be patched, remove &amp;&amp; from first line,
@@ -270,8 +288,10 @@
 <screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</userinput></screen>
 
-    <para>Still as the <systemitem class="username">root</systemitem> user,
-    initialise the new system (the commands <command>fmtutil-sys --all</command>
-    and <command>mtxrun --generate</command> will produce a
-    <emphasis>lot</emphasis> of output):</para>
+    <para>
+      Still as the <systemitem class="username">root</systemitem> user,
+      initialise the new system (the commands <command>fmtutil-sys
+      --all</command> and <command>mtxrun --generate</command> will produce
+      a <emphasis>lot</emphasis> of output):
+    </para>
 
 <!-- Editors, fmtutil-sys and mtxrun \-\-generate can apparently only be run on
@@ -283,7 +303,9 @@
 mtxrun --generate</userinput></screen>
 
-    <para>You can now proceed to <xref linkend="asymptote"/>,
-    <xref linkend="biber"/> and / or <xref linkend="xindy"/> if you
-    wish to install them.</para>
+    <para>
+      You can now proceed to <xref linkend="asymptote"/>,
+      <xref linkend="biber"/> and / or <xref linkend="xindy"/> if you
+      wish to install them.
+    </para>
 
   </sect2>
@@ -336,6 +358,6 @@
 
     <para>
-      <command>/sbin/ldconfig</command>: this has to be run here so that <command>make
-      texlinks</command> can use kpsewhich.
+      <command>/sbin/ldconfig</command>: this has to be run here so that
+      <command>make texlinks</command> can use kpsewhich.
     </para>
 
Index: pst/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/typesetting/tl-installer.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -33,17 +33,21 @@
     <title>Introduction to TeX Live and its installer</title>
 
-    <para>The <application>TeX Live</application> package is a comprehensive
-    TeX document production system.  It includes TeX, LaTeX2e, ConTeXt,
-    Metafont, MetaPost, BibTeX and many other programs; an extensive collection
-    of macros, fonts and documentation; and support for typesetting in many
-    different scripts from around the world.</para>
-
-    <para>This page is for people who wish to use the binary installer to
-    provide the programs, the scripts, and a lot of supporting files and
-    documentation.  The installer is updated frequently, so its md5sum will
-    change if it is newer than what is shown below.  Newer versions of the
-    installer are expected to work with these instructions, for so long as they
-    install to a
-    <filename class="directory">&texlive-year;/</filename> directory.</para>
+    <para>
+      The <application>TeX Live</application> package is a comprehensive
+      TeX document production system.  It includes TeX, LaTeX2e, ConTeXt,
+      Metafont, MetaPost, BibTeX and many other programs; an extensive
+      collection of macros, fonts and documentation; and support for
+      typesetting in many different scripts from around the world.
+    </para>
+
+    <para>
+      This page is for people who wish to use the binary installer to
+      provide the programs, the scripts, and a lot of supporting files and
+      documentation.  The installer is updated frequently, so its md5sum will
+      change if it is newer than what is shown below.  Newer versions of the
+      installer are expected to work with these instructions, for so long as
+      they install to a
+      <filename class="directory">&texlive-year;/</filename> directory.
+    </para>
 
     <para>
@@ -63,20 +67,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&tl-installer-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tl-installer-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tl-installer-md5sum; (for &tl-installer-date;)</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tl-installer-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tl-installer-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tl-installer-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&tl-installer-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tl-installer-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tl-installer-md5sum; (for &tl-installer-date;)
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tl-installer-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tl-installer-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tl-installer-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -119,9 +135,11 @@
       <xref linkend="freeglut"/>.
     </para>
-    <para>
-      As always with contributed binary software, it is possible that the required
-      dependencies may change when the installer is updated. In particular, these
-      dependencies have only been checked on x86_64.
-    </para>
+    <note>
+      <para>
+        As always with contributed binary software, it is possible that the
+        required dependencies may change when the installer is updated. In
+        particular, these dependencies have only been checked on x86_64.
+      </para>
+    </note>
     <!-- text for runtime deps, shared with texlive -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -136,47 +154,55 @@
     <title>Binary Installation of TeX Live</title>
 
-    <para>The <application>TeX Live</application> set of programs with its
-    supporting documents, fonts, and utilities is very large.  The upstream
-    maintainers recommend placing all files in a single directory structure.
-    BLFS recommends <filename class='directory'>/opt/texlive</filename>.</para>
-
-    <para>As with any other package, unpack the installer and change into its
-    directory, <filename class='directory'>install-tl-&lt;CCYYMMDD&gt;</filename>.
-    This directory name changes when the installer is updated, so replace
-    &lt;CCYYMMDD&gt; by the correct directory name.</para>
+    <para>
+      The <application>TeX Live</application> set of programs with its
+      supporting documents, fonts, and utilities is very large.  The upstream
+      maintainers recommend placing all files in a single directory structure.
+      BLFS recommends <filename class='directory'>/opt/texlive</filename>.
+    </para>
+
+    <para>
+      As with any other package, unpack the installer and change into its
+      directory, <filename class='directory'>
+        install-tl-&lt;CCYYMMDD&gt;</filename>.
+      This directory name changes when the installer is updated, so replace
+      &lt;CCYYMMDD&gt; by the correct directory name.
+    </para>
 
     <note>
-    <para>
-    The distribution binaries installed below may use static linking
-    for general linux system libraries.  Additional libraries or interpreters
-    as specified in the dependencies section do not need to be present during
-    the install, but the programs that need them will not run until their
-    specific dependencies have been installed.
-    </para>
+      <para>
+        The distribution binaries installed below may use static linking
+        for general linux system libraries.  Additional libraries or
+        interpreters as specified in the dependencies section do not need to
+        be present during the install, but the programs that need them will
+        not run until their specific dependencies have been installed.
+      </para>
 
     <!-- please keep something like this in the future -->
-    <para>
-    With all contributed binary software, there may be a mismatch between the
-    builder's toolchain and your hardware.  In most of TeX this will probably
-    not matter, but in uncommon corner cases you might hit problems.
-    e.g. if your x86_64 processor does not support 3dnowext or 3dnow, the
-    2014-06-28 binary failed in conTeXt when running LuaTeX, although lualatex
-    worked, as did the i686 binaries on the same machine. In such cases, the
-    easiest solution is to install texlive from source. Similarly, the x86_64
-    binary version of <command>asy</command> runs very slowly when creating 3-D
-    diagrams.
-    </para>
+      <para>
+        With all contributed binary software, there may be a mismatch between
+        the builder's toolchain and your hardware.  In most of TeX this will
+        probably not matter, but in uncommon corner cases you might hit
+        problems.  e.g. if your x86_64 processor does not support 3dnowext or
+        3dnow, the 2014-06-28 binary failed in conTeXt when running LuaTeX,
+        although lualatex worked, as did the i686 binaries on the same
+        machine. In such cases, the easiest solution is to install texlive
+        from source. Similarly, the x86_64 binary version of
+        <command>asy</command> runs very slowly when creating 3-D diagrams.
+      </para>
     </note>
 
-    <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"><userinput>TEXLIVE_INSTALL_PREFIX=/opt/texlive ./install-tl</userinput></screen>
 
-    <para>This command is interactive and allows selection or modification of
-    platform, packages, directories, and other options.  The full installation
-    scheme will require about 4.9 gigabytes of disk space.  The time to complete
-    the download will depend on your internet connection speed and the
-    number of packages selected.</para>
+    <para>
+      This command is interactive and allows selection or modification of
+      platform, packages, directories, and other options. The full installation
+      scheme will require about 4.9 gigabytes of disk space. The time to
+      complete the download will depend on your internet connection speed
+      and the number of packages selected.
+    </para>
 
   </sect2>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/typesetting/typesetting.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -16,49 +16,64 @@
   <title>Typesetting</title>
 
-  <para>This chapter includes <application>texlive</application> applications that
-  create output equivalent to typesetting.</para>
-
-  <para>There are two alternative routes through this chapter:</para>
-
-  <para>Some people may wish to use the binary installer, either because of the
-  complexity of installing all of <application>texlive</application> from
-  source, or because they only want a part of the package, or perhaps because
-  they wish to get updates as soon as those are available (the source is only
-  updated annually, but the binaries and associated tex and sty files are updated
-  for approximately 10 months). These people should begin at <xref
-  linkend="tex-path"/> and then follow the <xref linkend="tl-installer"/>
-  instructions,. After installing, they can run
-  <command>tlmgr</command> to update their system.</para>
-
-  <para>Most people reading BLFS will wish to build from source. BLFS used to
-  start by installing <application>install-tl-unx</application> and then use that
-  to bootstrap the build.  Nowadays, we build almost the whole of
-  <application>texlive</application> <emphasis>without</emphasis> a binary install,
-  by adding the separately-packaged texmf files into this build.  For this, begin
-  at <xref linkend="tex-path"/> then go to <xref linkend="texlive"/> which will
-  install most of
-  <application>texlive</application>, together with <emphasis>all</emphasis> of the
-  supporting files. This almost-complete install can then be used to build the
-  remaining parts of <application>texlive</application>: <xref
-  linkend="asymptote"/>, <xref linkend="biber"/> and <xref linkend="xindy"/>.
+  <para>
+    This chapter includes <application>texlive</application> applications that
+    create output equivalent to typesetting.
   </para>
 
-  <para>Because the texmf files (including documentation, fonts, scripts and
-  supporting files) are all in one tarball, it is not practical to limit what
-  gets extracted in a sensible way  (you could exclude one or other of the
-  typesetting engines, not its many supporting files) when building from source
-  in this manner.</para>
+  <para>
+    There are two alternative routes through this chapter:
+  </para>
 
-  <para>In either case, BLFS installs into
-  <filename class="directory">/opt/texlive/&texlive-year;</filename>.</para>
+  <para>
+    Some people may wish to use the binary installer, either because of the
+    complexity of installing all of <application>texlive</application> from
+    source, or because they only want a part of the package, or perhaps because
+    they wish to get updates as soon as those are available (the source is only
+    updated annually, but the binaries and associated tex and sty files are
+    updated for approximately 10 months). These people should begin at <xref
+    linkend="tex-path"/> and then follow the <xref linkend="tl-installer"/>
+    instructions. After installing, they can run <command>tlmgr</command> to
+    update their system.
+  </para>
 
-  <para>Also, please note that texlive is released annually, and updating from the
-  previous year to the current year is no longer supported. If for some reason
-  you wish to keep versions for multiple years, for most things you can mount the
-  old or new system at /opt/texlive and fix up your PATH as necessary. However
-  doing that will not preserve any changes in <filename
-  class="directory">texmf-local</filename> and if you build from source and try to
-  run a newer version of <application>biber</application> with an older version of
-  <application>biblatex</application> it is unlikely to work.</para>
+  <para>
+    Most people reading BLFS will wish to build from source. BLFS used to
+    start by installing <application>install-tl-unx</application> and then
+    use that to bootstrap the build.  Nowadays, we build almost the whole
+    of <application>texlive</application> <emphasis>without</emphasis> a
+    binary install, by adding the separately-packaged texmf files into this
+    build.  For this, begin at <xref linkend="tex-path"/> then go to <xref
+    linkend="texlive"/> which will install most of
+    <application>texlive</application>, together with <emphasis>all</emphasis>
+    of the supporting files. This almost-complete install can then be used
+    to build the remaining parts of <application>texlive</application>:
+    <xref linkend="asymptote"/>, <xref linkend="biber"/> and <xref
+    linkend="xindy"/>.
+  </para>
+
+  <para>
+    Because the texmf files (including documentation, fonts, scripts and
+    supporting files) are all in one tarball, it is not practical to limit what
+    gets extracted in a sensible way  (you could exclude one or other of the
+    typesetting engines, not its many supporting files) when building from
+    source in this manner.
+  </para>
+
+  <para>
+    In either case, BLFS installs into
+    <filename class="directory">/opt/texlive/&texlive-year;</filename>.
+  </para>
+
+  <para>
+    Also, please note that texlive is released annually, and updating from the
+    previous year to the current year is no longer supported. If for some
+    reason you wish to keep versions for multiple years, for most things
+    you can mount the old or new system at /opt/texlive and fix up your
+    PATH as necessary. However doing that will not preserve any changes in
+    <filename class="directory">texmf-local</filename> and if you build
+    from source and try to run a newer version of
+    <application>biber</application> with an older version of
+    <application>biblatex</application> it is unlikely to work.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tex-path.xml"/>
Index: pst/typesetting/xindy.xml
===================================================================
--- pst/typesetting/xindy.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/typesetting/xindy.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -78,6 +78,8 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xindy-&xindy-version;-upstream_fixes-1.patch"/></para>
+        <para>
+          Required patch: <ulink
+          url="&patch-root;/xindy-&xindy-version;-upstream_fixes-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -165,7 +167,9 @@
      href="../../xincludes/tex-prefix.xml"/>
 
-    <para><parameter>--includedir=/usr/include</parameter>:
-    This parameter ensures that the <filename>kpathsea</filename>
-    headers from <xref linkend="texlive"/> will be found.</para>
+    <para>
+      <parameter>--includedir=/usr/include</parameter>:
+      This parameter ensures that the <filename>kpathsea</filename>
+      headers from <xref linkend="texlive"/> will be found.
+    </para>
 
     <para>
Index: pst/xml/docbook.xml
===================================================================
--- pst/xml/docbook.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/xml/docbook.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -30,9 +30,11 @@
     <title>Introduction to DocBook XML DTD</title>
 
-    <para>The <application>DocBook XML DTD</application>-&DocBook-version;
-    package contains document type definitions for verification of XML data
-    files against the DocBook rule set. These are useful for structuring books
-    and software documentation to a standard allowing you to utilize
-    transformations already written for that standard.</para>
+    <para>
+      The <application>DocBook XML DTD</application>-&DocBook-version;
+      package contains document type definitions for verification of XML data
+      files against the DocBook rule set. These are useful for structuring
+      books and software documentation to a standard allowing you to utilize
+      transformations already written for that standard.
+    </para>
 
     &lfs91_checked;
@@ -41,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&DocBook-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&DocBook-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &DocBook-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &DocBook-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &DocBook-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &DocBook-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&DocBook-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&DocBook-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &DocBook-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &DocBook-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &DocBook-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &DocBook-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -80,7 +94,9 @@
     href="../../xincludes/use-unzip.xml"/>
 
-    <para>Install <application>DocBook XML DTD</application> by running the
-    following commands as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      Install <application>DocBook XML DTD</application> by running the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
 <screen role="root"><userinput>install -v -d -m755 /usr/share/xml/docbook/xml-dtd-&DocBook-version; &amp;&amp;
@@ -90,7 +106,9 @@
     /usr/share/xml/docbook/xml-dtd-&DocBook-version;</userinput></screen>
 
-    <para>Create (or update) and populate the
-    <filename>/etc/xml/docbook</filename> catalog file by running the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Create (or update) and populate the <filename>/etc/xml/docbook</filename>
+      catalog file by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><?dbfo keep-together="auto"?><userinput>if [ ! -e /etc/xml/docbook ]; then
@@ -142,7 +160,10 @@
     /etc/xml/docbook</userinput></screen>
 
-    <para>Create (or update) and populate the
-    <filename>/etc/xml/catalog</filename> catalog file by running the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Create (or update) and populate the
+      <filename>/etc/xml/catalog</filename> catalog file by running the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
 <screen role="root"><userinput>if [ ! -e /etc/xml/catalog ]; then
@@ -174,6 +195,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/xml/catalog</filename>,
-      <filename>/etc/xml/docbook</filename></para>
+      <para>
+        <filename>/etc/xml/catalog</filename> and
+        <filename>/etc/xml/docbook</filename>
+      </para>
 
       <indexterm zone="DocBook docbook-config">
@@ -190,13 +213,15 @@
       <title>Configuration Information</title>
 
-      <para>The above installation creates the files and updates the catalogs.
-      In order to 
-      utilize <application>DocBook XML DTD</application> V&DocBook-version;
-      when any version 4.x is requested in the System Identifier, you need to
-      add additional statements to the catalog files. If you have any of the
-      <application>DocBook XML DTD</application>'s referenced below already
-      installed on your system, remove those entries from the
-      <command>for</command> command below (issue the commands as the
-      <systemitem class="username">root</systemitem> user):</para>
+      <para>
+        The above installation creates the files and updates the catalogs.
+        In order to utilize <application>DocBook XML DTD</application>
+        V&DocBook-version; when any version 4.x is requested in the System
+        Identifier, you need to add additional statements to the catalog
+        files. If you have any of the <application>DocBook XML
+        DTD</application>'s referenced below already installed on your
+        system, remove those entries from the <command>for</command> command
+        below (issue the commands as the <systemitem
+        class="username">root</systemitem> user):
+      </para>
 
 <screen role="root"><userinput>for DTDVERSION in 4.1.2 4.2 4.3 4.4
@@ -253,7 +278,9 @@
         <term><filename>DTD files</filename></term>
         <listitem>
-          <para>contain a document type definition which defines the element
-          types and the attribute lists that can be used in the corresponding
-          <filename>XML</filename> files.</para>
+          <para>
+            contain a document type definition which defines the element
+            types and the attribute lists that can be used in the corresponding
+            <filename>XML</filename> files.
+          </para>
           <indexterm zone="DocBook DTD-files">
             <primary sortas="g-XML-DTD-files">XML DTD Files</primary>
@@ -265,6 +292,8 @@
         <term><filename>MOD files</filename></term>
         <listitem>
-          <para>files contain components of the document type definition that
-          are sourced into the <filename>DTD</filename> files.</para>
+          <para>
+            contain components of the document type definition that
+            are sourced into the <filename>DTD</filename> files.
+          </para>
           <indexterm zone="DocBook MOD-files">
             <primary sortas="g-XML-MOD-files">XML MOD files</primary>
@@ -276,6 +305,7 @@
         <term><filename>ENT files</filename></term>
         <listitem>
-          <para>files contain lists of named character entities allowed in
-          HTML.</para>
+          <para>
+            contain lists of named character entities allowed in HTML.
+          </para>
           <indexterm zone="DocBook ENT-files">
             <primary sortas="g-XML-ENT-files">XML entity files</primary>
Index: pst/xml/docbook5.xml
===================================================================
--- pst/xml/docbook5.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/xml/docbook5.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -45,20 +45,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&docbook5-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&docbook5-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &docbook5-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &docbook5-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &docbook5-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &docbook5-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&docbook5-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&docbook5-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &docbook5-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &docbook5-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &docbook5-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &docbook5-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -318,6 +330,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/xml/catalog</filename>,
-      <filename>/etc/xml/docbook-5.0</filename></para>
+      <para>
+        <filename>/etc/xml/catalog</filename> and
+        <filename>/etc/xml/docbook-5.0</filename>
+      </para>
 
       <indexterm zone="docbook5 docbook-config">
@@ -381,5 +395,7 @@
         <term><filename>XSD files</filename></term>
         <listitem>
-          <para>files contain DocBook-5.0 Schematron rules.</para>
+          <para>
+            files contain DocBook-5.0 Schematron rules.
+          </para>
           <indexterm zone="docbook5 XSD5-files">
             <primary sortas="g-XML-XSD5-files">XML Schematron rules</primary>
Index: pst/xml/docbook51.xml
===================================================================
--- pst/xml/docbook51.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/xml/docbook51.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -43,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&docbook51-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&docbook51-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &docbook51-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &docbook51-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &docbook51-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &docbook51-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&docbook51-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&docbook51-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &docbook51-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &docbook51-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &docbook51-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &docbook51-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -233,6 +245,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/xml/catalog</filename>,
-      <filename>/etc/xml/docbook-5.1</filename></para>
+      <para>
+        <filename>/etc/xml/catalog</filename> and
+        <filename>/etc/xml/docbook-5.1</filename>
+      </para>
 
       <indexterm zone="docbook51 docbook-config">
Index: pst/xml/xml.xml
===================================================================
--- pst/xml/xml.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/xml/xml.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -16,7 +16,9 @@
   <title>Extensible Markup Language (XML)</title>
 
-  <para>This chapter contains the DocBook XML document type definition
-  (DTD) and DocBook Stylesheets which are used to validate, transform,
-  format and publish DocBook documents.</para>
+  <para>
+    This chapter contains the DocBook XML document type definition
+    (DTD) and DocBook Stylesheets which are used to validate, transform,
+    format and publish DocBook documents.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook.xml"/>
Index: pst/xml/xmlto.xml
===================================================================
--- pst/xml/xmlto.xml	(revision 4727444406fb8b4b70d888af9eb38b72e37f102c)
+++ pst/xml/xmlto.xml	(revision fa3edfefcf954873389447758dedb40b45d03629)
@@ -30,8 +30,10 @@
     <title>Introduction to xmlto</title>
 
-    <para>The <application>xmlto</application> package is a front-end to a XSL
-    toolchain. It chooses an appropriate stylesheet for the conversion you want
-    and applies it using an external XSLT processor. It also performs any
-    necessary post-processing.</para>
+    <para>
+      The <application>xmlto</application> package is a front-end to a XSL
+      toolchain. It chooses an appropriate stylesheet for the conversion you
+      want and applies it using an external XSLT processor. It also performs
+      any necessary post-processing.
+    </para>
 
     &lfs91_checked;
@@ -40,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xmlto-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&xmlto-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&xmlto-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&xmlto-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &xmlto-md5sum;</para>
+        <para>
+          Download MD5 sum: &xmlto-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &xmlto-size;</para>
+        <para>
+          Download size: &xmlto-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &xmlto-buildsize;</para>
+        <para>
+          Estimated disk space required: &xmlto-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &xmlto-time;</para>
+        <para>
+          Estimated build time: &xmlto-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -96,6 +110,8 @@
     <title>Installation of xmlto</title>
 
-    <para>Install <application>xmlto</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>xmlto</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>LINKS="/usr/bin/links" \
@@ -104,7 +120,11 @@
 make</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>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -151,5 +171,7 @@
         <term><command>xmlif</command></term>
         <listitem>
-          <para>is a conditional processing instructions for XML.</para>
+          <para>
+            is a conditional processing instructions for XML.
+          </para>
           <indexterm zone="xmlto xmlif">
             <primary sortas="b-xmlif">xmlif</primary>
@@ -161,5 +183,7 @@
         <term><command>xmlto</command></term>
         <listitem>
-          <para>applies an XSL stylesheet to an XML document.</para>
+          <para>
+            applies an XSL stylesheet to an XML document.
+          </para>
           <indexterm zone="xmlto xmlto-prog">
             <primary sortas="b-xmlto">xmlto</primary>
