Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/aalib.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -30,6 +30,8 @@
     <title>Introduction to AAlib</title>
 
-    <para><application>AAlib</application> is a library to render any graphic into
-    ASCII Art.</para>
+    <para>
+      <application>AAlib</application> is a library to render any graphic into
+      ASCII Art.
+    </para>
 
     &lfs91_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&aalib-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&aalib-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &aalib-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &aalib-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &aalib-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &aalib-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&aalib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&aalib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &aalib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &aalib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &aalib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &aalib-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -60,7 +74,9 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="x-window-system"/>,
-    <xref linkend="slang"/>, and
-    <xref linkend="gpm"/></para>
+    <para role="optional">
+      <xref linkend="x-window-system"/>,
+      <xref linkend="slang"/>, and
+      <xref linkend="gpm"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -72,10 +88,14 @@
     <title>Installation of AAlib</title>
 
-    <para>Fix a minor problem with the included m4 file:</para>
+    <para>
+      Fix a minor problem with the included m4 file:
+    </para>
 
 <screen><userinput>sed -i -e '/AM_PATH_AALIB,/s/AM_PATH_AALIB/[&amp;]/' aalib.m4</userinput></screen>
 
-    <para>Install <application>AAlib</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>AAlib</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr             \
@@ -85,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</userinput></screen>
@@ -116,6 +140,8 @@
         <term><command>aafire</command></term>
         <listitem>
-          <para>is a demo of <application>AAlib</application>, rendering
-          an animated fire in ASCII Art.</para>
+          <para>
+            is a demo of <application>AAlib</application>, rendering
+            an animated fire in ASCII Art.
+          </para>
           <indexterm zone="aalib aafire">
             <primary sortas="b-aafire">aafire</primary>
@@ -127,6 +153,8 @@
         <term><command>aainfo</command></term>
         <listitem>
-          <para>provides information for your current settings related to
-          <application>AAlib</application>.</para>
+          <para>
+            provides information for your current settings related to
+            <application>AAlib</application>.
+          </para>
           <indexterm zone="aalib aainfo">
             <primary sortas="b-aainfo">aainfo</primary>
@@ -138,6 +166,7 @@
         <term><command>aalib-config</command></term>
         <listitem>
-          <para>provides configuration info for
-          <application>AAlib</application>.</para>
+          <para>
+            provides configuration info for <application>AAlib</application>.
+          </para>
           <indexterm zone="aalib aalib-config">
             <primary sortas="b-aalib-config">aalib-config</primary>
@@ -149,5 +178,7 @@
         <term><command>aasavefont</command></term>
         <listitem>
-          <para>saves a font to a file.</para>
+          <para>
+            saves a font to a file.
+          </para>
           <indexterm zone="aalib aasavefont">
             <primary sortas="b-aasavefont">aasavefont</primary>
@@ -159,6 +190,8 @@
         <term><command>aatest</command></term>
         <listitem>
-          <para>shows the abilities of <application>AAlib</application>
-          in a little test.</para>
+          <para>
+            shows the abilities of <application>AAlib</application>
+            in a little test.
+          </para>
           <indexterm zone="aalib aatest">
             <primary sortas="b-aatest">aatest</primary>
@@ -170,8 +203,10 @@
         <term><filename class='libraryfile'>libaa.{so,a}</filename></term>
         <listitem>
-          <para>is a collection of routines to render any graphical input in
-          portable format to ASCII Art. It can be used through many programs
-          and has a very well documented API, so you can easily put it into
-          your own programs.</para>
+          <para>
+            is a collection of routines to render any graphical input in
+            portable format to ASCII Art. It can be used through many programs
+            and has a very well documented API, so you can easily put it into
+            your own programs.
+          </para>
           <indexterm zone="aalib libaa">
             <primary sortas="c-libaa">libaa.{so,a}</primary>
Index: general/graphlib/exiv2.xml
===================================================================
--- general/graphlib/exiv2.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/exiv2.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -103,5 +103,7 @@
     <title>Installation of Exiv2</title>
 <!--
-    <para>First, disable building a sample program that fails:</para>
+    <para>
+      First, disable building a sample program that fails:
+    </para>
 
 <screen><userinput>sed -i '/conntest/s/^/#/' samples/CMakeLists.txt</userinput></screen>
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/fontconfig.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -218,12 +218,18 @@
       <itemizedlist spacing="compact">
         <listitem>
-          <para>/usr/share/fonts</para>
-        </listitem>
-        <listitem>
-          <para>~/.local/share/fonts</para>
-        </listitem>
-        <listitem>
-          <para>~/.fonts <emphasis>(this is now deprecated, but for the moment
-          it still works)</emphasis></para>
+          <para>
+            /usr/share/fonts
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            ~/.local/share/fonts
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            ~/.fonts <emphasis>(this is now deprecated, but for the moment
+            it still works)</emphasis>
+          </para>
         </listitem>
       </itemizedlist>
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/freetype2.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -152,6 +152,8 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you downloaded the optional documentation, install it as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you downloaded the optional documentation, install it as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>install -v -m755 -d /usr/share/doc/freetype-&freetype2-version; &amp;&amp;
@@ -164,5 +166,5 @@
     <title>Command Explanations</title>
 
-    <para> 
+    <para>
       <command>sed -ri ...</command>: First command enables GX/AAT and OpenType
       table validation and second command enables Subpixel Rendering. Note that
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/giflib.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -30,7 +30,9 @@
     <title>Introduction to giflib</title>
 
-    <para>The <application>giflib</application> package contains libraries
-    for reading and writing GIFs as well as programs for converting and
-    working with GIF files.</para>
+    <para>
+      The <application>giflib</application> package contains libraries
+      for reading and writing GIFs as well as programs for converting and
+      working with GIF files.
+    </para>
 
     &lfs91_checked;
@@ -39,17 +41,27 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&giflib-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (HTTP) MD5 sum: &giflib-http-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download (HTTP) size: &giflib-http-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &giflib-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &giflib-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&giflib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (HTTP) MD5 sum: &giflib-http-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (HTTP) size: &giflib-http-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &giflib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &giflib-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -70,16 +82,24 @@
     <title>Installation of giflib</title>
 
-    <para>Install <application>giflib</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>giflib</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>make</userinput></screen>
 
-<!--    <para>To test the results, issue: <command>make check-TESTS</command>. Test
-    suite results are kept in <filename>test.sh.log</filename>.</para>
+<!--    <para>
+      To test the results, issue: <command>make check-TESTS</command>. Test
+      suite results are kept in <filename>test.sh.log</filename>.
+    </para>
     There doesn't seem to be a test suite in 5.1.6 -->
 
-    <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 PREFIX=/usr install &amp;&amp;
@@ -92,8 +112,10 @@
 cp -v -R doc/* /usr/share/doc/giflib-&giflib-version;</userinput></screen>
 <!--
-    <para>If <xref linkend="xmlto"/> is installed, then the API documentation
-    has been built.  If you wish to install the distributed and the just built
-    documentations, issue, as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If <xref linkend="xmlto"/> is installed, then the API documentation has
+      been built.  If you wish to install the distributed and the just built
+      documentations, issue, as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
 -->
   </sect2>
@@ -133,5 +155,7 @@
         <term><command>gif2rgb</command></term>
         <listitem>
-          <para>converts images saved as GIF to 24-bit RGB images.</para>
+          <para>
+            converts images saved as GIF to 24-bit RGB images.
+          </para>
           <indexterm zone="giflib gif2rgb">
             <primary sortas="b-gif2rgb">gif2rgb</primary>
@@ -143,5 +167,7 @@
         <term><command>gifbuild</command></term>
         <listitem>
-          <para>dumps GIF data in a textual format, or undumps it to a GIF.</para>
+          <para>
+            dumps GIF data in a textual format, or undumps it to a GIF.
+          </para>
           <indexterm zone="giflib gifbuild">
             <primary sortas="b-gifbuild">gifbuild</primary>
@@ -153,5 +179,7 @@
         <term><command>gifclrmp</command></term>
         <listitem>
-          <para>modifies GIF image colormaps.</para>
+          <para>
+            modifies GIF image colormaps.
+          </para>
           <indexterm zone="giflib gifclrmp">
             <primary sortas="b-gifclrmp">gifclrmp</primary>
@@ -163,5 +191,7 @@
         <term><command>giffix</command></term>
         <listitem>
-          <para>clumsily attempts to fix truncated GIF images.</para>
+          <para>
+            clumsily attempts to fix truncated GIF images.
+          </para>
           <indexterm zone="giflib giffix">
             <primary sortas="b-giffix">giffix</primary>
@@ -173,5 +203,7 @@
         <term><command>giftext</command></term>
         <listitem>
-          <para>prints (text only) general information about a GIF file.</para>
+          <para>
+            prints (text only) general information about a GIF file.
+          </para>
           <indexterm zone="giflib giftext">
             <primary sortas="b-giftext">giftext</primary>
@@ -183,5 +215,7 @@
         <term><command>giftool</command></term>
         <listitem>
-          <para>is a GIF transformation tool.</para>
+          <para>
+            is a GIF transformation tool.
+          </para>
           <indexterm zone="giflib giftool">
             <primary sortas="b-giftool">giftool</primary>
@@ -193,7 +227,10 @@
         <term><filename class="libraryfile">libgif.so</filename></term>
         <listitem>
-          <para>contains API functions required by the
-          <application>giflib</application> programs and any other programs needing
-          library functionality to read, write and manipulate GIF images.</para>
+          <para>
+            contains API functions required by the
+            <application>giflib</application> programs and any other programs
+            needing library functionality to read, write and manipulate GIF
+            images.
+          </para>
           <indexterm zone="giflib libgif">
             <primary sortas="c-libgif">libgif.so</primary>
Index: general/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/graphite2.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -100,5 +100,6 @@
     </para>
 
-    <para>To build the documentation:
+    <para role="optional">
+      To build the documentation:
       <xref linkend="asciidoc"/>,
       <xref linkend="doxygen"/>,
@@ -108,5 +109,6 @@
     </para>
 
-    <para>To execute the test suite you will need
+    <para role="optional">
+      To execute the test suite you will need
       <ulink url="https://pypi.python.org/pypi/FontTools">FontTools</ulink>
       (Python 3 module), otherwise, the "cmp" tests fail.
@@ -184,6 +186,8 @@
     <title>Command Explanations</title>
 
-    <para><option>-DCMAKE_VERBOSE_MAKEFILE=ON</option>: This switch turns on
-    build verbose mode.</para>
+    <para>
+      <option>-DCMAKE_VERBOSE_MAKEFILE=ON</option>: This switch turns on
+      build verbose mode.
+    </para>
 
   </sect2>
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/graphlib.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -16,8 +16,10 @@
   <title>Graphics and Font Libraries</title>
 
-  <para>Depending on what your system will be used for, you may or
-  may not require the graphics and font libraries. Most desktop machines will
-  want them for use with graphical applications.  Most servers on the
-  other hand, will not require them.</para>
+  <para>
+    Depending on what your system will be used for, you may or
+    may not require the graphics and font libraries. Most desktop machines will
+    want them for use with graphical applications.  Most servers on the
+    other hand, will not require them.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aalib.xml"/>
Index: general/graphlib/jasper.xml
===================================================================
--- general/graphlib/jasper.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/jasper.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -30,7 +30,9 @@
     <title>Introduction to JasPer</title>
 
-    <para>The <application>JasPer</application> Project is an open-source
-    initiative to provide a free software-based reference implementation of the
-    JPEG-2000 codec.</para>
+    <para>
+      The <application>JasPer</application> Project is an open-source
+      initiative to provide a free software-based reference implementation
+      of the JPEG-2000 codec.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&jasper-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&jasper-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &jasper-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &jasper-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &jasper-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &jasper-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&jasper-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&jasper-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &jasper-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &jasper-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &jasper-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &jasper-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -96,7 +110,11 @@
 make</userinput></screen>
 
-    <para>To test the results, issue:  <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue:  <command>make test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -143,5 +161,7 @@
         <term><command>imgcmp</command></term>
         <listitem>
-          <para>compares two images of the same geometry.</para>
+          <para>
+            compares two images of the same geometry.
+          </para>
           <indexterm zone="jasper imgcmp">
             <primary sortas="b-imgcmp">imgcmp</primary>
@@ -153,5 +173,7 @@
         <term><command>imginfo</command></term>
         <listitem>
-          <para>displays information about an image.</para>
+          <para>
+            displays information about an image.
+          </para>
           <indexterm zone="jasper imginfo">
             <primary sortas="b-imginfo">imginfo</primary>
@@ -163,6 +185,8 @@
         <term><command>jasper</command></term>
         <listitem>
-          <para>converts images between formats (BMP, JPS, JPC, JPG, PGX, PNM, MIF,
-          and RAS).</para>
+          <para>
+            converts images between formats (BMP, JPS, JPC, JPG, PGX, PNM, MIF,
+            and RAS).
+          </para>
           <indexterm zone="jasper jasper">
             <primary sortas="b-jasper">jasper</primary>
@@ -174,5 +198,7 @@
         <term><command>jiv</command></term>
         <listitem>
-          <para>displays images.</para>
+          <para>
+            displays images.
+          </para>
           <indexterm zone="jasper jiv">
             <primary sortas="b-jiv">jiv</primary>
@@ -184,6 +210,8 @@
         <term><filename class='libraryfile'>libjasper.so</filename></term>
         <listitem>
-          <para>is a library used by programs for reading and writing
-          JPEG2000 format files.</para>
+          <para>
+            is a library used by programs for reading and writing
+            JPEG2000 format files.
+          </para>
           <indexterm zone="jasper jasper-lib">
             <primary sortas="c-libjasper">libjasper.so</primary>
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/lcms.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -30,6 +30,8 @@
     <title>Introduction to Little CMS</title>
 
-    <para>The <application>Little CMS</application> library is used by other
-    programs to provide color management facilities.</para>
+    <para>
+      The <application>Little CMS</application> library is used by other
+      programs to provide color management facilities.
+    </para>
 
     &lfs91_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&lcms-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&lcms-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &lcms-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &lcms-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &lcms-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &lcms-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&lcms-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&lcms-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &lcms-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &lcms-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &lcms-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &lcms-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -70,8 +84,10 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libtiff"/>,
-    <xref linkend="libjpeg"/>, and
-    <xref linkend="python2"/> (with
-    <xref linkend="swig"/> also)</para>
+    <para role="optional">
+      <xref linkend="libtiff"/>,
+      <xref linkend="libjpeg"/>, and
+      <xref linkend="python2"/> (with
+      <xref linkend="swig"/> also)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -83,6 +99,8 @@
     <title>Installation of Little CMS</title>
 
-    <para>Install <application>Little CMS</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Little CMS</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../lcms-&lcms-version;-cve_2013_4276-1.patch &amp;&amp;
@@ -91,7 +109,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;
@@ -108,7 +130,9 @@
       href="../../xincludes/static-libraries.xml"/>
 
-    <para><option>--with-python</option>: Use this parameter if
-    <application>Python</application> and
-    <application>SWIG</application> are installed.</para>
+    <para>
+      <option>--with-python</option>: Use this parameter if
+      <application>Python</application> and
+      <application>SWIG</application> are installed.
+    </para>
 
   </sect2>
@@ -138,5 +162,7 @@
         <term><command>icc2ps</command></term>
         <listitem>
-          <para>generates PostScript CRD or CSA from ICC profiles.</para>
+          <para>
+            generates PostScript CRD or CSA from ICC profiles.
+          </para>
           <indexterm zone="lcms icc2ps">
             <primary sortas="b-icc2ps">icc2ps</primary>
@@ -148,5 +174,7 @@
         <term><command>icclink</command></term>
         <listitem>
-          <para>links two or more profiles into a single device link profile.</para>
+          <para>
+            links two or more profiles into a single device link profile.
+          </para>
           <indexterm zone="lcms icclink">
             <primary sortas="b-icclink">icclink</primary>
@@ -158,5 +186,7 @@
         <term><command>icctrans</command></term>
         <listitem>
-          <para>is a color space conversion calculator.</para>
+          <para>
+            is a color space conversion calculator.
+          </para>
           <indexterm zone="lcms icctrans">
             <primary sortas="b-icctrans">icctrans</primary>
@@ -168,5 +198,7 @@
         <term><command>jpegicc</command></term>
         <listitem>
-          <para>is an ICC profile applier for JPEG files.</para>
+          <para>
+            is an ICC profile applier for JPEG files.
+          </para>
           <indexterm zone="lcms jpegicc">
             <primary sortas="b-jpegicc">jpegicc</primary>
@@ -178,5 +210,7 @@
         <term><command>tifficc</command></term>
         <listitem>
-          <para>is an ICC profile applier for TIFF files.</para>
+          <para>
+            is an ICC profile applier for TIFF files.
+          </para>
           <indexterm zone="lcms tifficc">
             <primary sortas="b-tifficc">tifficc</primary>
@@ -188,5 +222,7 @@
         <term><command>tiffdiff</command></term>
         <listitem>
-          <para>A TIFF compare utility</para>
+          <para>
+            is a TIFF compare utility.
+          </para>
           <indexterm zone="lcms tiffdiff">
             <primary sortas="b-tiffdiff">tiffdiff</primary>
@@ -198,5 +234,7 @@
         <term><command>wtpt</command></term>
         <listitem>
-          <para>shows media white of profiles, identifying black body locus.</para>
+          <para>
+            shows media white of profiles, identifying black body locus.
+          </para>
           <indexterm zone="lcms wtpt">
             <primary sortas="b-wtpt">wtpt</primary>
@@ -208,6 +246,8 @@
         <term><filename class='libraryfile'>liblcms.so</filename></term>
         <listitem>
-          <para>is used by the <application>lcms</application> programs as
-          well as other programs to provide color management facilities.</para>
+          <para>
+            is used by the <application>lcms</application> programs as
+            well as other programs to provide color management facilities.
+          </para>
           <indexterm zone="lcms liblcms">
             <primary sortas="c-liblcms">liblcms.so</primary>
Index: general/graphlib/lcms2.xml
===================================================================
--- general/graphlib/lcms2.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/lcms2.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -30,8 +30,10 @@
     <title>Introduction to Little CMS2</title>
 
-    <para>The Little Color Management System is a small-footprint color
-    management engine, with special focus on accuracy and performance. It uses
-    the International Color Consortium standard (ICC), which is the modern
-    standard for color management.</para>
+    <para>
+      The Little Color Management System is a small-footprint color management
+      engine, with special focus on accuracy and performance. It uses
+      the International Color Consortium standard (ICC), which is the modern
+      standard for color management.
+    </para>
 
     &lfs91_checked;
@@ -40,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&lcms2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&lcms2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &lcms2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &lcms2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &lcms2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &lcms2-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&lcms2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&lcms2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &lcms2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &lcms2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &lcms2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &lcms2-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -74,21 +88,28 @@
     <title>Installation of Little CMS2</title>
 
-    <para>If you want to run tests, then the build procedure must
-    be modified to make some library internal references visible to 
-    the test code:</para>
+    <para>
+      If you want to run tests, then the build procedure must
+      be modified to make some library internal references visible to 
+      the test code:
+    </para>
 
 <screen><userinput>sed -i '/AX_APPEND/s/^/#/' configure.ac &amp;&amp;
 autoreconf</userinput></screen>
 
-    <para>Install <application>Little CMS2</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Little CMS2</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 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</userinput></screen>
@@ -126,5 +147,7 @@
         <term><command>jpgicc</command></term>
         <listitem>
-          <para>is the Little CMS ICC profile applier for JPEG.</para>
+          <para>
+            is the Little CMS ICC profile applier for JPEG.
+          </para>
           <indexterm zone="lcms2 jpgicc">
             <primary sortas="b-jpgicc">jpgicc</primary>
@@ -136,5 +159,7 @@
         <term><command>linkicc</command></term>
         <listitem>
-          <para>is the Little CMS ICC device link generator</para>
+          <para>
+            is the Little CMS ICC device link generator
+          </para>
           <indexterm zone="lcms2 linkicc">
             <primary sortas="b-linkicc">linkicc</primary>
@@ -146,5 +171,7 @@
         <term><command>psicc</command></term>
         <listitem>
-          <para>is the Little CMS ICC PostScript generator.</para>
+          <para>
+            is the Little CMS ICC PostScript generator.
+          </para>
           <indexterm zone="lcms2 psicc">
             <primary sortas="b-psicc">psicc</primary>
@@ -156,5 +183,7 @@
         <term><command>tificc</command></term>
         <listitem>
-          <para>is the Little CMS ICC tiff generator.</para>
+          <para>
+            is the Little CMS ICC tiff generator.
+          </para>
           <indexterm zone="lcms2 tificc">
             <primary sortas="b-tificc">tificc</primary>
@@ -166,5 +195,7 @@
         <term><command>transicc</command></term>
         <listitem>
-          <para>is the Little CMS ColorSpace conversion calculator.</para>
+          <para>
+            is the Little CMS ColorSpace conversion calculator.
+          </para>
           <indexterm zone="lcms2 transicc">
             <primary sortas="b-transicc">transicc</primary>
@@ -176,5 +207,7 @@
         <term><filename class="libraryfile">liblcms2.so</filename></term>
         <listitem>
-          <para>contains functions implement the lcms2 API.</para>
+          <para>
+            contains functions that implement the lcms2 API.
+          </para>
           <indexterm zone="lcms2 liblcms2">
             <primary sortas="c-liblcms2">liblcms2.so</primary>
Index: general/graphlib/libjpeg-turbo.xml
===================================================================
--- general/graphlib/libjpeg-turbo.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/libjpeg-turbo.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -171,8 +171,10 @@
         <term><command>cjpeg</command></term>
         <listitem>
-          <para>compresses image files to produce a JPEG/JFIF file on the
-          standard output. Currently supported input file formats are: PPM
-          (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-          BMP, and Targa.</para>
+          <para>
+            compresses image files to produce a JPEG/JFIF file on the
+            standard output. Currently supported input file formats are: PPM
+            (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
+            BMP, and Targa.
+          </para>
           <indexterm zone="libjpeg cjpeg">
             <primary sortas="b-cjpeg">cjpeg</primary>
@@ -184,7 +186,9 @@
         <term><command>djpeg</command></term>
         <listitem>
-          <para>decompresses image files from JPEG/JFIF format to either
-          PPM (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-          BMP, or Targa format.</para>
+          <para>
+            decompresses image files from JPEG/JFIF format to either
+            PPM (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
+            BMP, or Targa format.
+          </para>
           <indexterm zone="libjpeg djpeg">
             <primary sortas="b-djpeg">djpeg</primary>
@@ -196,5 +200,7 @@
         <term><command>jpegtran</command></term>
         <listitem>
-          <para>is used for lossless transformation of JPEG files.</para>
+          <para>
+            is used for lossless transformation of JPEG files.
+          </para>
           <indexterm zone="libjpeg jpegtran">
             <primary sortas="b-jpegtran">jpegtran</primary>
@@ -206,5 +212,7 @@
         <term><command>rdjpgcom</command></term>
         <listitem>
-          <para>displays text comments from within a JPEG file.</para>
+          <para>
+            displays text comments from within a JPEG file.
+          </para>
           <indexterm zone="libjpeg rdjpgcom">
             <primary sortas="b-rdjpgcom">rdjpgcom</primary>
@@ -216,5 +224,7 @@
         <term><command>tjbench</command></term>
         <listitem>
-          <para>is used to benchmark the performance of libjpeg-turbo.</para>
+          <para>
+            is used to benchmark the performance of libjpeg-turbo.
+          </para>
           <indexterm zone="libjpeg tjbench">
             <primary sortas="b-tjbench">tjbench</primary>
@@ -226,5 +236,7 @@
         <term><command>wrjpgcom</command></term>
         <listitem>
-          <para>inserts text comments into a JPEG file.</para>
+          <para>
+            inserts text comments into a JPEG file.
+          </para>
           <indexterm zone="libjpeg wrjpgcom">
             <primary sortas="b-wrjpgcom">wrjpgcom</primary>
@@ -237,7 +249,6 @@
         <listitem>
           <para>
-            contains functions used for reading and writing
-            JPEG images.
-          </para>
+            contains functions used for reading and writing JPEG images.
+        </para>
           <indexterm zone="libjpeg libjpeg-lib">
             <primary sortas="c-libjpeg">libjpeg.so</primary>
Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/libmng.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -30,7 +30,9 @@
     <title>Introduction to libmng</title>
 
-    <para>The <application>libmng</application> libraries are used by
-    programs wanting to read and write Multiple-image Network Graphics
-    (MNG) files which are the animation equivalents to PNG files.</para>
+    <para>
+      The <application>libmng</application> libraries are used by
+      programs wanting to read and write Multiple-image Network Graphics
+      (MNG) files which are the animation equivalents to PNG files.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libmng-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libmng-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libmng-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libmng-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libmng-md5sum;</para>
+        <para>
+          Download MD5 sum: &libmng-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libmng-size;</para>
+        <para>
+          Download size: &libmng-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libmng-buildsize;</para>
+        <para>
+          Estimated disk space required: &libmng-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libmng-time;</para>
+        <para>
+          Estimated build time: &libmng-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -74,13 +88,19 @@
     <title>Installation of libmng</title>
 
-    <para>Install <application>libmng</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libmng</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --disable-static &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;
@@ -122,7 +142,9 @@
         <term><filename class='libraryfile'>libmng.so</filename></term>
         <listitem>
-          <para>provides functions for programs wishing to read and write
-          MNG files which are animation files without the patent problems associated
-          with certain other formats.</para>
+          <para>
+            provides functions for programs wishing to read and write MNG
+            files which are animation files without the patent problems
+            associated with certain other formats.
+          </para>
           <indexterm zone="libmng libmng-lib">
             <primary sortas="c-libmng">libmng.so</primary>
Index: general/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/opencv.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -92,8 +92,10 @@
 
     <note>
-      <para>One additional file that starts with "ippicv" (integrated
-      performance primitives) will be automatically downloaded during the
-      cmake portion of the build procedure.  This download is specific to the
-      system architecture.</para>
+      <para>
+        One additional file that starts with "ippicv" (integrated
+        performance primitives) will be automatically downloaded during the
+        cmake portion of the build procedure. This download is specific to the
+        system architecture.
+      </para>
     </note>
 
@@ -194,12 +196,18 @@
     <title>Command Explanations</title>
 
-    <para><parameter>-DWITH_XINE=ON</parameter>: This option instructs the make
-    procedure to use <xref linkend="xine-lib"/>.</para>
-
-    <para><parameter>-DENABLE_PRECOMPILED_HEADERS=OFF</parameter>: This option 
-    is needed for compatibiiity with gcc-6.1 and later.</para>
-
-    <para><option>-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-&opencv-version;/modules</option>:
-    instructs the build system to build additional modules.</para>
+    <para>
+      <parameter>-DWITH_XINE=ON</parameter>: This option instructs the make
+      procedure to use <xref linkend="xine-lib"/>.
+    </para>
+
+    <para>
+      <parameter>-DENABLE_PRECOMPILED_HEADERS=OFF</parameter>: This option 
+      is needed for compatibiiity with gcc-6.1 and later.
+    </para>
+
+    <para>
+      <option>-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-&opencv-version;/modules</option>:
+      instructs the build system to build additional modules.
+    </para>
 
   </sect2>
Index: general/graphlib/openjpeg2.xml
===================================================================
--- general/graphlib/openjpeg2.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/openjpeg2.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -43,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&openjpeg2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&openjpeg2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &openjpeg2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &openjpeg2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &openjpeg2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &openjpeg2-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&openjpeg2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&openjpeg2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &openjpeg2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &openjpeg2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &openjpeg2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &openjpeg2-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -71,8 +83,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="lcms2"/>,
-    <xref linkend="libpng"/>,
-    <xref linkend="libtiff"/>, and
-    <xref linkend="doxygen"/> (to build the API documentation)
+      <xref linkend="lcms2"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>, and
+      <xref linkend="doxygen"/> (to build the API documentation)
     </para>
 
@@ -102,7 +114,11 @@
   http://lists.linuxfromscratch.org/pipermail/blfs-dev/2015-April/030035.html
 -->
-    <para>This package does not come with a working test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a working test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -119,6 +135,8 @@
     <title>Command Explanations</title>
 
-    <para><option>-DBUILD_TESTING=ON</option>: This switch enables
-    building the test suite.</para>
+    <para>
+      <option>-DBUILD_TESTING=ON</option>: This switch enables
+      building the test suite.
+    </para>
 
   </sect2>-->
@@ -147,5 +165,7 @@
         <term><command>opj_compress</command></term>
         <listitem>
-          <para>converts various image formats to the jpeg2000 format.</para>
+          <para>
+            converts various image formats to the jpeg2000 format.
+          </para>
           <indexterm zone="openjpeg2 opj_compress">
             <primary sortas="b-opj_compress">opj_compress</primary>
@@ -157,5 +177,7 @@
         <term><command>opj_decompress</command></term>
         <listitem>
-          <para>converts jpeg2000 images to other image types.</para>
+          <para>
+            converts jpeg2000 images to other image types.
+          </para>
           <indexterm zone="openjpeg2 opj_decompress">
             <primary sortas="b-opj_decompress">opj_decompress</primary>
@@ -167,5 +189,7 @@
         <term><command>opj_dump</command></term>
         <listitem>
-          <para>reads in a jpeg2000 image and dumps the contents to stdout.</para>
+          <para>
+            reads in a jpeg2000 image and dumps the contents to stdout.
+          </para>
           <indexterm zone="openjpeg2 opj_dump">
             <primary sortas="b-opj_dump">opj_dump</primary>
Index: general/graphlib/pixman.xml
===================================================================
--- general/graphlib/pixman.xml	(revision 622c102155c6b669489eb960f7b712d5e1307d1f)
+++ general/graphlib/pixman.xml	(revision 09f09986af621c90a20bbe62946baf7533b7f950)
@@ -88,6 +88,8 @@
     <title>Installation of Pixman</title>
 
-    <para>Install <application>Pixman</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Pixman</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
