Index: general/genutils/asciidoc.xml
===================================================================
--- general/genutils/asciidoc.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/asciidoc.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,8 +30,10 @@
     <title>Introduction to Asciidoc</title>
 
-    <para>The <application>Asciidoc</application> package is a text document
-    format for writing notes, documentation, articles, books, ebooks,
-    slideshows, web pages, man pages and blogs. AsciiDoc files can be
-    translated to many formats including HTML, PDF, EPUB, and man page.  </para>
+    <para>
+      The <application>Asciidoc</application> package is a text document
+      format for writing notes, documentation, articles, books, ebooks,
+      slideshows, web pages, man pages and blogs. AsciiDoc files can be
+      translated to many formats including HTML, PDF, EPUB, and man page.
+    </para>
 
     &lfs91_checked;
@@ -40,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&asciidoc-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&asciidoc-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &asciidoc-md5sum;</para>
+        <para>
+          Download MD5 sum: &asciidoc-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &asciidoc-size;</para>
+        <para>
+          Download size: &asciidoc-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &asciidoc-buildsize;</para>
+        <para>
+          Estimated disk space required: &asciidoc-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &asciidoc-time;</para>
+        <para>
+          Estimated build time: &asciidoc-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -74,6 +88,8 @@
     <title>Installation of Asciidoc</title>
 
-    <para>Install <application>Asciidoc</application> by running
-    the following commands:</para>
+    <para>
+      Install <application>Asciidoc</application> by running
+      the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr     \
@@ -82,7 +98,11 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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 &amp;&amp;
@@ -119,6 +139,8 @@
         <term><command>a2x</command></term>
         <listitem>
-          <para>is a toolchain manager for AsciiDoc 
-          (converts Asciidoc text files to other file formats).</para>
+          <para>
+            is a toolchain manager for AsciiDoc 
+            (converts Asciidoc text files to other file formats).
+          </para>
           <indexterm zone="asciidoc a2x">
             <primary sortas="b-a2x">a2x</primary>
@@ -130,5 +152,7 @@
         <term><command>asciidoc</command></term>
         <listitem>
-          <para>converts an AsciiDoc text file to HTML or DocBook</para>
+          <para>
+            converts an AsciiDoc text file to HTML or DocBook
+          </para>
           <indexterm zone="asciidoc asciidoc-prog">
             <primary sortas="b-asciidoc-prog">asciidoc</primary>
Index: general/genutils/compface.xml
===================================================================
--- general/genutils/compface.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/compface.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,7 +30,9 @@
     <title>Introduction to Compface</title>
 
-    <para><application>Compface</application> provides utilities and a library to
-    convert from/to X-Face format, a 48x48 bitmap format used to carry thumbnails
-    of email authors in a mail header.</para>
+    <para>
+      <application>Compface</application> provides utilities and a library to
+      convert from/to X-Face format, a 48x48 bitmap format used to carry
+      thumbnails of email authors in a mail header.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&compface-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&compface-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&compface-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&compface-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &compface-md5sum;</para>
+        <para>
+          Download MD5 sum: &compface-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &compface-size;</para>
+        <para>
+          Download size: &compface-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &compface-buildsize;</para>
+        <para>
+          Estimated disk space required: &compface-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &compface-time;</para>
+        <para>
+          Estimated build time: &compface-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,13 +80,19 @@
     <title>Installation of Compface</title>
 
-    <para>Install <application>Compface</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Compface</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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 &amp;&amp;
@@ -104,6 +124,8 @@
         <term><command>compface</command></term>
         <listitem>
-          <para>is a filter for generating highly compressed representations
-          of 48x48x1 face image files.</para>
+          <para>
+            is a filter for generating highly compressed representations
+            of 48x48x1 face image files.
+          </para>
           <indexterm zone="compface compface-prog">
             <primary sortas="b-compface">compface</primary>
@@ -115,6 +137,8 @@
         <term><command>uncompface</command></term>
         <listitem>
-          <para>is an inverse filter which performs an inverse
-          transformation with no loss of data.</para>
+          <para>
+            is an inverse filter which performs an inverse
+            transformation with no loss of data.
+          </para>
           <indexterm zone="compface uncompface">
             <primary sortas="b-uncompface">uncompface</primary>
@@ -126,5 +150,7 @@
         <term><command>xbm2xface.pl</command></term>
         <listitem>
-          <para>is a script to generate xfaces.</para>
+          <para>
+            is a script to generate xfaces.
+          </para>
           <indexterm zone="compface xbm2xface">
             <primary sortas="b-xbm2xface.pl">xbm2xface.pl</primary>
@@ -136,6 +162,8 @@
         <term><filename class='libraryfile'>libcompface.{so,a}</filename></term>
         <listitem>
-          <para>allows the compression and decompression algorithms to be
-          used in other programs such as MTAs.</para>
+          <para>
+            allows the compression and decompression algorithms to be
+            used in other programs such as MTAs.
+          </para>
           <indexterm zone="compface libcompface">
             <primary sortas="c-libcompface">libcompface.{so,a}</primary>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/genutils.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -16,15 +16,16 @@
   <title>General Utilities</title>
 
-  <para>This chapter contains various utilities that do not fit conveniently into other
-  chapters.  Programs include a command line calculator, several utilities for manipulating
-  text and graphics, a program to interface with a palm-pilot, a program for entering
-  PIN numbers and pass-phrases, and a hash generator.</para>
+  <para>
+    This chapter contains various utilities that do not fit conveniently into
+    other chapters.  Programs include some documentation generators, several
+    utilities for manipulating text and graphics, programs for listing files,
+    a program for entering PIN numbers and pass-phrases, and a connection
+    manager.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
 
-  <!-- systemd only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bogofilter.xml"/>
 
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chrpath.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
@@ -33,5 +34,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>
 
-  <!-- systemd only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highlight.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus.xml"/>
@@ -47,9 +47,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sharutils.xml"/>
-
-  <!-- systemd only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tidy-html5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="time.xml"/>
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/gtk-doc.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,12 +30,14 @@
     <title>Introduction to GTK-Doc</title>
 
-    <para>The <application>GTK-Doc</application> package
-    contains a code documenter. This is useful for extracting specially formatted
-    comments from the code to create API documentation. This
-    package is <emphasis>optional</emphasis>; if it is not installed, packages will
-    not build the documentation. This does not mean that you will not have any
-    documentation. If <application>GTK-Doc</application> is not
-    available, the install process will copy any pre-built documentation to your
-    system.</para>
+    <para>
+      The <application>GTK-Doc</application> package contains a code
+      documenter. This is useful for extracting specially formatted comments
+      from the code to create API documentation. This package is
+      <emphasis>optional</emphasis>; if it is not installed, packages will
+      not build the documentation. This does not mean that you will not have
+      any documentation. If <application>GTK-Doc</application> is not
+      available, the install process will copy any pre-built documentation
+      to your system.
+    </para>
 
     &lfs91_checked;
@@ -44,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gtk-doc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gtk-doc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gtk-doc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gtk-doc-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gtk-doc-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gtk-doc-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&gtk-doc-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gtk-doc-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gtk-doc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gtk-doc-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gtk-doc-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gtk-doc-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -91,6 +105,10 @@
     </para>
 
-    <note><para>The optional python modules above can be easily installed with
-    the <command>pip3</command> command.</para></note>
+    <note>
+      <para>
+      The optional python modules above can be easily installed with
+      the <command>pip3</command> command.
+      </para>
+    </note>
 
     <para condition="html" role="usernotes">User Notes:
@@ -102,19 +120,27 @@
     <title>Installation of GTK-Doc</title>
 
-    <para>Install <application>GTK-Doc</application> by running
-    the following commands:</para>
+    <para>
+      Install <application>GTK-Doc</application> by running
+      the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>The test suite will hang if the package (or a previous version) 
-    is not already installed.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      The test suite will hang if the package (or a previous version) 
+      is not already installed.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. 
-    Some tests will fail depending on optionally installed packages.</para> 
+    <para>
+      To test the results, issue: <command>make check</command>. 
+      Some tests will fail depending on optionally installed packages.
+    </para> 
 
   </sect2>
@@ -161,8 +187,10 @@
         <term><command>gtkdoc*</command></term>
         <listitem>
-          <para>these are all shell, or          
-          <application>Python</application> scripts used by
-          package <filename>Makefile</filename> scripts to generate
-          documentation for the package being built.</para>
+          <para>
+            these are all shell, or          
+            <application>Python</application> scripts used by
+            package <filename>Makefile</filename> scripts to generate
+            documentation for the package being built.
+          </para>
           <indexterm zone="gtk-doc gtkdoc">
             <primary sortas="b-gtkdoc*">gtkdoc*</primary>
Index: general/genutils/hd2u.xml
===================================================================
--- general/genutils/hd2u.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/hd2u.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,6 +30,8 @@
     <title>Introduction to Hd2u</title>
 
-    <para>The <application>hd2u</application> package contains
-    an any to any text format converter.</para>
+    <para>
+      The <application>hd2u</application> package contains
+      an any to any text format converter.
+    </para>
 
     &lfs91_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&hd2u-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&hd2u-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&hd2u-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&hd2u-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &hd2u-md5sum;</para>
+        <para>
+          Download MD5 sum: &hd2u-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &hd2u-size;</para>
+        <para>
+          Download size: &hd2u-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &hd2u-buildsize;</para>
+        <para>
+          Estimated disk space required: &hd2u-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &hd2u-time;</para>
+        <para>
+          Estimated build time: &hd2u-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -70,13 +84,19 @@
     <title>Installation of Hd2u</title>
 
-    <para>Install <application>hd2u</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>hd2u</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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>
@@ -107,6 +127,8 @@
         <term><command>dos2unix</command></term>
         <listitem>
-          <para>converts text between various OS formats (such as
-          converting from DOS format to Unix).</para>
+          <para>
+            converts text between various OS formats (such as
+            converting from DOS format to Unix).
+          </para>
           <indexterm zone="hd2u dos2unix">
             <primary sortas="b-dos2unix">dos2unix</primary>
Index: general/genutils/ibus.xml
===================================================================
--- general/genutils/ibus.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/ibus.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -132,14 +132,21 @@
     <title>Installation of ibus</title>
 
-    <para>If the optional Unicode Character Database was downloaded, install it
-    now as the as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If the optional Unicode Character Database was downloaded, install it
+      now as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>mkdir -p               /usr/share/unicode/ucd &amp;&amp;
 unzip -u ../UCD.zip -d /usr/share/unicode/ucd</userinput></screen>
 
-    <note><para>Be sure to also remove the --disable-unicode-dict in
-    the configure step below.</para></note>
-
-    <para>Fix an issue with deprecated schema entries:</para>
+    <note>
+      <para>
+        Be sure to also remove the --disable-unicode-dict in
+        the configure step below.
+      </para>
+    </note>
+
+    <para>
+      Fix an issue with deprecated schema entries:</para>
 
 <screen><userinput>sed -i 's@/desktop/ibus@/org/freedesktop/ibus@g' \
@@ -175,5 +182,5 @@
     <title>Command Explanations</title>
 
-  <!--  <para>
+<!--    <para>
       <command>sed -ri ... data/ibus.schemas ...</command>: This sed fixes
       deprecated entries in the gsettings schema templates installed by this
@@ -207,5 +214,5 @@
       <option>--enable-python-library</option>: This switch enables
       building the <application>Python</application> support
-      library. Use it if have installed the optional dependencies.
+      library. Use it if you have installed the optional dependencies.
     </para>
 
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/imagemagick.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -72,20 +72,26 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&imagemagick-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&imagemagick-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &imagemagick-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &imagemagick-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &imagemagick-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &imagemagick-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&imagemagick-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&imagemagick-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &imagemagick-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &imagemagick-size;</para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &imagemagick-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &imagemagick-time;</para>
       </listitem>
     </itemizedlist>
@@ -368,5 +374,7 @@
       <term><command>animate</command></term>
       <listitem>
-        <para>animates a sequence of images.</para>
+        <para>
+          animates a sequence of images.
+        </para>
         <indexterm zone="imagemagick animate">
           <primary sortas="b-animate">animate</primary>
@@ -378,5 +386,7 @@
       <term><command>compare</command></term>
       <listitem>
-        <para>compares an image to a reconstructed image.</para>
+        <para>
+          compares an image to a reconstructed image.
+        </para>
         <indexterm zone="imagemagick compare">
           <primary sortas="b-compare">compare</primary>
@@ -388,5 +398,7 @@
       <term><command>composite</command></term>
       <listitem>
-        <para>composites various images into the given base image.</para>
+        <para>
+          composites various images into the given base image.
+        </para>
         <indexterm zone="imagemagick composite">
           <primary sortas="b-composite">composite</primary>
@@ -398,5 +410,7 @@
       <term><command>conjure</command></term>
       <listitem>
-        <para>processes a MSL script to create an image.</para>
+        <para>
+          processes a MSL script to create an image.
+        </para>
         <indexterm zone="imagemagick conjure">
           <primary sortas="b-conjure">conjure</primary>
@@ -408,5 +422,7 @@
       <term><command>convert</command></term>
       <listitem>
-        <para>converts image(s) from one format to another.</para>
+        <para>
+          converts image(s) from one format to another.
+        </para>
         <indexterm zone="imagemagick convert">
           <primary sortas="b-convert">convert</primary>
@@ -418,5 +434,7 @@
       <term><command>display</command></term>
       <listitem>
-        <para>displays an image.</para>
+        <para>
+          displays an image.
+        </para>
         <indexterm zone="imagemagick display">
           <primary sortas="b-display">display</primary>
@@ -428,5 +446,7 @@
       <term><command>identify</command></term>
       <listitem>
-        <para>describes the format and characteristics of an image file.</para>
+        <para>
+          describes the format and characteristics of an image file.
+        </para>
         <indexterm zone="imagemagick identify">
           <primary sortas="b-identify">identify</primary>
@@ -438,5 +458,7 @@
       <term><command>import</command></term>
       <listitem>
-        <para>captures an X window.</para>
+        <para>
+          captures an X window.
+        </para>
         <indexterm zone="imagemagick import">
           <primary sortas="b-import">import</primary>
@@ -448,7 +470,9 @@
       <term><command>magick</command></term>
       <listitem>
-        <para>convert between image formats as well as resize an image,
-        blur, crop, despeckle, dither, draw on, flip, join, re-sample
-        and much more.</para>
+        <para>
+          convert between image formats as well as resize an image,
+          blur, crop, despeckle, dither, draw on, flip, join, re-sample
+          and much more.
+        </para>
         <indexterm zone="imagemagick magick">
           <primary sortas="b-magick">magick</primary>
@@ -460,6 +484,8 @@
       <term><command>Magick{++,Core,Wand}-config</command></term>
       <listitem>
-        <para>show information about the installed versions of the
-        <application>ImageMagick</application> libraries.</para>
+        <para>
+          show information about the installed versions of the
+          <application>ImageMagick</application> libraries.
+        </para>
         <indexterm zone="imagemagick magick-config">
           <primary sortas="b-Magick-config">Magick-config</primary>
@@ -471,5 +497,7 @@
       <term><command>mogrify</command></term>
       <listitem>
-        <para>transforms an image.</para>
+        <para>
+          transforms an image.
+        </para>
         <indexterm zone="imagemagick mogrify">
           <primary sortas="b-mogrify">mogrify</primary>
@@ -481,5 +509,7 @@
       <term><command>montage</command></term>
       <listitem>
-        <para>composites various images into a new image.</para>
+        <para>
+          composites various images into a new image.
+        </para>
         <indexterm zone="imagemagick montage">
           <primary sortas="b-montage">montage</primary>
@@ -491,6 +521,8 @@
       <term><command>stream</command></term>
       <listitem>
-        <para>streams one or more pixel components of an image or
-         portion of the image to your choice of storage formats.</para>
+        <para>
+          streams one or more pixel components of an image or
+          portion of the image to your choice of storage formats.
+        </para>
         <indexterm zone="imagemagick stream">
           <primary sortas="b-stream">stream</primary>
@@ -502,10 +534,12 @@
       <term><filename class='libraryfile'>Image::Magick</filename></term>
       <listitem>
-        <para>allows the reading, manipulation and writing of a large number of
-        image file formats using the <application>ImageMagick</application>
-        library. Run <command>make</command> in the
-        <filename class='directory'>PerlMagick/demo</filename> directory of
-        the package source tree after the package is installed to see a nice
-        demo of the module's capabilities.</para>
+        <para>
+          allows the reading, manipulation and writing of a large number of
+          image file formats using the <application>ImageMagick</application>
+          library. Run <command>make</command> in the
+          <filename class='directory'>PerlMagick/demo</filename> directory of
+          the package source tree after the package is installed to see a nice
+          demo of the module's capabilities.
+        </para>
         <indexterm zone="imagemagick perlmagick">
           <primary sortas="g-Image-Magick">Image::Magick</primary>
Index: general/genutils/imagemagick6.xml
===================================================================
--- general/genutils/imagemagick6.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/imagemagick6.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -90,20 +90,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&imagemagick6-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&imagemagick6-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &imagemagick6-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &imagemagick6-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &imagemagick6-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &imagemagick6-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&imagemagick6-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&imagemagick6-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &imagemagick6-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &imagemagick6-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &imagemagick6-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &imagemagick6-time;
+        </para>
       </listitem>
     </itemizedlist>
Index: general/genutils/lsof.xml
===================================================================
--- general/genutils/lsof.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/lsof.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -35,6 +35,8 @@
     <title>Introduction to lsof</title>
 
-    <para>The <application>lsof</application> package is useful to LiSt Open
-    Files for a given running application or process.</para>
+    <para>
+      The <application>lsof</application> package is useful to LiSt Open
+      Files for a given running application or process.
+    </para>
 
     &lfs91_checked;
@@ -43,20 +45,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&lsof-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&lsof-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&lsof-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&lsof-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &lsof-md5sum;</para>
+        <para>
+          Download MD5 sum: &lsof-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &lsof-size;</para>
+        <para>
+          Download size: &lsof-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &lsof-buildsize;</para>
+        <para>
+          Estimated disk space required: &lsof-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &lsof-time;</para>
+        <para>
+          Estimated build time: &lsof-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -77,8 +91,10 @@
     <title>Installation of lsof</title>
 
-    <para>The contents of the <application>lsof</application> tarball
-    include another tarball with the source code, which needs, in turn,
-    to be unpacked. Install <application>lsof</application> by running the
-    following commands:</para>
+    <para>
+      The contents of the <application>lsof</application> tarball
+      include another tarball with the source code, which needs, in turn,
+      to be unpacked. Install <application>lsof</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>tar -xf lsof_&lsof-version;_src.tar  &amp;&amp;
@@ -87,7 +103,11 @@
 make CFGL="-L./lib -ltirpc"</userinput></screen>
 
-    <para>This package does not come with a working test suite.</para>
+    <para>
+      This package does not come with a working test suite.
+    </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>install -v -m0755 -o root -g root lsof /usr/bin &amp;&amp;
@@ -134,5 +154,7 @@
         <term><command>lsof</command></term>
         <listitem>
-          <para>lists open files for running processes.</para>
+          <para>
+            lists open files for running processes.
+          </para>
           <indexterm zone="lsof lsof-app">
             <primary sortas="b-lsof">lsof</primary>
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/pinentry.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -31,15 +31,17 @@
     <title>Introduction to PIN-Entry</title>
 
-    <para>The <application>PIN-Entry</application> package contains a
-    collection of simple PIN or pass-phrase entry dialogs which utilize the
-    Assuan protocol as described by the
-    <ulink url="http://www.gnupg.org/aegypten/">&#xC4;gypten project</ulink>.
-    <application>PIN-Entry</application> programs are usually invoked by
-    the <command>gpg-agent</command> daemon, but can be run from the command
-    line as well. There are programs for various text-based and GUI
-    environments, including interfaces designed for
-    <application>Ncurses</application> (text-based), and for the common
-    <application>GTK</application> and <application>Qt</application>
-    toolkits.</para>
+    <para>
+      The <application>PIN-Entry</application> package contains a
+      collection of simple PIN or pass-phrase entry dialogs which utilize the
+      Assuan protocol as described by the
+      <ulink url="http://www.gnupg.org/aegypten/">&#xC4;gypten project</ulink>.
+      <application>PIN-Entry</application> programs are usually invoked by
+      the <command>gpg-agent</command> daemon, but can be run from the command
+      line as well. There are programs for various text-based and GUI
+      environments, including interfaces designed for
+      <application>Ncurses</application> (text-based), and for the common
+      <application>GTK</application> and <application>Qt</application>
+      toolkits.
+    </para>
 
     &lfs91_checked;
@@ -48,20 +50,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&pinentry-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pinentry-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pinentry-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pinentry-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pinentry-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pinentry-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&pinentry-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&pinentry-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &pinentry-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &pinentry-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &pinentry-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &pinentry-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -96,13 +110,19 @@
     <title>Installation of PIN-Entry</title>
 
-    <para>Install <application>PIN-Entry</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>PIN-Entry</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --enable-pinentry-tty &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>
@@ -165,6 +185,8 @@
         <term><command>pinentry</command></term>
         <listitem>
-          <para>is a symbolic link to the default
-          <application>PIN-Entry</application> program.</para>
+          <para>
+            is a symbolic link to the default
+            <application>PIN-Entry</application> program.
+          </para>
           <indexterm zone="pinentry pinentry-prog">
             <primary sortas="b-pinentry">pinentry</primary>
@@ -176,6 +198,8 @@
         <term><command>pinentry-curses</command></term>
         <listitem>
-          <para> is an <application>Ncurses</application> text-based
-          <application>PIN-Entry</application> helper program.</para>
+          <para>
+            is an <application>Ncurses</application> text-based
+            <application>PIN-Entry</application> helper program.
+          </para>
           <indexterm zone="pinentry pinentry-curses">
             <primary sortas="b-pinentry-curses">pinentry-curses</primary>
@@ -187,6 +211,8 @@
         <term><command>pinentry-emacs</command></term>
         <listitem>
-          <para> is an <application>Emacs</application> version of the
-          <application>PIN-Entry</application> helper program.</para>
+          <para>
+            is an <application>Emacs</application> version of the
+            <application>PIN-Entry</application> helper program.
+          </para>
           <indexterm zone="pinentry pinentry-emacs">
             <primary sortas="b-pinentry-emacs">pinentry-emacs</primary>
@@ -198,6 +224,8 @@
         <term><command>pinentry-fltk</command></term>
         <listitem>
-          <para> is a <application>FLTK</application>
-          <application>PIN-Entry</application> helper program.</para>
+          <para>
+            is a <application>FLTK</application>
+            <application>PIN-Entry</application> helper program.
+          </para>
           <indexterm zone="pinentry pinentry-fltk">
             <primary sortas="b-pinentry-fltk">pinentry-fltk</primary>
@@ -209,6 +237,8 @@
         <term><command>pinentry-gnome3</command></term>
         <listitem>
-          <para> is a <application>GNOME-3</application>
-          <application>PIN-Entry</application> helper program.</para>
+          <para>
+            is a <application>GNOME-3</application>
+            <application>PIN-Entry</application> helper program.
+          </para>
           <indexterm zone="pinentry pinentry-gnome3">
             <primary sortas="b-pinentry-gnome3">pinentry-gnome3</primary>
@@ -220,6 +250,8 @@
         <term><command>pinentry-gtk-2</command></term>
         <listitem>
-          <para> is a <application>GTK+2</application>
-          <application>PIN-Entry</application> program program.</para>
+          <para>
+            is a <application>GTK+2</application>
+            <application>PIN-Entry</application> program program.
+          </para>
           <indexterm zone="pinentry pinentry-gtk-2">
             <primary sortas="b-pinentry-gtk-2">pinentry-gtk-2</primary>
@@ -231,6 +263,8 @@
         <term><command>pinentry-qt</command></term>
         <listitem>
-          <para> is a <application>Qt4 or 5</application>
-          <application>PIN-Entry</application> helper program.</para>
+          <para>
+            is a <application>Qt4 or 5</application>
+            <application>PIN-Entry</application> helper program.
+          </para>
           <indexterm zone="pinentry pinentry-qt">
             <primary sortas="b-pinentry-qt">pinentry-qt</primary>
@@ -242,6 +276,8 @@
         <term><command>pinentry-tty</command></term>
         <listitem>
-          <para> is a <application>tty</application>
-          <application>PIN-Entry</application> helper program.</para>
+          <para>
+            is a <application>tty</application>
+            <application>PIN-Entry</application> helper program.
+          </para>
           <indexterm zone="pinentry pinentry-tty">
             <primary sortas="b-pinentry-tty">pinentry-tty</primary>
Index: general/genutils/rarian.xml
===================================================================
--- general/genutils/rarian.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/rarian.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,8 +30,10 @@
     <title>Introduction to Rarian</title>
 
-    <para>The <application>Rarian</application> package is a documentation
-    metadata library based on the proposed Freedesktop.org spec. <application>
-    Rarian</application> is designed to be a replacement for <application>
-    ScrollKeeper</application>.</para>
+    <para>
+      The <application>Rarian</application> package is a documentation
+      metadata library based on the proposed Freedesktop.org spec. <application>
+      Rarian</application> is designed to be a replacement for <application>
+      ScrollKeeper</application>.
+    </para>
 
     &lfs91_checked;
@@ -40,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&rarian-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&rarian-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &rarian-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &rarian-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &rarian-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &rarian-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&rarian-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&rarian-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &rarian-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &rarian-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &rarian-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &rarian-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -62,8 +76,10 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libxslt"/>
-    (<command>rarian-sk-extract</command> will not be built without this) and
-    <xref linkend="DocBook"/> (without this, <application>Rarian</application>
-    scripts source DTDs from the net)</para>
+    <para role="recommended">
+      <xref linkend="libxslt"/> (<command>rarian-sk-extract</command> will not
+      be built without this) and
+      <xref linkend="DocBook"/> (without this, <application>Rarian
+      </application> scripts source DTDs from the net)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -75,6 +91,8 @@
     <title>Installation of Rarian</title>
 
-    <para>Install <application>Rarian</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Rarian</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr        \
@@ -83,7 +101,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</userinput></screen>
@@ -127,6 +149,8 @@
         <term><command>rarian-example</command></term>
         <listitem>
-          <para>prints a nice list of all available documents found by the
-          library.</para>
+          <para>
+            prints a nice list of all available documents found by the
+            library.
+          </para>
           <indexterm zone="rarian rarian-example">
             <primary sortas="b-rarian-example">rarian-example</primary>
@@ -138,5 +162,7 @@
         <term><command>rarian-sk-config</command></term>
         <listitem>
-          <para>emulates <command>scrollkeeper-config</command>.</para>
+          <para>
+            emulates <command>scrollkeeper-config</command>.
+          </para>
           <indexterm zone="rarian rarian-sk-config">
             <primary sortas="b-rarian-sk-config">rarian-sk-config</primary>
@@ -148,6 +174,8 @@
         <term><command>rarian-sk-extract</command></term>
         <listitem>
-          <para>is a wrapper around xsltproc to mimic <command>
-          scrollkeeper-extract</command>.</para>
+          <para>
+            is a wrapper around xsltproc to mimic <command>
+            scrollkeeper-extract</command>.
+          </para>
           <indexterm zone="rarian rarian-sk-extract">
             <primary sortas="b-rarian-sk-extract">rarian-sk-extract</primary>
@@ -159,5 +187,7 @@
         <term><command>rarian-sk-gen-uuid</command></term>
         <listitem>
-          <para>generates a unique (random) uuid.</para>
+          <para>
+            generates a unique (random) uuid.
+          </para>
           <indexterm zone="rarian rarian-sk-gen-uuid">
             <primary sortas="b-rarian-sk-gen-uuid">rarian-sk-gen-uuid</primary>
@@ -169,5 +199,7 @@
         <term><command>rarian-sk-get-cl</command></term>
         <listitem>
-          <para>gets a content list (category tree).</para>
+          <para>
+            gets a content list (category tree).
+          </para>
           <indexterm zone="rarian rarian-sk-get-cl">
             <primary sortas="b-rarian-sk-get-cl">rarian-sk-get-cl</primary>
@@ -179,6 +211,8 @@
         <term><command>rarian-sk-get-content-list</command></term>
         <listitem>
-          <para>is a simple wrapper to make calling <command>scrollkeeper-get-cl
-          </command> easier.</para>
+          <para>
+            is a simple wrapper to make calling <command>scrollkeeper-get-cl
+            </command> easier.
+          </para>
           <indexterm zone="rarian rarian-sk-get-content-list">
             <primary sortas="b-rarian-sk-get-content-list">
@@ -192,6 +226,8 @@
         <term><command>rarian-sk-get-extended-content-list</command></term>
         <listitem>
-          <para>is a simple wrapper to make calling <command>scrollkeeper-get-cl
-          </command> (extended) easier.</para>
+          <para>
+            is a simple wrapper to make calling <command>scrollkeeper-get-cl
+            </command> (extended) easier.
+          </para>
           <indexterm zone="rarian rarian-sk-get-extended-content-list">
             <primary sortas="b-rarian-sk-get-extended-content-list">
@@ -204,8 +240,10 @@
         <term><command>rarian-sk-get-scripts</command></term>
         <listitem>
-          <para><!-- Does nothing. -->
-          emulates <command>scrollkeeper-get-index-from-index-from-docpath</command>,
-          <command>scrollkeeper-get-toc-from-docpath</command>, and
-          <command>scrollkeeper-get-toc-from-id</command>.</para>
+          <para>
+            emulates <command>
+            scrollkeeper-get-index-from-index-from-docpath</command>, <command>
+            scrollkeeper-get-toc-from-docpath</command>, and <command>
+            scrollkeeper-get-toc-from-id</command>.
+          </para>
           <indexterm zone="rarian rarian-sk-get-scripts">
             <primary sortas="b-rarian-sk-get-scripts">rarian-sk-get-scripts</primary>
@@ -217,6 +255,8 @@
         <term><command>rarian-sk-install</command></term>
         <listitem>
-          <para><!--Does nothing.--> emulates <command>scrollkeeper-install
-          </command> and <command>scrollkeeper-uninstall</command>.</para>
+          <para>
+            emulates <command>scrollkeeper-install</command> and
+            <command>scrollkeeper-uninstall</command>.
+          </para>
           <indexterm zone="rarian rarian-sk-install">
             <primary sortas="b-rarian-sk-install">rarian-sk-install</primary>
@@ -228,6 +268,8 @@
         <term><command>rarian-sk-migrate</command></term>
         <listitem>
-          <para>takes in a directory full of omf's, reads and parses them and
-          spews out an equivalent scroll file.</para>
+          <para>
+            takes in a directory full of omf's, reads and parses them and
+            spews out an equivalent scroll file.
+          </para>
           <indexterm zone="rarian rarian-sk-migrate">
             <primary sortas="b-rarian-sk-migrate">rarian-sk-migrate</primary>
@@ -239,6 +281,8 @@
         <term><command>rarian-sk-preinstall</command></term>
         <listitem>
-          <para>creates the omf file by reading an existing omf file and
-          replacing the url for a resource with the url.</para>
+          <para>
+            creates the omf file by reading an existing omf file and
+            replacing the url for a resource with the url.
+          </para>
           <indexterm zone="rarian rarian-sk-preinstall">
             <primary sortas="b-rarian-sk-preinstall">rarian-sk-preinstall</primary>
@@ -250,6 +294,8 @@
         <term><command>rarian-sk-rebuild</command></term>
         <listitem>
-          <para>is a simple wrapper script to emulate <command>
-          scrollkeeper-rebuilddb</command>.</para>
+          <para>
+            is a simple wrapper script to emulate <command>
+            scrollkeeper-rebuilddb</command>.
+          </para>
           <indexterm zone="rarian rarian-sk-rebuild">
             <primary sortas="b-rarian-sk-rebuild">rarian-sk-rebuild</primary>
@@ -261,7 +307,9 @@
         <term><command>rarian-sk-update</command></term>
         <listitem>
-          <para>is compatible with the <command>scrollkeeper-update</command>
-          script that's required to be run when installing new omf files.  It
-          converts the omf files into new-style scrolls.</para>
+          <para>
+            is compatible with the <command>scrollkeeper-update</command>
+            script that's required to be run when installing new omf files.  It
+            converts the omf files into new-style scrolls.
+          </para>
           <indexterm zone="rarian rarian-sk-update">
             <primary sortas="b-rarian-sk-update">rarian-sk-update</primary>
@@ -274,6 +322,8 @@
         <term><filename class='libraryfile'>librarian.{so,a}</filename></term>
         <listitem>
-          <para>is the API to build a list of available meta data files and
-          allows access to these.</para>
+          <para>
+            is the API to build a list of available meta data files and
+            allows access to these.
+          </para>
           <indexterm zone="rarian librarian">
             <primary sortas="c-librarian">librarian.{so,a}</primary>
Index: general/genutils/rep-gtk.xml
===================================================================
--- general/genutils/rep-gtk.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/rep-gtk.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,11 +30,14 @@
     <title>Introduction to Rep-gtk</title>
 
-    <para>The <application>rep-gtk</application> package contains a
-    <application>Lisp</application> and <application>GTK</application> binding.
-    This is useful for extending <application>GTK-2</application> and
-    <application>GDK</application> libraries with <application>Lisp</application>.
-    Starting at <application>rep-gtk</application>-0.15, the package contains the
-    bindings to <application>GTK</application> and uses the same instructions.
-    Both can be installed, if needed. </para>
+    <para>
+      The <application>rep-gtk</application> package contains a
+      <application>Lisp</application> and <application>GTK</application>
+      binding.  This is useful for extending <application>GTK-2</application>
+      and <application>GDK</application> libraries with
+      <application>Lisp</application>.  Starting at
+      <application>rep-gtk</application>-0.15, the package contains the
+      bindings to <application>GTK</application> and uses the same
+      instructions.  Both can be installed, if needed.
+    </para>
 
     &lfs91_checked;
@@ -43,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&rep-gtk-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&rep-gtk-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&rep-gtk-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&rep-gtk-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &rep-gtk-md5sum;</para>
+        <para>
+          Download MD5 sum: &rep-gtk-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &rep-gtk-size;</para>
+        <para>
+          Download size: &rep-gtk-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &rep-gtk-buildsize;</para>
+        <para>
+          Estimated disk space required: &rep-gtk-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &rep-gtk-time;</para>
+        <para>
+          Estimated build time: &rep-gtk-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -78,13 +93,19 @@
     <title>Installation of Rep-gtk</title>
 
-    <para>Install <application>rep-gtk</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>rep-gtk</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./autogen.sh --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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>
@@ -115,8 +136,10 @@
         <term><filename class='libraryfile'>Lisp bindings</filename></term>
         <listitem>
-          <para>are libraries stored in <filename
-          class="directory">/usr/lib/rep/gui/</filename> that assist
-          communication between Lisp and the <application>GTK</application>
-          libraries.</para>
+          <para>
+            are libraries stored in <filename
+            class="directory">/usr/lib/rep/gui/</filename> that assist
+            communication between Lisp and the <application>GTK</application>
+            libraries.
+          </para>
           <indexterm zone="rep-gtk lisp-bindings">
             <primary sortas="c-Lisp-bindings">Lisp bindings</primary>
Index: general/genutils/screen.xml
===================================================================
--- general/genutils/screen.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/screen.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,12 +30,14 @@
     <title>Introduction to Screen</title>
 
-    <para><application>Screen</application> is a terminal multiplexor that
-    runs several separate processes, typically interactive shells, on a single
-    physical character-based terminal. Each virtual terminal emulates a DEC
-    VT100 plus several ANSI X3.64 and ISO 2022 functions and also provides
-    configurable input and output translation, serial port support,
-    configurable logging, multi-user support, and many character encodings,
-    including UTF-8. Screen sessions can be detached and resumed
-    later on a different terminal.</para>
+    <para>
+      <application>Screen</application> is a terminal multiplexor that runs
+      several separate processes, typically interactive shells, on a single
+      physical character-based terminal. Each virtual terminal emulates a DEC
+      VT100 plus several ANSI X3.64 and ISO 2022 functions and also provides
+      configurable input and output translation, serial port support,
+      configurable logging, multi-user support, and many character encodings,
+      including UTF-8. Screen sessions can be detached and resumed
+      later on a different terminal.
+    </para>
 
     &lfs91_checked;
@@ -44,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&screen-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&screen-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &screen-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &screen-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &screen-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &screen-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&screen-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&screen-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &screen-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &screen-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &screen-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &screen-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -76,6 +90,8 @@
     <title>Installation of Screen</title>
 
-    <para>Install <application>Screen</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Screen</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr                     \
@@ -89,7 +105,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;
@@ -101,22 +121,26 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--with-socket-dir=/run/screen</parameter>: This option
-    places the per-user sockets in a standard location.</para>
-
-    <para><parameter>--with-sys-screenrc=/etc/screenrc</parameter>: This option
-    places the global screenrc file in <filename
-    class='directory'>/etc</filename>.  </para>
-
-    <para><parameter>--with-pty-group=5</parameter>: This option sets the gid
-    to the value used by LFS.</para>
-
-    <note><para>Older versions of LFS use the value 4 for the tty group. If
-    you are using LFS version 7.1 or older, change the pty-group option
-    to 4.</para></note>
-
-    <para><command>sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%"
-    {etc,doc}/*</command>: This command corrects the configuration and
-    documentation files to the location that is used here for the global
-    screenrc file.</para>
+    <para>
+      <parameter>--with-socket-dir=/run/screen</parameter>: This option
+      places the per-user sockets in a standard location.
+    </para>
+
+    <para>
+      <parameter>--with-sys-screenrc=/etc/screenrc</parameter>: This option
+      places the global screenrc file in <filename
+      class='directory'>/etc</filename>.
+    </para>
+
+    <para>
+      <parameter>--with-pty-group=5</parameter>: This option sets the gid
+      to the value used by LFS.
+    </para>
+
+    <para>
+      <command>sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%"
+      {etc,doc}/*</command>: This command corrects the configuration and
+      documentation files to the location that is used here for the global
+      screenrc file.
+    </para>
 
   </sect2>
@@ -128,6 +152,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/screenrc</filename> and
-      <filename>~/.screenrc</filename></para>
+      <para>
+        <filename>/etc/screenrc</filename> and
+        <filename>~/.screenrc</filename>
+      </para>
 
       <indexterm zone="screen screen-config">
@@ -144,6 +170,8 @@
       <title>Configuration Information</title>
 
-      <para>You may want to look at the example configuration file that was
-      installed and customize it for your needs.</para>
+      <para>
+        You may want to look at the example configuration file that was
+        installed and customize it for your needs.
+      </para>
 
     </sect3>
@@ -174,6 +202,7 @@
         <term><command>screen</command></term>
         <listitem>
-          <para>is a terminal multiplexor with VT100/ANSI
-          terminal emulation.</para>
+          <para>
+            is a terminal multiplexor with VT100/ANSI terminal emulation.
+          </para>
           <indexterm zone="screen screen-prog">
             <primary sortas="b-screen">screen</primary>
Index: general/genutils/tidy-html5.xml
===================================================================
--- general/genutils/tidy-html5.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/tidy-html5.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,9 +30,11 @@
     <title>Introduction to Tidy HTML5</title>
 
-    <para>The <application>Tidy HTML5</application> package contains a
-    command line tool and libraries used to read HTML, XHTML and XML files
-    and write cleaned up markup. It detects and corrects many common coding
-    errors and strives to produce visually equivalent markup that is both
-    W3C compliant and compatible with most browsers.</para>
+    <para>
+      The <application>Tidy HTML5</application> package contains a
+      command line tool and libraries used to read HTML, XHTML and XML files
+      and write cleaned up markup. It detects and corrects many common coding
+      errors and strives to produce visually equivalent markup that is both
+      W3C compliant and compatible with most browsers.
+    </para>
 
     &lfs91_checked;
@@ -41,43 +43,46 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&tidy-html5-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tidy-html5-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tidy-html5-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tidy-html5-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tidy-html5-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tidy-html5-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&tidy-html5-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tidy-html5-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tidy-html5-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tidy-html5-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tidy-html5-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tidy-html5-time;
+        </para>
       </listitem>
     </itemizedlist>
-<!--
-    <note>
-      <para>
-        The <application>Tidy HTML5</application> source tarball shown above
-        downloads with the correct name, tidy-html5-&tidy-html5-version;.tar.gz, if
-        using a browser such as Firefox. If you prefer to use a command line
-        program such as wget, you normally would obtain &tidy-html5-version;.tar.gz.
-        To obtain this package with the proper filename, run:
-
-<screen><userinput>wget -c https://github.com/htacg/tidy-html5/archive/&tidy-html5-version;.tar.gz \
-     -O tidy-html5-&tidy-html5-version;.tar.gz</userinput></screen>
-        </para>
-      </note>
--->
+
     <bridgehead renderas="sect3">Tidy HTML5 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="cmake"/></para>
+    <para role="required">
+      <xref linkend="cmake"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libxslt"/></para>
+    <para role="recommended">
+      <xref linkend="libxslt"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -89,6 +94,8 @@
     <title>Installation of Tidy HTML5</title>
 
-    <para>Install <application>Tidy HTML5</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Tidy HTML5</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>cd build/cmake &amp;&amp;
@@ -101,7 +108,10 @@
 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>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -132,6 +142,7 @@
       <title>Config Files</title>
 
-      <para>The absolute path of the file specified in
-      <envar>$HTML_TIDY</envar>.</para>
+      <para>
+        The absolute path of the file specified in <envar>HTML_TIDY</envar>.
+      </para>
 
     </sect3>
@@ -140,8 +151,10 @@
       <title>Configuration Information</title>
 
-      <para>The default configuration options can be set in the file defined in
-      <envar>$HTML_TIDY</envar>. Additional configuration options can be passed
-      to <command>tidy</command> via command line parameters or the
-      <option>-config &lt;file&gt;</option> parameter.</para>
+      <para>
+        The default configuration options can be set in the file defined in
+        <envar>HTML_TIDY</envar>. Additional configuration options can be
+        passed to <command>tidy</command> via command line parameters or the
+        <option>-config &lt;file&gt;</option> parameter.
+      </para>
 
     </sect3>
@@ -171,6 +184,7 @@
         <term><command>tab2space</command></term>
         <listitem>
-          <para>is a utility to expand tabs and ensure consistent line
-          endings.</para>
+          <para>
+            is a utility to expand tabs and ensure consistent line endings.
+          </para>
           <indexterm zone="tidy-html5 tab2space">
             <primary sortas="b-tab2space">tab2space</primary>
@@ -182,5 +196,7 @@
         <term><command>tidy</command></term>
         <listitem>
-          <para>validates, corrects, and pretty-prints HTML files.</para>
+          <para>
+            validates, corrects, and pretty-prints HTML files.
+          </para>
           <indexterm zone="tidy-html5 tidy">
             <primary sortas="b-tidy">tidy</primary>
@@ -194,7 +210,9 @@
         </term>
         <listitem>
-          <para>library provides the <application>Tidy HTML5</application> API
-          functions to <command>tidy</command> and can also be called by other
-          programs.</para>
+          <para>
+            library provides the <application>Tidy HTML5</application> API
+            functions to <command>tidy</command> and can also be called by other
+            programs.
+          </para>
           <indexterm zone="tidy-html5 libtidy">
             <primary sortas="c-libtidy">libtidy.so</primary>
Index: general/genutils/tree.xml
===================================================================
--- general/genutils/tree.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/tree.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -30,7 +30,9 @@
     <title>Introduction to tree</title>
 
-    <para>The <application>tree</application> application, as the name suggests,
-    is useful to display, in a terminal, directory contents, including
-    directories, files, links.</para>
+    <para>
+      The <application>tree</application> application, as the name suggests,
+     is useful to display, in a terminal, directory contents, including
+     directories, files, links.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&tree-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&tree-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&tree-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&tree-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &tree-md5sum;</para>
+        <para>
+          Download MD5 sum: &tree-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &tree-size;</para>
+        <para>
+          Download size: &tree-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &tree-buildsize;</para>
+        <para>
+          Estimated disk space required: &tree-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &tree-time;</para>
+        <para>
+          Estimated build time: &tree-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,12 +80,18 @@
     <title>Installation of tree</title>
 
-    <para>Install <application>tree</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>tree</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </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 MANDIR=/usr/share/man/man1 install &amp;&amp;
@@ -103,5 +123,7 @@
         <term><command>tree</command></term>
         <listitem>
-          <para>displays a directory tree in a terminal.</para>
+          <para>
+            displays a directory tree in a terminal.
+          </para>
           <indexterm zone="tree tree-app">
             <primary sortas="b-tree">tree</primary>
Index: general/genutils/unixodbc.xml
===================================================================
--- general/genutils/unixodbc.xml	(revision dca1247e63f65dec4e6839ae7bbd8a75ea8457c1)
+++ general/genutils/unixodbc.xml	(revision b7a85cd93106ac0acfd483d5aa9d1731784ae2b6)
@@ -144,9 +144,11 @@
     <sect3 id="unixodbc-config">
       <title>Config Files</title>
-      <para><filename>/etc/unixODBC/*</filename></para>
-
-      <indexterm zone="unixodbc unixodbc-config">
-        <primary sortas="e-etc-unixODBC-">/etc/unixODBC/*</primary>
-      </indexterm>
+      <para>
+        <filename>/etc/unixODBC/*</filename>
+      </para>
+
+        <indexterm zone="unixodbc unixodbc-config">
+          <primary sortas="e-etc-unixODBC-">/etc/unixODBC/*</primary>
+        </indexterm>
     </sect3>
 
