Index: book/bookinfo.xml
===================================================================
--- book/bookinfo.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ book/bookinfo.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -36,9 +36,13 @@
     <para>This book is licensed under a <xref linkend="CC"/>.</para>
 
-    <para>Computer instructions may be extracted from the book under the
-    <xref linkend="MIT"/>.</para>
+    <para>
+      Computer instructions may be extracted from the book under the
+      <xref linkend="MIT"/>.
+    </para>
 
-    <para><trademark class='registered'>Linux</trademark> is a registered trademark of
-    Linus Torvalds.</para>
+    <para>
+      <trademark class='registered'>Linux</trademark> is a registered trademark
+      of Linus Torvalds.
+    </para>
   </legalnotice>
 
@@ -178,8 +182,10 @@
 
   <abstract>
-    <para>This book follows on from the Linux From Scratch book. It introduces
-    and guides the reader through additions to the system including networking,
-    graphical interfaces, sound support, and printer and scanner
-    support.</para>
+    <para>
+      This book follows on from the Linux From Scratch book. It introduces
+      and guides the reader through additions to the system including
+      networking, graphical interfaces, sound support, and printer and scanner
+      support.
+    </para>
   </abstract>
 
Index: book/errata.xml
===================================================================
--- book/errata.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ book/errata.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -16,12 +16,14 @@
   <title>Errata</title>
 
-  <para>The software used to create BLFS applications is constantly being
-  updated and enhanced. Security warnings and bug fixes may become available
-  after the BLFS book has been released. To check whether the package
-  versions or instructions in this release of BLFS need any modifications to
-  accommodate security vulnerabilities or other bug fixes, please visit
-  <ulink url="&errata;"/> before proceeding with your build. You should note
-  any changes shown and apply them to the relevant section of the book as you
-  progress with building the applications in BLFS.</para>
+  <para>
+    The software used to create BLFS applications is constantly being
+    updated and enhanced. Security warnings and bug fixes may become available
+    after the BLFS book has been released. To check whether the package
+    versions or instructions in this release of BLFS need any modifications to
+    accommodate security vulnerabilities or other bug fixes, please visit
+    <ulink url="&errata;"/> before proceeding with your build. You should note
+    any changes shown and apply them to the relevant section of the book as you
+    progress with building the applications in BLFS.
+  </para>
 
 </sect1>
Index: book/foreword.xml
===================================================================
--- book/foreword.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ book/foreword.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -16,9 +16,11 @@
   <title>Foreword</title>
 
-  <para>This version of the book is intended to be used when building on top of
-  a system built using the LFS book.  Every effort has been made to ensure
-  accuracy and reliability of the instructions. Many people find that using the
-  instructions in this book after building the current stable or development
-  version of LFS provides a stable and very modern Linux system.</para>
+  <para>
+    This version of the book is intended to be used when building on top of
+    a system built using the LFS book.  Every effort has been made to ensure
+    accuracy and reliability of the instructions. Many people find that using
+    the instructions in this book after building the current stable or
+    development version of LFS provides a stable and very modern Linux system.
+  </para>
 
   <para>Enjoy!</para>
Index: book/organization.xml
===================================================================
--- book/organization.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ book/organization.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -16,88 +16,115 @@
   <title>Organization</title>
 
-  <para>This book is divided into the following parts.</para>
+  <para>
+    This book is divided into the following parts.
+  </para>
 
   <bridgehead renderas="sect2">Part I - Introduction</bridgehead>
 
-  <para>This part contains information which is essential to
-  the rest of the book.</para>
+  <para>
+    This part contains information which is essential to
+    the rest of the book.
+  </para>
 
   <bridgehead renderas="sect2">Part II - Post LFS Configuration and Extra
   Software</bridgehead>
 
-  <para>Here we introduce basic configuration and security issues.  We also
-  discuss a range of editors, file systems, and shells which aren't covered in
-  the main LFS book.</para>
+  <para>
+    Here we introduce basic configuration and security issues.  We also
+    discuss a range of editors, file systems, and shells which aren't covered
+    in the main LFS book.
+  </para>
 
   <bridgehead renderas="sect2">Part III - General Libraries and Utilities</bridgehead>
 
-  <para>In this section we cover libraries which are often needed by the rest
-  of the book as well as system utilities.  Information on Programming
-  (including recompiling <application>GCC</application> to support its full range
-  of languages) concludes this part.</para>
+  <para>
+    In this section we cover libraries which are often needed by the rest
+    of the book as well as system utilities.  Information on Programming
+    (including recompiling <application>GCC</application> to support its full
+    range of languages) concludes this part.
+  </para>
 
   <bridgehead renderas="sect2">Part IV - Basic Networking</bridgehead>
 
-  <para>Here we cover how to connect to a network when you aren't using the
-  simple static IP setup given in the main LFS book. Networking libraries
-  and command-line networking tools are also covered here.</para>
+  <para>
+    Here we cover how to connect to a network when you aren't using the
+    simple static IP setup given in the main LFS book. Networking libraries
+    and command-line networking tools are also covered here.
+  </para>
 
   <bridgehead renderas="sect2">Part V - Servers</bridgehead>
 
-  <para>Here we deal with setting up mail and other servers (such as
-  <application>SSH</application>, <application>Apache</application>, etc.).</para>
+  <para>
+    Here we deal with setting up mail and other servers (such as
+    <application>FTP</application>, <application>Apache</application>, etc.).
+  </para>
 
   <bridgehead renderas="sect2">Part VI - X + Window Managers</bridgehead>
 
-  <para>This part explains how to set up a basic <application>X Window
-  System</application> installation along with some generic
-  <application>X</application> libraries and Window managers.</para>
+  <para>
+    This part explains how to set up a basic <application>X Window
+    System</application> installation along with some generic
+    <application>X</application> libraries and Window managers.
+  </para>
 
   <bridgehead renderas="sect2">Part VII - KDE</bridgehead>
 
-  <para>For those who want to use the <application>K Desktop
-  Environment</application> or some parts of it, this part covers it.</para>
+  <para>
+    For those who want to use the <application>K Desktop
+    Environment</application> or some parts of it, this part covers it.
+  </para>
 
   <bridgehead renderas="sect2">Part VIII - GNOME</bridgehead>
 
-  <para><application>GNOME</application> is the main alternative to
-  <application>KDE</application> in the Desktop Environment arena.
+  <para>
+    <application>GNOME</application> is the main alternative to
+    <application>KDE</application> in the Desktop Environment arena.
   </para>
 
   <bridgehead renderas="sect2">Part IX - Xfce</bridgehead>
 
-  <para><application>Xfce</application> is a lightweight alternative to
-  <application>GNOME</application> and <application>KDE</application>.
+  <para>
+    <application>Xfce</application> is a lightweight alternative to
+    <application>GNOME</application> and <application>KDE</application>.
   </para>
 
   <bridgehead renderas="sect2">Part X - LXDE</bridgehead>
 
-  <para><application>LXDE</application> is another lightweight alternative to
-  <application>GNOME</application> and <application>KDE</application>.
+  <para>
+    <application>LXDE</application> is another lightweight alternative to
+    <application>GNOME</application> and <application>KDE</application>.
   </para>
 
   <bridgehead renderas="sect2">Part XI - X Software</bridgehead>
 
-  <para>Office programs and graphical web browsers are important to most people.
-  They, along with some generic <application>X</application> software can be
-  found in this part of the book.</para>
+  <para>
+    Office programs and graphical web browsers are important to most people.
+    They, along with some generic <application>X</application> software can be
+    found in this part of the book.
+  </para>
 
   <bridgehead renderas="sect2">Part XII - Multimedia</bridgehead>
 
-  <para>Here we cover setting multimedia libraries and drivers along with some
-  audio, video and CD-writing programs.</para>
+  <para>
+    Here we cover setting multimedia libraries and drivers along with some
+    audio, video and CD-writing programs.
+  </para>
 
   <bridgehead renderas="sect2">Part XIII - Printing, Scanning and
   Typesetting (PST)</bridgehead>
 
-  <para>The PST part of the book covers document handling with applications like
-  <application>Ghostscript</application>, <application>CUPS</application> and
-  <application>DocBook</application> to installing
-  <application>texlive</application>.</para>
+  <para>
+    The PST part of the book covers document handling with applications like
+    <application>Ghostscript</application>, <application>CUPS</application> and
+    <application>DocBook</application> to installing
+    <application>texlive</application>.
+  </para>
 
   <bridgehead renderas="sect2">Appendices</bridgehead>
 
-  <para>The Appendices cover information which doesn't belong in the main
-  book; they are mainly there as a reference.</para>
+  <para>
+    The Appendices cover information which doesn't belong in the main
+    book; they are mainly there as a reference.
+  </para>
 
 </sect1>
Index: book/preface.xml
===================================================================
--- book/preface.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ book/preface.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -14,29 +14,39 @@
   <title>Preface</title>
 
-  <para>Having helped out with Linux From Scratch for a short time, I
-  noticed that we were getting many queries as to how to do things beyond
-  the base LFS system.  At the time, the only assistance specifically offered
-  relating to LFS were the LFS hints (<ulink url="&hints-root;"/>).
-  Most of the LFS hints are extremely good and well written
-  but I (and others) could still see a need for more comprehensive help to
-  go Beyond LFS &mdash; hence BLFS.</para>
+  <para>
+    Having helped out with Linux From Scratch for a short time, I
+    noticed that we were getting many queries as to how to do things beyond
+    the base LFS system.  At the time, the only assistance specifically offered
+    relating to LFS were the LFS hints (<ulink url="&hints-root;"/>).
+    Most of the LFS hints are extremely good and well written
+    but I (and others) could still see a need for more comprehensive help to
+    go Beyond LFS &mdash; hence BLFS.
+  </para>
 
-  <para>BLFS aims to be more than the LFS-hints converted to XML although
-  much of our work is based around the hints and indeed some authors write
-  both hints and the relevant BLFS sections.  We hope that we can provide
-  you with enough information to not only manage to build your system up to
-  what you want, whether it be a web server or a multimedia desktop system,
-  but also that you will learn a lot about system configuration as you go.</para>
+  <para>
+    BLFS aims to be more than the LFS-hints converted to XML although
+    much of our work is based around the hints and indeed some authors write
+    both hints and the relevant BLFS sections.  We hope that we can provide
+    you with enough information to not only manage to build your system up to
+    what you want, whether it be a web server or a multimedia desktop system,
+    but also that you will learn a lot about system configuration as you go.
+  </para>
 
-  <para>Thanks as ever go to everyone in the LFS/BLFS
-  community; especially those who have contributed instructions, written text,
-  answered questions and generally shouted when things were wrong!</para>
+  <para>
+    Thanks as ever go to everyone in the LFS/BLFS
+    community; especially those who have contributed instructions, written text,
+    answered questions and generally shouted when things were wrong!
+  </para>
 
-  <para>Finally, we encourage you to become involved in the community; ask
-  questions on the mailing list or news gateway and join in the fun on #lfs and
-  #lfs-support at freenode. You can find more details about all of these in
-  the <xref linkend="introduction"/> section of the book.</para>
+  <para>
+    Finally, we encourage you to become involved in the community; ask
+    questions on the mailing list or news gateway and join in the fun on #lfs
+    and #lfs-support at freenode. You can find more details about all of these
+    in the <xref linkend="introduction"/> section of the book.
+  </para>
 
-  <para>Enjoy using BLFS.</para>
+  <para>
+    Enjoy using BLFS.
+  </para>
 
   <blockquote>
@@ -46,18 +56,22 @@
   </blockquote>
 
-  <para>I still remember how I found the BLFS project
-  and started using the instructions that were completed at the time.  I could
-  not believe how wonderful it was to get an application up and running very
-  quickly, with explanations as to why things were done a certain way.
-  Unfortunately, for me, it wasn't long before I was opening applications that
-  had nothing more  than "To be done" on the page.  I did what most would do,
-  I waited for someone else to do it.  It wasn't too long before I am looking
-  through  <application>Bugzilla</application> for something easy to do.
-  As with any learning experience, the definition of what was easy kept
-  changing.</para>
+  <para>
+    I still remember how I found the BLFS project
+    and started using the instructions that were completed at the time.  I could
+    not believe how wonderful it was to get an application up and running very
+    quickly, with explanations as to why things were done a certain way.
+    Unfortunately, for me, it wasn't long before I was opening applications that
+    had nothing more  than "To be done" on the page.  I did what most would do,
+    I waited for someone else to do it.  It wasn't too long before I am looking
+    through  <application>Bugzilla</application> for something easy to do.
+    As with any learning experience, the definition of what was easy kept
+    changing.
+  </para>
 
-  <para>We still encourage you to become involved as BLFS is
-  never really finished.  Contributing or just using, we hope you enjoy
-  your BLFS experience.</para>
+  <para>
+    We still encourage you to become involved as BLFS is
+    never really finished.  Contributing or just using, we hope you enjoy
+    your BLFS experience.
+  </para>
 
   <blockquote>
@@ -67,20 +81,24 @@
   </blockquote>
 
-  <para>The BLFS project is a natural progression of
-  LFS.  Together, these projects provide a unique resource for
-  the Open Source Community.  They take the mystery out of the process of
-  building a complete, functional software system from the source code contributed
-  by many talented individuals throughout the world.  They truly allow users
-  to implement the slogan
-  <quote><emphasis>Your distro, your rules</emphasis></quote>.</para>
+  <para>
+    The BLFS project is a natural progression of
+    LFS.  Together, these projects provide a unique resource for
+    the Open Source Community.  They take the mystery out of the process of
+    building a complete, functional software system from the source code
+    contributed by many talented individuals throughout the world.  They truly
+    allow users to implement the slogan
+    <quote><emphasis>Your distro, your rules</emphasis></quote>.
+  </para>
 
-  <para>Our goal is to continue to provide the best resource available that shows
-  you how to integrate many significant Open Source applications.  Since these
-  applications are constantly updated and new applications are developed, this
-  book will never be complete.  Additionally, there is always room for
-  improvement in explaining the nuances of how to install the different packages.
-  To make these improvements, we need your feedback.  I encourage you to
-  participate on the different mailing lists, news groups, and
-  IRC channels to help meet these goals.</para>
+  <para>
+    Our goal is to continue to provide the best resource available that shows
+    you how to integrate many significant Open Source applications.  Since these
+    applications are constantly updated and new applications are developed, this
+    book will never be complete.  Additionally, there is always room for
+    improvement in explaining the nuances of how to install the different
+    packages.  To make these improvements, we need your feedback.  I encourage
+    you to participate on the different mailing lists, news groups, and
+    IRC channels to help meet these goals.
+  </para>
 
   <blockquote>
@@ -90,27 +108,33 @@
   </blockquote>
 
-  <para>My introduction to the [B]LFS project was actually by accident. I
-  was trying to build a <application>GNOME</application> environment using
-  some how-tos and other information I found on the web. A couple of times
-  I ran into some build issues and Googling pulled up some old BLFS mailing
-  list messages. Out for curiosity, I visited the Linux From Scratch web site
-  and shortly thereafter was hooked. I've not used any other Linux
-  distribution for personal use since.</para>
+  <para>
+    My introduction to the [B]LFS project was actually by accident. I
+    was trying to build a <application>GNOME</application> environment using
+    some how-tos and other information I found on the web. A couple of times
+    I ran into some build issues and Googling pulled up some old BLFS mailing
+    list messages. Out for curiosity, I visited the Linux From Scratch web site
+    and shortly thereafter was hooked. I've not used any other Linux
+    distribution for personal use since.
+  </para>
 
-  <para>I can't promise anyone will feel the sense of satisfaction I felt
-  after building my first few systems using [B]LFS instructions, but I
-  sincerely hope that your BLFS experience is as rewarding for you as it has
-  been for me.</para>
+  <para>
+    I can't promise anyone will feel the sense of satisfaction I felt
+    after building my first few systems using [B]LFS instructions, but I
+    sincerely hope that your BLFS experience is as rewarding for you as it has
+    been for me.
+  </para>
 
-  <para>The BLFS project has grown significantly the last couple of years.
-  There are more package instructions and related dependencies than ever
-  before. The project requires your input for continued success. If you
-  discover that you enjoy building BLFS, please consider helping out in any
-  way you can. BLFS requires hundreds of hours of maintenance to keep it
-  even semi-current. If you feel confident enough in your editing skills,
-  please consider joining the BLFS team. Simply contributing to the mailing
-  list discussions with sound advice and/or providing patches to the book's
-  XML will probably result in you receiving an invitation to join the
-  team.</para>
+  <para>
+    The BLFS project has grown significantly the last couple of years.
+    There are more package instructions and related dependencies than ever
+    before. The project requires your input for continued success. If you
+    discover that you enjoy building BLFS, please consider helping out in any
+    way you can. BLFS requires hundreds of hours of maintenance to keep it
+    even semi-current. If you feel confident enough in your editing skills,
+    please consider joining the BLFS team. Simply contributing to the mailing
+    list discussions with sound advice and/or providing patches to the book's
+    XML will probably result in you receiving an invitation to join the
+    team.
+  </para>
 
   <blockquote>
Index: book/whoread.xml
===================================================================
--- book/whoread.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ book/whoread.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -16,18 +16,22 @@
   <title>Who Would Want to Read this Book</title>
 
-  <para>This book is mainly aimed at those who have built a system based
-  on the LFS book. It will also be useful for those who are using other
-  distributions, but for one reason or another want to manually build
-  software and are in need of some assistance. Note that the material
-  contained in this book, in particular the dependency listings, is based
-  upon the assumption that you are using a base LFS system with every
-  package listed in the LFS book already installed and configured. BLFS can
-  be used to create a range of diverse systems and so the target audience is
-  probably nearly as wide as that of the LFS book.  If you found LFS useful,
-  you should also like this!</para>
+  <para>
+    This book is mainly aimed at those who have built a system based
+    on the LFS book. It will also be useful for those who are using other
+    distributions, but for one reason or another want to manually build
+    software and are in need of some assistance. Note that the material
+    contained in this book, in particular the dependency listings, is based
+    upon the assumption that you are using a base LFS system with every
+    package listed in the LFS book already installed and configured. BLFS can
+    be used to create a range of diverse systems and so the target audience is
+    probably nearly as wide as that of the LFS book.  If you found LFS useful,
+    you should also like this!
+  </para>
 
-  <para>Since Release 7.4, the BLFS book version matches the LFS book version.
-  This book may be incompatible with a previous or later release of the LFS
-  book.</para>
+  <para>
+    Since Release 7.4, the BLFS book version matches the LFS book version.
+    This book may be incompatible with a previous or later release of the LFS
+    book.
+  </para>
 
 </sect1>
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/audioutils/audacious.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -235,21 +235,35 @@
     </para>
 
-    <para><parameter>--with-buildstamp</parameter>: This switch appends
-    the given text to the version string.</para>
-
-    <para><parameter>--disable-wavpack</parameter>: This switch is required
-    unless the optional WavPack package is installed.</para>
-
-    <para><option>--disable-gtk</option>: Use this to disable GTK+ support.</para>
-
-    <para><option>--disable-mp3</option>: Use this for the plugins if you have
-    not installed mpg123 and do not wish to play mp3 files.</para>
-
-    <para><option>--enable-qt</option>: Use this to enable Qt support.</para>
-
-    <para><option>--enable-valgrind</option>: Allow better Valgrind leak checks.</para>
-
-    <para><option>--disable-neon</option>: Use this for the plugins if you have
-    not installed neon, and do not want to use HTTP/HTTPS transport.</para>
+    <para>
+      <parameter>--with-buildstamp</parameter>: This switch appends
+      the given text to the version string.
+    </para>
+
+    <para>
+      <parameter>--disable-wavpack</parameter>: This switch is required
+      unless the optional WavPack package is installed.
+    </para>
+
+    <para>
+      <option>--disable-gtk</option>: Use this to disable GTK+ support.
+    </para>
+
+    <para>
+      <option>--disable-mp3</option>: Use this for the plugins if you have
+      not installed mpg123 and do not wish to play mp3 files.
+    </para>
+
+    <para>
+      <option>--enable-qt</option>: Use this to enable Qt support.
+    </para>
+
+    <para>
+      <option>--enable-valgrind</option>: Allow better Valgrind leak checks.
+    </para>
+
+    <para>
+      <option>--disable-neon</option>: Use this for the plugins if you have
+      not installed neon, and do not want to use HTTP/HTTPS transport.
+    </para>
 
   </sect2>
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to Cdrdao</title>
 
-    <para>The <application>Cdrdao</application> package contains
-    CD recording utilities. These are useful for burning a
-    CD in disk-at-once mode.</para>
+    <para>
+      The <application>Cdrdao</application> package contains
+      CD recording utilities. These are useful for burning a
+      CD in disk-at-once mode.
+    </para>
 
     &lfs91_checked;
@@ -39,17 +41,27 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&cdrdao-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cdrdao-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cdrdao-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cdrdao-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cdrdao-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&cdrdao-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cdrdao-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cdrdao-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cdrdao-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cdrdao-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -74,13 +86,19 @@
     <title>Installation of Cdrdao</title>
 
-    <para>Install <application>Cdrdao</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Cdrdao</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>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;
@@ -124,6 +142,8 @@
         <term><command>cdrdao</command></term>
         <listitem>
-          <para>records audio or data CD-Rs in disk-at-once (DAO) mode
-          based on a textual description of the CD contents.</para>
+          <para>
+            records audio or data CD-Rs in disk-at-once (DAO) mode
+            based on a textual description of the CD contents.
+          </para>
           <indexterm zone="cdrdao cdrdao-prog">
             <primary sortas="b-cdrdao">cdrdao</primary>
@@ -135,5 +155,7 @@
         <term><command>cue2toc</command></term>
         <listitem>
-          <para>converts CUE to TOC format for audio CDs.</para>
+          <para>
+            converts CUE to TOC format for audio CDs.
+          </para>
           <indexterm zone="cdrdao cue2toc">
             <primary sortas="b-cue2toc">cue2toc</primary>
@@ -145,6 +167,8 @@
         <term><command>toc2cddb</command></term>
         <listitem>
-        <para>converts a <application>Cdrdao</application>
-          TOC file into a cddb file and prints it to stdout.</para>
+          <para>
+            converts a <application>Cdrdao</application>
+            TOC file into a cddb file and prints it to stdout.
+          </para>
           <indexterm zone="cdrdao toc2cddb">
             <primary sortas="b-toc2cddb">toc2cddb</primary>
@@ -156,5 +180,7 @@
         <term><command>toc2cue</command></term>
         <listitem>
-          <para>converts TOC to CUE format for audio CDs.</para>
+          <para>
+            converts TOC to CUE format for audio CDs.
+          </para>
           <indexterm zone="cdrdao toc2cue">
             <primary sortas="b-toc2cue">toc2cue</primary>
@@ -166,6 +192,8 @@
         <term><command>toc2mp3</command></term>
         <listitem>
-          <para>converts an audio CD disk image (<filename>.toc</filename> file)
-          to MP3 files.</para>
+          <para>
+            converts an audio CD disk image (<filename>.toc</filename> file)
+            to MP3 files.
+          </para>
           <indexterm zone="cdrdao toc2mp3">
             <primary sortas="b-toc2mp3">toc2mp3</primary>
Index: multimedia/cdwriteutils/cdrtools.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/cdwriteutils/cdrtools.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to Cdrtools</title>
 
-    <para>The <application>Cdrtools</application> package contains
-    CD recording utilities. These are useful for reading, creating or writing
-    (burning) CDs, DVDs, and Blu-ray discs.</para>
+    <para>
+      The <application>Cdrtools</application> package contains
+      CD recording utilities. These are useful for reading, creating or writing
+      (burning) CDs, DVDs, and Blu-ray discs.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&cdrtools-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cdrtools-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cdrtools-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cdrtools-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cdrtools-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cdrtools-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&cdrtools-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cdrtools-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cdrtools-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cdrtools-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cdrtools-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cdrtools-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -72,13 +86,19 @@
     </note>
 
-    <para>Install <application>Cdrtools</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Cdrtools</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>export GMAKE_NOWARN=true &amp;&amp;
 make -j1 INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root</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>export GMAKE_NOWARN=true &amp;&amp;
@@ -93,14 +113,20 @@
     <title>Command Explanations</title>
 
-    <para><command>export GMAKE_NOWARN=true</command>: This variable avoids a
-    warning when using GNU make.</para>
-
-    <para><parameter>INS_BASE=/usr</parameter>: This parameter moves
-    the install directory from <filename class="directory">/opt/schily</filename>
-    to <filename class="directory">/usr</filename>.</para>
-
-    <para><parameter>DEFINSUSR=root DEFINSGRP=root</parameter>: These
-    parameters install all programs with root:root ownership instead of the default
-    bin:bin.</para>
+    <para>
+      <command>export GMAKE_NOWARN=true</command>: This variable avoids a
+      warning when using GNU make.
+    </para>
+
+    <para>
+      <parameter>INS_BASE=/usr</parameter>: This parameter moves
+      the install directory from <filename class="directory">/opt/schily</filename>
+      to <filename class="directory">/usr</filename>.
+    </para>
+
+    <para>
+      <parameter>DEFINSUSR=root DEFINSGRP=root</parameter>: These parameters
+      install all programs with root:root ownership instead of the default
+      bin:bin.
+    </para>
 
   </sect2>
@@ -136,6 +162,8 @@
         <term><command>btcflash</command></term>
         <listitem>
-          <para>flashes the firmware on BTC DRW1008 DVD+/-RW recorder.
-          Please exercise care with this program.</para>
+          <para>
+            flashes the firmware on BTC DRW1008 DVD+/-RW recorder.
+            Please exercise care with this program.
+          </para>
           <indexterm zone="cdrtools btcflash">
             <primary sortas="b-btcflash">btcflash</primary>
@@ -147,5 +175,7 @@
         <term><command>cdda2wav</command></term>
         <listitem>
-          <para>converts Compact Disc audio into WAV sound files.</para>
+          <para>
+            converts Compact Disc audio into WAV sound files.
+          </para>
           <indexterm zone="cdrtools cdda2wav">
             <primary sortas="b-cdda2wav">cdda2wav</primary>
@@ -157,5 +187,7 @@
         <term><command>cdrecord</command></term>
         <listitem>
-          <para>records audio or data Compact Discs.</para>
+          <para>
+            records audio or data Compact Discs.
+          </para>
           <indexterm zone="cdrtools cdrecord">
             <primary sortas="b-cdrecord">cdrecord</primary>
@@ -167,6 +199,8 @@
         <term><command>devdump</command></term>
         <listitem>
-          <para>is a diagnostic program used to dump an
-          ISO-9660 device or file in hex.</para>
+          <para>
+            is a diagnostic program used to dump an
+            ISO-9660 device or file in hex.
+          </para>
           <indexterm zone="cdrtools devdump">
             <primary sortas="b-devdump">devdump</primary>
@@ -178,6 +212,8 @@
         <term><command>isodebug</command></term>
         <listitem>
-          <para>is used to display the command-line parameters used to create
-          an ISO-9660 image.</para>
+          <para>
+            is used to display the command-line parameters used to create
+            an ISO-9660 image.
+          </para>
           <indexterm zone="cdrtools isodebug">
             <primary sortas="b-isodebug">isodebug</primary>
@@ -189,6 +225,8 @@
         <term><command>isodump</command></term>
         <listitem>
-          <para>is a diagnostic program used to dump a device or file based on
-          ISO-9660.</para>
+          <para>
+            is a diagnostic program used to dump a device or file based on
+            ISO-9660.
+          </para>
           <indexterm zone="cdrtools isodump">
             <primary sortas="b-isodump">isodump</primary>
@@ -200,5 +238,7 @@
         <term><command>isoinfo</command></term>
         <listitem>
-          <para>is used to analyze or list an ISO-9660 image.</para>
+          <para>
+            is used to analyze or list an ISO-9660 image.
+          </para>
           <indexterm zone="cdrtools isoinfo">
             <primary sortas="b-isoinfo">isoinfo</primary>
@@ -210,5 +250,7 @@
         <term><command>isovfy</command></term>
         <listitem>
-          <para>is used to verify an ISO-9660 image.</para>
+          <para>
+            is used to verify an ISO-9660 image.
+          </para>
           <indexterm zone="cdrtools isovfy">
             <primary sortas="b-isovfy">isovfy</primary>
@@ -220,6 +262,8 @@
         <term><command>mkhybrid</command></term>
         <listitem>
-          <para>is a symbolic link to <command>mkisofs</command> used to
-          create ISO-9660/HFS hybrid filesystem images.</para>
+          <para>
+            is a symbolic link to <command>mkisofs</command> used to
+            create ISO-9660/HFS hybrid filesystem images.
+          </para>
           <indexterm zone="cdrtools mkhybrid">
             <primary sortas="b-mkhybrid">mkhybrid</primary>
@@ -231,6 +275,8 @@
         <term><command>mkisofs</command></term>
         <listitem>
-          <para>is used to create ISO-9660/JOLIET/HFS filesystem images,
-          optionally with Rock Ridge attributes.</para>
+          <para>
+            is used to create ISO-9660/JOLIET/HFS filesystem images,
+            optionally with Rock Ridge attributes.
+          </para>
           <indexterm zone="cdrtools mkisofs">
             <primary sortas="b-mkisofs">mkisofs</primary>
@@ -242,5 +288,7 @@
         <term><command>readcd</command></term>
         <listitem>
-          <para>reads or writes Compact Discs.</para>
+          <para>
+            reads or writes Compact Discs.
+          </para>
           <indexterm zone="cdrtools readcd">
             <primary sortas="b-readcd">readcd</primary>
@@ -252,5 +300,7 @@
         <term><command>rscsi</command></term>
         <listitem>
-          <para>is a remote SCSI manager.</para>
+          <para>
+            is a remote SCSI manager.
+          </para>
           <indexterm zone="cdrtools rscsi">
             <primary sortas="b-rscsi">rscsi</primary>
@@ -262,6 +312,8 @@
         <term><command>scgcheck</command></term>
         <listitem>
-          <para>is used to check and verify the Application Binary Interface
-          of <filename class="libraryfile">libscg</filename>.</para>
+          <para>
+            is used to check and verify the Application Binary Interface
+            of <filename class="libraryfile">libscg</filename>.
+          </para>
           <indexterm zone="cdrtools scgcheck">
             <primary sortas="b-scgcheck">scgcheck</primary>
@@ -273,5 +325,7 @@
         <term><filename class='libraryfile'>libscg.a</filename></term>
         <listitem>
-          <para>is a highly portable SCSI transport library.</para>
+          <para>
+            is a highly portable SCSI transport library.
+          </para>
           <indexterm zone="cdrtools libscg">
             <primary sortas="c-libscg">libscg.a</primary>
Index: multimedia/cdwriteutils/cdwriteutils.xml
===================================================================
--- multimedia/cdwriteutils/cdwriteutils.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/cdwriteutils/cdwriteutils.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -16,22 +16,30 @@
   <title>CD/DVD-Writing Utilities</title>
 
-  <para>This chapter contains information on CD/DVD-writing
-  utilities in Linux.</para>
+  <para>
+    This chapter contains information on CD/DVD-writing utilities in Linux.
+  </para>
 
-  <para>Additional sources of information include:</para>
+  <para>
+    Additional sources of information include:
+  </para>
 
   <itemizedlist>
     <listitem>
-      <para><ulink
-      url="http://www.tldp.org/HOWTO/CD-Writing-HOWTO.html">CD-Writing
-      HOWTO</ulink></para>
+      <para>
+        <ulink
+        url="http://www.tldp.org/HOWTO/CD-Writing-HOWTO.html">CD-Writing
+        HOWTO</ulink>
+      </para>
     </listitem>
     <listitem>
-      <para><ulink url="http://www.cdrfaq.org">CD-Recordable
-      FAQ</ulink></para>
+      <para>
+        <ulink url="http://www.cdrfaq.org">CD-Recordable FAQ</ulink>
+      </para>
     </listitem>
     <listitem>
-      <para><ulink url="http://fy.chalmers.se/~appro/linux/DVD+RW/">The
-      dvd+rw-tools Website</ulink></para>
+      <para>
+        <ulink url="http://fy.chalmers.se/~appro/linux/DVD+RW/">The
+        dvd+rw-tools Website</ulink>
+      </para>
     </listitem>
   </itemizedlist>
Index: multimedia/cdwriteutils/dvd+rw-tools.xml
===================================================================
--- multimedia/cdwriteutils/dvd+rw-tools.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/cdwriteutils/dvd+rw-tools.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -79,5 +79,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref role="runtime" linkend="cdrtools"/> (runtime)</para>
+    <para>
+      <xref role="runtime" linkend="cdrtools"/> (runtime)
+    </para>
 
     <para condition="html" role="usernotes">
Index: multimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/alsa-tools.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -101,5 +101,7 @@
 &as_root;
 
-    <para>First, start a subshell that will exit on error:</para>
+    <para>
+      First, start a subshell that will exit on error:
+    </para>
 
 <screen><userinput>bash -e</userinput></screen>
@@ -146,5 +148,7 @@
 unset tool tool_dir</userinput></screen>
 
-    <para>Finally, exit the shell that was started earlier:</para>
+    <para>
+      Finally, exit the shell that was started earlier:
+    </para>
 
 <screen><userinput>exit</userinput></screen>
@@ -189,7 +193,9 @@
         <term><command>as10k1</command></term>
         <listitem>
-          <para>is an assembler for the emu10k1 DSP chip present in the
-          Creative SB Live, PCI 512, and emu APS sound cards. It is used
-          to make audio effects such as a flanger, chorus or reverb.</para>
+          <para>
+            is an assembler for the emu10k1 DSP chip present in the
+            Creative SB Live, PCI 512, and emu APS sound cards. It is used
+            to make audio effects such as a flanger, chorus or reverb.
+          </para>
           <indexterm zone="alsa-tools as10k1">
             <primary sortas="b-as10k1">as10k1</primary>
@@ -201,6 +207,8 @@
         <term><command>cspctl</command></term>
         <listitem>
-          <para>is an SB16/AWE32 Creative Signal Processor
-          (ASP/CSP) control program.</para>
+          <para>
+            is an SB16/AWE32 Creative Signal Processor (ASP/CSP) control
+            program.
+          </para>
           <indexterm zone="alsa-tools cspctl">
             <primary sortas="b-cspctl">cspctl</primary>
@@ -212,8 +220,10 @@
         <term><command>echomixer</command></term>
         <listitem>
-          <para>is the Linux equivalent of the Echoaudio console application
-          from Echoaudio. It is a tool to control all the features of any Echoaudio
-          soundcard. This includes clock sources, input and output gains, mixers,
-          etc.</para>
+          <para>
+            is the Linux equivalent of the Echoaudio console application
+            from Echoaudio. It is a tool to control all the features of any
+            Echoaudio soundcard. This includes clock sources, input and output
+            gains, mixers, etc.
+          </para>
           <indexterm zone="alsa-tools echomixer">
             <primary sortas="b-echomixer">echomixer</primary>
@@ -225,5 +235,7 @@
         <term><command>envy24control</command></term>
         <listitem>
-          <para>is a control tool for Envy24 (ice1712) based sound cards.</para>
+          <para>
+            is a control tool for Envy24 (ice1712) based sound cards.
+          </para>
           <indexterm zone="alsa-tools envy24control">
             <primary sortas="b-envy24control">envy24control</primary>
@@ -262,6 +274,8 @@
         <term><command>hdspconf</command></term>
         <listitem>
-          <para>is a GUI to control the Hammerfall
-          HDSP Alsa Settings. Up to four hdsp cards are supported.</para>
+          <para>
+            is a GUI to control the Hammerfall
+            HDSP Alsa Settings. Up to four hdsp cards are supported.
+          </para>
           <indexterm zone="alsa-tools hdspconf">
             <primary sortas="b-hdspconf">hdspconf</primary>
@@ -273,6 +287,8 @@
         <term><command>hdsploader</command></term>
         <listitem>
-          <para>is used to load the firmware required by the Hammerfall
-          HDSP sound cards.</para>
+          <para>
+            is used to load the firmware required by the Hammerfall
+            HDSP sound cards.
+          </para>
           <indexterm zone="alsa-tools hdsploader">
             <primary sortas="b-hdsploader">hdsploader</primary>
@@ -284,7 +300,9 @@
         <term><command>hdspmixer</command></term>
         <listitem>
-          <para>is the Linux equivalent of the Totalmix application from RME.
-          It is a tool to control the advanced routing features of the RME
-          Hammerfall DSP soundcard series.</para>
+          <para>
+            is the Linux equivalent of the Totalmix application from RME.
+            It is a tool to control the advanced routing features of the RME
+            Hammerfall DSP soundcard series.
+          </para>
           <indexterm zone="alsa-tools hdspmixer">
             <primary sortas="b-hdspmixer">hdspmixer</primary>
@@ -298,5 +316,5 @@
           <para>
             allows you to control the volume of individual streams on sound
-            cards that use hardware mixing
+            cards that use hardware mixing.
           </para>
           <indexterm zone="alsa-tools hwmixvolume">
@@ -310,5 +328,6 @@
         <listitem>
           <para>
-            are tools used to initialize Creative Sound Blaster Audigy-series cards.
+            are tools used to initialize Creative Sound Blaster Audigy-series
+            cards.
           </para>
           <indexterm zone="alsa-tools init_audigy_progs">
@@ -333,5 +352,7 @@
         <term><command>ld10k1</command></term>
         <listitem>
-          <para>is the server of a EMU10K{1,2} patch loader for ALSA.</para>
+          <para>
+            is the server of a EMU10K{1,2} patch loader for ALSA.
+          </para>
           <indexterm zone="alsa-tools ld10k1">
             <primary sortas="b-ld10k1">ld10k1</primary>
@@ -343,5 +364,7 @@
         <term><command>lo10k1</command></term>
         <listitem>
-          <para>is the client of a EMU10K{1,2} patch loader for ALSA.</para>
+          <para>
+            is the client of a EMU10K{1,2} patch loader for ALSA.
+          </para>
           <indexterm zone="alsa-tools lo10k1">
             <primary sortas="b-lo10k1">lo10k1</primary>
@@ -353,6 +376,8 @@
         <term><command>dl10k1</command></term>
         <listitem>
-          <para>loads config dumps generated by <command>lo10k1</command>
-          and <command>ld10k1</command>.</para>
+          <para>
+            loads config dumps generated by <command>lo10k1</command>
+            and <command>ld10k1</command>.
+          </para>
           <indexterm zone="alsa-tools dl10k1">
             <primary sortas="b-dl10k1">dl10k1</primary>
@@ -364,6 +389,8 @@
         <term><command>ld10k1d</command></term>
         <listitem>
-          <para>is an init script for the <command>ld10k1</command>
-          patch loader.</para>
+          <para>
+            is an init script for the <command>ld10k1</command>
+            patch loader.
+          </para>
           <indexterm zone="alsa-tools ld10k1d">
             <primary sortas="b-ld10k1d">ld10k1d</primary>
@@ -376,6 +403,8 @@
         <term><command>qlo10k1</command></term>
         <listitem>
-          <para>is a <application>Qt</application> GUI for the
-          <command>ld10k1</command> patch loader.</para>
+          <para>
+            is a <application>Qt</application> GUI for the
+            <command>ld10k1</command> patch loader.
+          </para>
           <indexterm zone="alsa-tools qlo10k1">
             <primary sortas="b-qlo10k1">qlo10k1</primary>
@@ -388,9 +417,11 @@
         <term><command>mixartloader</command></term>
         <listitem>
-          <para>is a helper program to load the firmware binaries onto the
-          Digigram's miXart board sound drivers. The following modules require this
-          program: snd-mixart. These drivers don't work properly at all until the
-          certain firmwares are loaded, i.e. no PCM nor mixer devices will
-          appear.</para>
+          <para>
+            is a helper program to load the firmware binaries onto the
+            Digigram's miXart board sound drivers. The following modules
+            require this program: snd-mixart. These drivers don't work
+            properly at all until the certain firmwares are loaded, i.e. no
+            PCM nor mixer devices will appear.
+          </para>
           <indexterm zone="alsa-tools mixartloader">
             <primary sortas="b-mixartloader">mixartloader</primary>
@@ -402,9 +433,11 @@
         <term><command>pcxhrloader</command></term>
         <listitem>
-          <para>is a helper program to load the firmware binaries onto
-          Digigram's pcxhr compatible board sound drivers. The following modules
-          require this program: snd-pcxhr. These drivers don't work properly at all
-          until the certain firmwares are loaded, i.e. no PCM nor mixer devices will
-          appear.</para>
+          <para>
+            is a helper program to load the firmware binaries onto
+            Digigram's pcxhr compatible board sound drivers. The following
+            modules require this program: snd-pcxhr. These drivers don't work
+            properly at all until certain firmwares are loaded, i.e. no PCM
+            nor mixer devices will appear.
+          </para>
           <indexterm zone="alsa-tools pcxhrloader">
             <primary sortas="b-pcxhrloader">pcxhrloader</primary>
@@ -416,7 +449,9 @@
         <term><command>rmedigicontrol</command></term>
         <listitem>
-          <para>is a control tool for RME Digi32 and RME Digi96 sound cards.
-          It provides a graphical frontend for all the sound card controls and
-          switches.</para>
+          <para>
+            is a control tool for RME Digi32 and RME Digi96 sound cards.
+            It provides a graphical frontend for all the sound card controls
+            and switches.
+          </para>
           <indexterm zone="alsa-tools rmedigicontrol">
             <primary sortas="b-rmedigicontrol">rmedigicontrol</primary>
@@ -428,6 +463,7 @@
         <term><command>sbiload</command></term>
         <listitem>
-          <para>is an OPL2/3 FM instrument loader for the
-          ALSA sequencer.</para>
+          <para>
+            is an OPL2/3 FM instrument loader for the ALSA sequencer.
+          </para>
           <indexterm zone="alsa-tools sbiload">
             <primary sortas="b-sbiload">sbiload</primary>
@@ -439,5 +475,7 @@
         <term><command>sscape_ctl</command></term>
         <listitem>
-          <para>is an ALSA SoundScape control utility.</para>
+          <para>
+            is an ALSA SoundScape control utility.
+          </para>
           <indexterm zone="alsa-tools sscape_ctl">
             <primary sortas="b-sscape_ctl">sscape_ctl</primary>
@@ -449,5 +487,7 @@
         <term><command>us428control</command></term>
         <listitem>
-          <para>is a Tascam US-428 control program.</para>
+          <para>
+            is a Tascam US-428 control program.
+          </para>
           <indexterm zone="alsa-tools us428control">
             <primary sortas="b-us428control">us428control</primary>
@@ -459,7 +499,10 @@
         <term><command>usx2yloader</command></term>
         <listitem>
-          <para>is a helper program to load the 2nd Phase firmware binaries
-          onto the Tascam USX2Y USB sound cards. It has proven to work so far for the
-          US122, US224 and US428. The snd-usb-usx2y module requires this program.</para>
+          <para>
+            is a helper program to load the 2nd Phase firmware binaries onto
+            the Tascam USX2Y USB sound cards. It has proven to work so far for
+            the US122, US224 and US428. The snd-usb-usx2y module requires this
+            program.
+          </para>
           <indexterm zone="alsa-tools usx2yloader">
             <primary sortas="b-usx2yloader">usx2yloader</primary>
@@ -471,9 +514,12 @@
         <term><command>vxloader</command></term>
         <listitem>
-          <para>is a helper program to load the firmware binaries onto the
-          Digigram's VX-board sound drivers. The following modules require this program:
+          <para>
+            is a helper program to load the firmware binaries onto the
+            Digigram's VX-board sound drivers. The following modules require
+            this program:
           snd-vx222, snd-vxpocket, snd-vxp440. These drivers don't work properly at all
           until the certain firmwares are loaded, i.e. no PCM nor mixer devices will
-          appear.</para>
+          appear.
+          </para>
           <indexterm zone="alsa-tools vxloader">
             <primary sortas="b-vxloader">vxloader</primary>
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/alsa-utils.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -339,6 +339,8 @@
         <term><command>amixer</command></term>
         <listitem>
-          <para> allows command-line control of the mixers for the
-          ALSA sound card drivers.</para>
+          <para>
+            allows command-line control of the mixers for the
+            ALSA sound card drivers.
+          </para>
           <indexterm zone="alsa-utils amixer">
             <primary sortas="b-amixer">amixer</primary>
Index: multimedia/libdriv/alsa.xml
===================================================================
--- multimedia/libdriv/alsa.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/alsa.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -20,9 +20,11 @@
   </indexterm>
 
-  <para>The Linux kernel now provides ALSA support by
-  default.  However, applications need to interface to that capability.  The
-  following six sections of the book deal with the separate components of
-  ALSA: the libraries, the plugins, the utilities, the tools, the firmware
-  and the OSS compatibility libraries.</para>
+  <para>
+    The Linux kernel now provides ALSA support by
+    default.  However, applications need to interface to that capability.  The
+    following six sections of the book deal with the separate components of
+    ALSA: the libraries, the plugins, the utilities, the tools, the firmware
+    and the OSS compatibility libraries.
+  </para>
 
 </sect1>
Index: multimedia/libdriv/faac.xml
===================================================================
--- multimedia/libdriv/faac.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/faac.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,9 +30,11 @@
     <title>Introduction to FAAC</title>
 
-    <para><application>FAAC</application> is an encoder for a lossy sound
-    compression scheme specified in MPEG-2 Part 7 and MPEG-4 Part 3 standards
-    and known as Advanced Audio Coding (AAC). This encoder is useful for
-    producing files that can be played back on iPod. Moreover, iPod does not
-    understand other sound compression schemes in video files.</para>
+    <para>
+      <application>FAAC</application> is an encoder for a lossy sound
+      compression scheme specified in MPEG-2 Part 7 and MPEG-4 Part 3 standards
+      and known as Advanced Audio Coding (AAC). This encoder is useful for
+      producing files that can be played back on iPod. Moreover, iPod does not
+      understand other sound compression schemes in video files.
+    </para>
 
     &lfs91_checked;
@@ -41,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&faac-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&faac-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &faac-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &faac-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &faac-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &faac-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&faac-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&faac-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &faac-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &faac-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &faac-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &faac-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -68,29 +82,39 @@
     <title>Installation of FAAC</title>
 
-    <para>Install <application>FAAC</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>FAAC</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. However, basic
-    functionality can be tested by encoding a sample WAV file (the sample
-    file is installed by the <xref linkend="alsa-utils"/> package:</para>
+    <para>
+      This package does not come with a test suite. However, basic
+      functionality can be tested by encoding a sample WAV file (the sample
+      file is installed by the <xref linkend="alsa-utils"/> package:
+    </para>
 
 <screen remap="test"><userinput>./frontend/faac -o Front_Left.mp4 /usr/share/sounds/alsa/Front_Left.wav</userinput></screen>
 
-    <para>Then, decode the result using the <command>faad</command> program
-    from the <xref linkend="faad2"/> package and play back the decoded file
-    (requires the <command>aplay</command> program from the
-    <xref linkend="alsa-utils"/> package:</para>
+    <para>
+      Then, decode the result using the <command>faad</command> program
+      from the <xref linkend="faad2"/> package and play back the decoded file
+      (requires the <command>aplay</command> program from the
+      <xref linkend="alsa-utils"/> package:
+    </para>
 
 <screen remap="test"><userinput>faad Front_Left.mp4
 aplay Front_Left.wav</userinput></screen>
 
-    <para><command>aplay</command> should identify the file as
-    <quote>Signed 16 bit Little Endian, Rate 48000 Hz, Stereo</quote>, and you
-    should hear the words <quote>front left</quote>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      <command>aplay</command> should identify the file as
+      <quote>Signed 16 bit Little Endian, Rate 48000 Hz, Stereo</quote>, and
+      you should hear the words <quote>front left</quote>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -106,11 +130,13 @@
     <!-- 1.28: This is still broken, it causes a segfault. -->
     <!--
-    <para><option>- -enable-drm</option>: This option is supposed to enable
-    support for encoding files for
-    <ulink url="http://www.drm.org/">Digital Radio Mondiale</ulink>, but
-    actually breaks the base functionality of the package (e.g., the resulting
-    <command>faac</command> program produces files that cannot be decoded
-    by <xref linkend="faad2"/>, even if compiled with DRM support).
-    Don't use it.</para>
+    <para>
+      <option>- -enable-drm</option>: This option is supposed to enable
+      support for encoding files for
+      <ulink url="http://www.drm.org/">Digital Radio Mondiale</ulink>, but
+      actually breaks the base functionality of the package (e.g., the resulting
+      <command>faac</command> program produces files that cannot be decoded
+      by <xref linkend="faad2"/>, even if compiled with DRM support).
+      Don't use it.
+    </para>
     -->
     <!-- Since we say "Don't use it", let's not even list it. That would open up
@@ -121,30 +147,40 @@
     <title>Other AAC encoders</title>
 
-    <para>The quality of <application>FAAC</application> is not up
-    to par with the best AAC encoders currently available. Also, it only
-    supports AAC and not High Efficiency AAC (also known as aacPlus), which
-    provides better quality at low bitrates by means of using the
-    <quote>spectral band replication</quote> technology. There are the
-    following alternative programs for producing AAC and HE-AAC streams:</para>
+    <para>
+      The quality of <application>FAAC</application> is not up
+      to par with the best AAC encoders currently available. Also, it only
+      supports AAC and not High Efficiency AAC (also known as aacPlus), which
+      provides better quality at low bitrates by means of using the
+      <quote>spectral band replication</quote> technology. There are the
+      following alternative programs for producing AAC and HE-AAC streams:
+    </para>
 
     <itemizedlist>
       <listitem>
-        <para><ulink url="http://www.nero.com/eng/nero-aac-codec.html">Nero AAC Codec</ulink>:
-        available only in the binary form, the command-line AAC and HE-AAC encoders
-        for Linux are in the same archive as the Windows application.</para>
-      </listitem>
-      <listitem>
-        <para><ulink url="http://www.3gpp.org/ftp/Specs/html-info/26410.htm">3GPP
-        Enhanced aacPlus general audio codec</ulink>:
-        available in the source form, can encode only HE-AAC up to 48 kbps
-        out of the box, but the maximum bitrate can be changed by editing
-        the tuning table in the
-        <filename>FloatFR_sbrenclib/src/sbr_main.c</filename> file.</para>
+        <para>
+          <ulink url="http://www.nero.com/eng/nero-aac-codec.html">Nero AAC
+          Codec</ulink>:
+          available only in the binary form, the command-line AAC and HE-AAC
+          encoders for Linux are in the same archive as the Windows
+          application.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink url="http://www.3gpp.org/ftp/Specs/html-info/26410.htm">3GPP
+          Enhanced aacPlus general audio codec</ulink>:
+          available in the source form, can encode only HE-AAC up to 48 kbps
+          out of the box, but the maximum bitrate can be changed by editing
+          the tuning table in the
+          <filename>FloatFR_sbrenclib/src/sbr_main.c</filename> file.
+        </para>
       </listitem>
     </itemizedlist>
 
-    <para>Note, however, that iPod supports only Low Complexity AAC profile,
-    which is the default in FAAC, but may not be the default in Nero AAC Encoder
-    and is completely unavailable in the 3GPP encoder.</para>
+    <para>
+      Note, however, that iPod supports only Low Complexity AAC profile, which
+      is the default in FAAC, but may not be the default in Nero AAC Encoder
+      and is completely unavailable in the 3GPP encoder.
+    </para>
 
   </sect2>
@@ -172,5 +208,7 @@
         <term><command>faac</command></term>
         <listitem>
-          <para>is a command-line AAC encoder.</para>
+          <para>
+            is a command-line AAC encoder.
+          </para>
           <indexterm zone="faac faac-prog">
             <primary sortas="b-faac">faac</primary>
@@ -182,5 +220,7 @@
         <term><filename class='libraryfile'>libfaac.so</filename></term>
         <listitem>
-          <para>contains functions for encoding AAC streams.</para>
+          <para>
+            contains functions for encoding AAC streams.
+          </para>
           <indexterm zone="faac libfaac">
             <primary sortas="c-libfaac">libfaac.so</primary>
@@ -192,5 +232,7 @@
         <term><filename class='libraryfile'>libmp4v2.so</filename></term>
         <listitem>
-          <para>contains functions for creating and manipulating MP4 files.</para>
+          <para>
+            contains functions for creating and manipulating MP4 files.
+          </para>
           <indexterm zone="faac libmp4v2">
             <primary sortas="c-libmp4v2">libmp4v2.so</primary>
Index: multimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/faad2.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to FAAD2</title>
 
-    <para><application>FAAD2</application> is a decoder for a lossy sound
-    compression scheme specified in MPEG-2 Part 7 and MPEG-4 Part 3 standards
-    and known as Advanced Audio Coding (AAC).</para>
+    <para>
+      <application>FAAD2</application> is a decoder for a lossy sound
+      compression scheme specified in MPEG-2 Part 7 and MPEG-4 Part 3
+      standards and known as Advanced Audio Coding (AAC).
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&faad2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&faad2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &faad2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &faad2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &faad2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &faad2-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&faad2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&faad2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &faad2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &faad2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &faad2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &faad2-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -76,17 +90,23 @@
     <title>Installation of FAAD2</title>
 
-    <para>Install <application>FAAD2</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>FAAD2</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. However, basic
-    functionality can be tested by decoding the sample AAC file:</para>
+    <para>
+      This package does not come with a test suite. However, basic
+      functionality can be tested by decoding the sample AAC file:
+    </para>
 
 <screen remap="test"><userinput>./frontend/faad -o sample.wav ../sample.aac</userinput></screen>
 
-    <para>This should display a copyright message and the following
-    information about the sample file:</para>
+    <para>
+      This should display a copyright message and the following
+      information about the sample file:
+    </para>
 
 <literallayout><computeroutput>sample.aac file info:
@@ -102,14 +122,20 @@
   ---------------------</computeroutput></literallayout>
 
-    <para>Now play the result (requires the <command>aplay</command> program
-    from the <xref linkend="alsa-utils"/> package):</para>
+    <para>
+      Now play the result (requires the <command>aplay</command> program
+      from the <xref linkend="alsa-utils"/> package):
+    </para>
 
 <screen remap="test"><userinput>aplay sample.wav</userinput></screen>
 
-    <para><command>aplay</command> should identify the file as
-    <quote>Signed 16 bit Little Endian, Rate 16000 Hz, Stereo</quote>, and you
-    should hear some piano notes.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      <command>aplay</command> should identify the file as
+      <quote>Signed 16 bit Little Endian, Rate 16000 Hz, Stereo</quote>, and
+      you should hear some piano notes.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -148,5 +174,7 @@
         <term><command>faad</command></term>
         <listitem>
-          <para>is a command-line utility for decoding AAC and MP4 files.</para>
+          <para>
+            is a command-line utility for decoding AAC and MP4 files.
+          </para>
           <indexterm zone="faad2 faad-prog">
             <primary sortas="b-faad">faad</primary>
@@ -158,5 +186,7 @@
         <term><filename class='libraryfile'>libfaad.so</filename></term>
         <listitem>
-          <para>contains functions for decoding AAC streams.</para>
+          <para>
+            contains functions for decoding AAC streams.
+          </para>
           <indexterm zone="faad2 libfaad">
             <primary sortas="c-libfaad">libfaad.so</primary>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/flac.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to FLAC</title>
 
-    <para><application>FLAC</application> is an audio CODEC similar to
-    MP3, but lossless, meaning that audio is compressed without losing any
-    information.</para>
+    <para>
+      <application>FLAC</application> is an audio CODEC similar to
+      MP3, but lossless, meaning that audio is compressed without losing any
+      information.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&flac-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&flac-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &flac-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &flac-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &flac-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &flac-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&flac-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&flac-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &flac-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &flac-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &flac-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &flac-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -78,6 +92,8 @@
     <title>Installation of FLAC</title>
 
-    <para>Install <application>FLAC</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>FLAC</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
@@ -85,12 +101,16 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note that
-    if you passed the <option>--enable-exhaustive-tests</option> and
-    <option>--enable-valgrind-testing</option> parameters to
-    <command>configure</command> and then run the test suite, it will take a
-    <emphasis>very</emphasis> long time (up to 300 SBUs) and use about 375 MB
-    of disk space.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>. Note that
+      if you passed the <option>--enable-exhaustive-tests</option> and
+      <option>--enable-valgrind-testing</option> parameters to
+      <command>configure</command> and then run the test suite, it will take a
+      <emphasis>very</emphasis> long time (up to 300 SBUs) and use about 375 MB
+      of disk space.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -101,7 +121,9 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--disable-thorough-tests</parameter>: This parameter is
-    used so that the test suite will complete in a reasonable amount of time.
-    Remove it if you desire more extensive tests.</para>
+    <para>
+      <parameter>--disable-thorough-tests</parameter>: This parameter is
+      used so that the test suite will complete in a reasonable amount of time.
+      Remove it if you desire more extensive tests.
+    </para>
 
   </sect2>
@@ -131,6 +153,8 @@
         <term><command>flac</command></term>
         <listitem>
-          <para>is a command-line utility for encoding, decoding and
-          converting FLAC files.</para>
+          <para>
+            is a command-line utility for encoding, decoding and
+            converting FLAC files.
+          </para>
           <indexterm zone="flac flac-prog">
             <primary sortas="b-flac">flac</primary>
@@ -142,6 +166,8 @@
         <term><command>metaflac</command></term>
         <listitem>
-          <para>is a program for listing, adding, removing, or editing
-          metadata in one or more FLAC files.</para>
+          <para>
+            is a program for listing, adding, removing, or editing
+            metadata in one or more FLAC files.
+          </para>
           <indexterm zone="flac metaflac">
             <primary sortas="b-metaflac">metaflac</primary>
@@ -153,6 +179,8 @@
         <term><filename class='libraryfile'>libFLAC{,++}.so</filename></term>
         <listitem>
-          <para>these libraries provide native FLAC and Ogg FLAC C/C++ APIs
-          for programs utilizing FLAC.</para>
+          <para>
+            these libraries provide native FLAC and Ogg FLAC C/C++ APIs
+            for programs utilizing FLAC.
+          </para>
           <indexterm zone="flac libflac">
             <primary sortas="c-libFLAC">libFLAC{,++}.so</primary>
@@ -165,5 +193,7 @@
         <term><filename class='libraryfile'>libxmms-flac.{so,a}</filename></term>
         <listitem>
-          <para>is a plugin for <application>XMMS</application>.</para>
+          <para>
+            is a plugin for <application>XMMS</application>.
+          </para>
           <indexterm zone="flac libxmms-flac">
             <primary sortas="c-libxmms-flac">libxmms-flac.{so,a}</primary>
Index: multimedia/libdriv/frei0r.xml
===================================================================
--- multimedia/libdriv/frei0r.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/frei0r.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to Frei0r-plugins</title>
 
-    <para><application>Frei0r</application> is a minimalistic plugin API for
-    video effects. Note that the 0 in the name is a zero, not a capital letter
-    o.</para>
+    <para>
+      <application>Frei0r</application> is a minimalistic plugin API for
+      video effects. Note that the 0 in the name is a zero, not a capital
+      letter o.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&frei0r-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&frei0r-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&frei0r-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&frei0r-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &frei0r-md5sum;</para>
+        <para>
+          Download MD5 sum: &frei0r-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &frei0r-size;</para>
+        <para>
+          Download size: &frei0r-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &frei0r-buildsize;</para>
+        <para>
+          Estimated disk space required: &frei0r-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &frei0r-time;</para>
+        <para>
+          Estimated build time: &frei0r-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -80,6 +94,8 @@
     <title>Installation of Frei0r-plugins</title>
 
-    <para>Install <application>Frei0r</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Frei0r</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>mkdir -vp build &amp;&amp;
@@ -93,7 +109,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</userinput></screen>
@@ -104,16 +124,24 @@
     <title>Command Explanations</title>
 <!--
-    <para><command>sed ... facebl0r.cpp</command>: This command fixes a build
-    problem with the current opencv dependency.  </para>
+    <para>
+      <command>sed ... facebl0r.cpp</command>: This command fixes a build
+      problem with the current opencv dependency.  
+    </para>
 
-    <para><parameter>-DOpenCV_DIR=/usr/share/OpenCV</parameter>: This parameter
-    helps the make procedure to find the <filename>libippicv.a</filename>
-    library, installed under that directory tree.</para>
+    <para>
+      <parameter>-DOpenCV_DIR=/usr/share/OpenCV</parameter>: This parameter
+      helps the make procedure to find the <filename>libippicv.a</filename>
+      library, installed under that directory tree.
+    </para>
 -->
-    <para><option>-DWITHOUT_OPENCV=TRUE</option>: This option instructs the make
-    procedure to disable building plugins dependent upon opencv.</para>
+    <para>
+      <option>-DWITHOUT_OPENCV=TRUE</option>: This option instructs the make
+      procedure to disable building plugins dependent upon opencv.
+    </para>
 
-    <para><option>-DWITHOUT_GAVL=TRUE</option>: This option instructs the make
-    procedure to disable building plugins dependent upon gavl.</para>
+    <para>
+      <option>-DWITHOUT_GAVL=TRUE</option>: This option instructs the make
+      procedure to disable building plugins dependent upon gavl.
+    </para>
   </sect2>
 
@@ -132,22 +160,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="melt">
-        <term><command>melt</command></term>
-        <listitem>
-          <para>is a test tool for MLT.</para>
-          <indexterm zone="frei0r melt">
-            <primary sortas="b-melt">melt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: multimedia/libdriv/gavl.xml
===================================================================
--- multimedia/libdriv/gavl.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/gavl.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,10 +30,12 @@
     <title>Introduction to Gavl</title>
 
-    <para><application>Gavl</application> is short for Gmerlin Audio Video
-    Library.  It is a low level library that handles the details of audio and
-    video formats like colorspaces, samplerates, multichannel configurations
-    etc. It provides standardized definitions for those formats as well as
-    container structures for carrying audio samples or video images inside an
-    application.</para>
+    <para>
+      <application>Gavl</application> is short for Gmerlin Audio Video
+      Library.  It is a low level library that handles the details of audio and
+      video formats like colorspaces, samplerates, multichannel configurations
+      etc. It provides standardized definitions for those formats as well as
+      container structures for carrying audio samples or video images inside an
+      application.
+    </para>
 
     &lfs91_checked;
@@ -42,20 +44,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gavl-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&gavl-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&gavl-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&gavl-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &gavl-md5sum;</para>
+        <para>
+          Download MD5 sum: &gavl-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &gavl-size;</para>
+        <para>
+          Download size: &gavl-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &gavl-buildsize;</para>
+        <para>
+          Estimated disk space required: &gavl-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &gavl-time;</para>
+        <para>
+          Estimated build time: &gavl-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -81,6 +95,8 @@
     <title>Installation of Gavl</title>
 
-    <para>Install <application>Gavl</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Gavl</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>LIBS=-lm                      \
@@ -90,7 +106,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</userinput></screen>
@@ -101,10 +121,14 @@
     <title>Command Explanations</title>
 
-    <para><envar>LIBS=-lm</envar>: This variable ensures the math library is 
-    searched when linking.</para>
+    <para>
+      <envar>LIBS=-lm</envar>: This variable ensures the math library is 
+      searched when linking.
+    </para>
 
-    <para><parameter>--without-doxygen</parameter>: This switch disables use of
-    Doxygen. Omit if Doxygen is installed and you wish to build the API
-    documentation.</para>
+    <para>
+      <parameter>--without-doxygen</parameter>: This switch disables use of
+      Doxygen. Omit if Doxygen is installed and you wish to build the API
+      documentation.
+    </para>
 
   </sect2>
@@ -126,5 +150,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -133,7 +157,9 @@
 
       <varlistentry id="libgavl.so">
-        <term>libgavl.so</term>
+        <term><filename class="libraryfile">libgavl.so</filename></term>
         <listitem>
-          <para>???</para>
+          <para>
+            is the Gmerlin Audio Video Library.
+          </para>
           <indexterm zone="gavl libgavl.so">
             <primary sortas="c-libgavl.so">libgavl.so</primary>
@@ -143,5 +169,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: multimedia/libdriv/gstreamer10.xml
===================================================================
--- multimedia/libdriv/gstreamer10.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/gstreamer10.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -80,5 +80,8 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch: <ulink url="&patch-root;/gstreamer-&gstreamer10-version;-buffer_size_reset_fix-1.patch"/></para>
+        <para>
+          Required patch: <ulink
+          url="&patch-root;/gstreamer-&gstreamer10-version;-buffer_size_reset_fix-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -144,9 +147,11 @@
 
     <caution>
-      <para>If you are reinstalling <application>gstreamer</application> from a
-      previous version, it is best if you remove the prior version, including
-      plugins, before installing the new version.  If there is a mixture of
-      versions installed, using processes may hang or not work properly.  As
-      the  <systemitem class="username">root</systemitem> user: </para>
+      <para>
+        If you are reinstalling <application>gstreamer</application> from a
+        previous version, it is best if you remove the prior version, including
+        plugins, before installing the new version.  If there is a mixture of
+        versions installed, using processes may hang or not work properly.  As
+        the  <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="nodump"><userinput>rm -rf /usr/bin/gst-* /usr/{lib,libexec}/gstreamer-1.0</userinput></screen>
Index: multimedia/libdriv/id3lib.xml
===================================================================
--- multimedia/libdriv/id3lib.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/id3lib.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,6 +30,8 @@
     <title>Introduction to id3lib</title>
 
-    <para><application>id3lib</application> is a library for reading,
-    writing and manipulating id3v1 and id3v2 multimedia data containers.</para>
+    <para>
+      <application>id3lib</application> is a library for reading,
+      writing and manipulating id3v1 and id3v2 multimedia data containers.
+    </para>
 
     &lfs91_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&id3lib-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&id3lib-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &id3lib-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &id3lib-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &id3lib-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &id3lib-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&id3lib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&id3lib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &id3lib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &id3lib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &id3lib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &id3lib-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -60,5 +74,6 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patches: <ulink
+        <para>
+          Required patches: <ulink
           url="&patch-root;/id3lib-&id3lib-version;-consolidated_patches-1.patch"/>
         </para>
@@ -74,6 +89,8 @@
     <title>Installation of Id3lib</title>
 
-    <para>Install <application>id3lib</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>id3lib</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../id3lib-&id3lib-version;-consolidated_patches-1.patch &amp;&amp;
@@ -87,7 +104,11 @@
 make</userinput></screen>
 
-    <para>This packages does not come with a working test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This packages 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;
@@ -140,5 +161,7 @@
         <term><command>id3convert</command></term>
         <listitem>
-          <para>converts between id3v1/v2 tagging formats.</para>
+          <para>
+            converts between id3v1/v2 tagging formats.
+          </para>
           <indexterm zone="id3lib id3convert">
             <primary sortas="b-id3convert">id3convert</primary>
@@ -150,5 +173,7 @@
         <term><command>id3cp</command></term>
         <listitem>
-          <para>extracts id3v1/v2 tags from digital audio files.</para>
+          <para>
+            extracts id3v1/v2 tags from digital audio files.
+          </para>
           <indexterm zone="id3lib id3cp">
             <primary sortas="b-id3cp">id3cp</primary>
@@ -160,5 +185,7 @@
         <term><command>id3info</command></term>
         <listitem>
-          <para>prints id3v1/v2 tag contents.</para>
+          <para>
+            prints id3v1/v2 tag contents.
+          </para>
           <indexterm zone="id3lib id3info">
             <primary sortas="b-id3info">id3info</primary>
@@ -170,5 +197,7 @@
         <term><command>id3tag</command></term>
         <listitem>
-          <para>is a utility for editing id3v1/v2 tags.</para>
+          <para>
+            is a utility for editing id3v1/v2 tags.
+          </para>
           <indexterm zone="id3lib id3tag">
             <primary sortas="b-id3tag">id3tag</primary>
@@ -180,6 +209,8 @@
         <term><filename class='libraryfile'>libid3.so</filename></term>
         <listitem>
-          <para>provides functions for the id3v1/v2 tag editing
-          programs as well as other external programs and libraries.</para>
+          <para>
+            provides functions for the id3v1/v2 tag editing programs as well
+            as other external programs and libraries.
+          </para>
           <indexterm zone="id3lib libid3">
             <primary sortas="c-libid3">libid3.so</primary>
Index: multimedia/libdriv/liba52.xml
===================================================================
--- multimedia/libdriv/liba52.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/liba52.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -31,7 +31,9 @@
     <title>Introduction to Liba52</title>
 
-    <para><application>liba52</application> is a free library for decoding
-    ATSC A/52 (also known as AC-3) streams. The A/52 standard is used
-    in a variety of applications, including digital television and DVD.</para>
+    <para>
+      <application>liba52</application> is a free library for decoding
+      ATSC A/52 (also known as AC-3) streams. The A/52 standard is used
+      in a variety of applications, including digital television and DVD.
+    </para>
 
     &lfs91_checked;
@@ -40,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&liba52-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&liba52-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&liba52-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&liba52-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &liba52-md5sum;</para>
+        <para>
+          Download MD5 sum: &liba52-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &liba52-size;</para>
+        <para>
+          Download size: &liba52-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &liba52-buildsize;</para>
+        <para>
+          Estimated disk space required: &liba52-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &liba52-time;</para>
+        <para>
+          Estimated build time: &liba52-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -70,6 +84,8 @@
     <title>Installation of Liba52</title>
 
-    <para>Install <application>liba52</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>liba52</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
@@ -80,8 +96,12 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -94,15 +114,19 @@
     <title>Command Explanations</title>
 
-    <para><parameter>CFLAGS="-g -O2 ...</parameter>: This sets CFLAGS to -g -O2
-    (which is the default) but then on x86_64 adds -fPIC. This is needed to
-    compile <application>liba52</application> on x86_64.</para>
+    <para>
+      <parameter>CFLAGS="-g -O2 ...</parameter>: This sets CFLAGS to -g -O2
+      (which is the default) but then on x86_64 adds -fPIC. This is needed to
+      compile <application>liba52</application> on x86_64.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
-    <para><command>cp liba52/a52_internal.h ...</command>: Copying this header
-    file into /usr/include/a52dec allows some other programs (such as
-    <application>xine-lib</application>) to compile and link against a system
-    installed <application>liba52</application>.</para>
+    <para>
+      <command>cp liba52/a52_internal.h ...</command>: Copying this header
+      file into /usr/include/a52dec allows some other programs (such as
+      <application>xine-lib</application>) to compile and link against a system
+      installed <application>liba52</application>.
+    </para>
   </sect2>
 
@@ -131,5 +155,7 @@
         <term><command>a52dec</command></term>
         <listitem>
-          <para>plays ATSC A/52 audio streams.</para>
+          <para>
+            plays ATSC A/52 audio streams.
+          </para>
           <indexterm zone="liba52 a52dec">
             <primary sortas="b-a52dec">a52dec</primary>
@@ -141,5 +167,7 @@
         <term><command>extract_a52</command></term>
         <listitem>
-          <para>extracts ATSC A/52 audio from an MPEG stream.</para>
+          <para>
+            extracts ATSC A/52 audio from an MPEG stream.
+          </para>
           <indexterm zone="liba52 extract_a52">
             <primary sortas="b-extract_a52">extract_a52</primary>
@@ -151,6 +179,7 @@
         <term><filename class='libraryfile'>liba52.so</filename></term>
         <listitem>
-          <para>provides functions for the programs dealing with
-          ATSC A/52 streams.</para>
+          <para>
+            provides functions for the programs dealing with ATSC A/52 streams.
+          </para>
           <indexterm zone="liba52 liba52-lib">
             <primary sortas="c-liba52">liba52.so</primary>
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libao.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,11 +30,13 @@
     <title>Introduction to Libao</title>
 
-    <para>The <application>libao</application> package contains a
-    cross-platform audio library. This is useful to output audio on a wide
-    variety of platforms. It currently supports WAV files, OSS (Open Sound
-    System), ESD (Enlighten Sound Daemon), ALSA (Advanced Linux Sound
-    Architecture), NAS (Network Audio system), aRTS (analog Real-Time
-    Synthesizer), and PulseAudio (next generation
-    <application>GNOME</application> sound architecture).</para>
+    <para>
+      The <application>libao</application> package contains a
+      cross-platform audio library. This is useful to output audio on a wide
+      variety of platforms. It currently supports WAV files, OSS (Open Sound
+      System), ESD (Enlighten Sound Daemon), ALSA (Advanced Linux Sound
+      Architecture), NAS (Network Audio system), aRTS (analog Real-Time
+      Synthesizer), and PulseAudio (next generation
+      <application>GNOME</application> sound architecture).
+    </para>
 
     &lfs91_checked;
@@ -43,20 +45,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libao-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libao-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libao-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libao-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libao-md5sum;</para>
+        <para>
+          Download MD5 sum: &libao-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libao-size;</para>
+        <para>
+          Download size: &libao-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libao-buildsize;</para>
+        <para>
+          Estimated disk space required: &libao-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libao-time;</para>
+        <para>
+          Estimated build time: &libao-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -79,13 +93,19 @@
     <title>Installation of Libao</title>
 
-    <para>Install <application>libao</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libao</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 &amp;&amp;
@@ -100,6 +120,8 @@
       <title>Config Files</title>
 
-    <para><filename>/etc/libao.conf</filename> and
-    <filename>~/.libao</filename></para>
+    <para>
+      <filename>/etc/libao.conf</filename> and
+      <filename>~/.libao</filename>
+    </para>
 
       <indexterm zone="libao libao-config">
@@ -116,7 +138,9 @@
       <title>Configuration Information</title>
 
-      <para>Currently, the only configuration option available is setting the
-      default output device. Issue <command>man libao.conf</command>
-      for details.</para>
+      <para>
+        Currently, the only configuration option available is setting the
+        default output device. Issue <command>man libao.conf</command>
+        for details.
+      </para>
 
     </sect3>
@@ -147,6 +171,8 @@
         <term><filename class='libraryfile'>libao.so</filename></term>
         <listitem>
-          <para>provides functions for programs wishing to output sound over
-          supported platforms.</para>
+          <para>
+            provides functions for programs wishing to output sound over
+            supported platforms.
+          </para>
           <indexterm zone="libao libao-lib">
             <primary sortas="c-libao">libao.so</primary>
Index: multimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libcanberra.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -126,11 +126,16 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--disable-oss</parameter>: disable optional deprecated OSS
-    support</para>
-
-    <para><option>--disable-gtk</option>: disable optional GTK+ 2 support</para>
-
-    <para><option>--disable-gtk3</option>: disable optional GTK+ 3
-    support</para>
+    <para>
+      <parameter>--disable-oss</parameter>: disable optional deprecated OSS
+      support
+    </para>
+
+    <para>
+      <option>--disable-gtk</option>: disable optional GTK+ 2 support
+    </para>
+
+    <para>
+      <option>--disable-gtk3</option>: disable optional GTK+ 3 support
+    </para>
     <!-- gtk-doc support is broken due to an obsolete command "gtkdoc-mktmpl"
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: multimedia/libdriv/libcddb.xml
===================================================================
--- multimedia/libdriv/libcddb.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libcddb.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to libcddb</title>
 
-    <para>The <application>libcddb</application> is a library that implements
-    the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB
-    server.</para>
+    <para>
+      The <application>libcddb</application> is a library that implements
+      the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB
+      server.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libcddb-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libcddb-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libcddb-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libcddb-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libcddb-md5sum;</para>
+        <para>
+          Download MD5 sum: &libcddb-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libcddb-size;</para>
+        <para>
+          Download size: &libcddb-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libcddb-buildsize;</para>
+        <para>
+          Estimated disk space required: &libcddb-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libcddb-time;</para>
+        <para>
+          Estimated build time: &libcddb-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -65,15 +79,20 @@
     <title>Installation of libcddb</title>
 
-    <para>Install <application>libcddb</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libcddb</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>. Two
-    tests fail due to missing test servers.</para>
+    <para>
+      To test the results, issue: <command>make check</command>. Two
+      tests fail due to missing test servers.
+    </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>
@@ -110,5 +129,7 @@
         <term><command>cddb_query</command></term>
         <listitem>
-          <para>provides a user interface to a CDDB server.</para>
+          <para>
+            provides a user interface to a CDDB server.
+          </para>
           <indexterm zone="libcddb cddb_query">
             <primary sortas="b-cddb_query">cddb_query</primary>
Index: multimedia/libdriv/libcdio.xml
===================================================================
--- multimedia/libdriv/libcdio.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libcdio.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -32,9 +32,11 @@
     <title>Introduction to libcdio</title>
 
-    <para>The <application>libcdio</application> is a library for CD-ROM and CD
-    image access. The associated <application>libcdio-cdparanoia</application>
-    library reads audio from the CD-ROM directly as data, with no analog step
-    between, and writes the data to a file or pipe as .wav, .aifc or as raw 16
-    bit linear PCM.</para>
+    <para>
+      The <application>libcdio</application> is a library for CD-ROM and CD
+      image access. The associated <application>libcdio-cdparanoia</application>
+      library reads audio from the CD-ROM directly as data, with no analog step
+      between, and writes the data to a file or pipe as .wav, .aifc or as raw 16
+      bit linear PCM.
+    </para>
 
     &lfs91_checked;
@@ -43,20 +45,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libcdio-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libcdio-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libcdio-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libcdio-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libcdio-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libcdio-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libcdio-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libcdio-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libcdio-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libcdio-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libcdio-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libcdio-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,6 +80,5 @@
       <listitem>
         <para>
-          Required file:
-          <ulink
+          Required file: <ulink
           url="&gnu-http;/libcdio/&libcdio-paranoia;.tar.bz2"/>
         </para>
@@ -87,18 +100,25 @@
     <title>Installation of libcdio</title>
 
-    <para>Install <application>libcdio</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libcdio</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>
 
-    <para>Now install libcdio-paranoia:</para>
+    <para>
+      Now install libcdio-paranoia:
+    </para>
 
 <screen><userinput>tar -xf ../&libcdio-paranoia;.tar.bz2 &amp;&amp;
@@ -108,8 +128,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</userinput></screen>
@@ -159,5 +182,7 @@
         <term><command>cd-drive</command></term>
         <listitem>
-          <para>shows CD-ROM drive characteristics</para>
+          <para>
+            shows CD-ROM drive characteristics.
+          </para>
           <indexterm zone="libcdio cd-drive">
             <primary sortas="b-cd-drive">cd-drive</primary>
@@ -169,5 +194,7 @@
         <term><command>cd-info</command></term>
         <listitem>
-          <para>shows information about a CD or CD-image</para>
+          <para>
+            shows information about a CD or CD-image.
+          </para>
           <indexterm zone="libcdio cd-info">
             <primary sortas="b-cd-info">cd-info</primary>
@@ -179,6 +206,8 @@
         <term><command>cd-paranoia</command></term>
         <listitem>
-          <para>is an audio CD reading utility which
-             includes extra data verification features</para>
+          <para>
+            is an audio CD reading utility which
+            includes extra data verification features.
+          </para>
           <indexterm zone="libcdio cd-paranoia">
             <primary sortas="b-cd-paranoia">cd-paranoia</primary>
@@ -190,5 +219,7 @@
         <term><command>cd-read</command></term>
         <listitem>
-          <para>reads Information from a CD or CD-image</para>
+          <para>
+            reads Information from a CD or CD-image.
+          </para>
           <indexterm zone="libcdio cd-read">
             <primary sortas="b-cd=read">cd-read</primary>
@@ -200,5 +231,7 @@
         <term><command>cdda-player</command></term>
         <listitem>
-          <para>is a simple curses CD player</para>
+          <para>
+            is a simple curses CD player.
+          </para>
           <indexterm zone="libcdio cdda-player">
             <primary sortas="b-cdda-player">cdda-player</primary>
@@ -210,5 +243,7 @@
         <term><command>iso-info</command></term>
         <listitem>
-          <para>shows Information about an ISO 9660 image</para>
+          <para>
+            shows Information about an ISO 9660 image.
+          </para>
           <indexterm zone="libcdio iso-info">
             <primary sortas="b-iso-info">iso-info</primary>
@@ -220,5 +255,7 @@
         <term><command>iso-read</command></term>
         <listitem>
-          <para>reads portions of an ISO 9660 image</para>
+          <para>
+            reads portions of an ISO 9660 image.
+          </para>
           <indexterm zone="libcdio iso-read">
             <primary sortas="b-iso-read">iso-read</primary>
@@ -230,5 +267,7 @@
         <term><command>mmc-tool</command></term>
         <listitem>
-          <para>issues libcdio multimedia commands</para>
+          <para>
+            issues libcdio multimedia commands.
+          </para>
           <indexterm zone="libcdio mmc-tool">
             <primary sortas="b-mmc-tool">mmc-tool</primary>
@@ -240,5 +279,7 @@
         <term><filename class="libraryfile">libcdio.so</filename></term>
         <listitem>
-          <para>contains the primary cdio API functions</para>
+          <para>
+            contains the primary cdio API functions.
+          </para>
           <indexterm zone="libcdio libcdio.so">
             <primary sortas="c-libcdio.so">libcdio.so</primary>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libdriv.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -16,9 +16,11 @@
   <title>Multimedia Libraries and Drivers</title>
 
-  <para>Many multimedia programs require libraries and/or drivers in order
-  to function properly.  The packages in this section fall into this category.
-  Generally you only need to install these if you are installing a program
-  which has the library listed as either a requirement, or as an option to
-  enable it to support certain functionality.</para>
+  <para>
+    Many multimedia programs require libraries and/or drivers in order
+    to function properly.  The packages in this section fall into this category.
+    Generally you only need to install these if you are installing a program
+    which has the library listed as either a requirement, or as an option to
+    enable it to support certain functionality.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa.xml"/>
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libdv.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,8 +30,10 @@
     <title>Introduction to Libdv</title>
 
-    <para>The Quasar DV Codec (<application>libdv</application>) is a software
-    CODEC for DV video, the encoding format used by most digital
-    camcorders.  It can be used to copy videos from camcorders using a
-    firewire (IEEE 1394) connection.</para>
+    <para>
+      The Quasar DV Codec (<application>libdv</application>) is a software
+      CODEC for DV video, the encoding format used by most digital
+      camcorders.  It can be used to copy videos from camcorders using a
+      firewire (IEEE 1394) connection.
+    </para>
 
     &lfs91_checked;
@@ -40,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libdv-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libdv-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libdv-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libdv-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libdv-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libdv-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libdv-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libdv-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libdv-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libdv-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libdv-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libdv-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -76,6 +90,8 @@
     <title>Installation of Libdv</title>
 
-    <para>Install <application>libdv</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libdv</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
@@ -84,7 +100,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;
@@ -97,11 +117,13 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--disable-xv</parameter>: This parameter is required if
-    an <application>X Window System</application> is not installed.  It also
-    prevents <command>configure</command> testing for
-    <filename class="libraryfile">libXv</filename> which is only used for an
-    obsolete program <command>playdv</command> that will not be built with
-    current <application>linux</application> headers and would also need other
-    obsolete dependencies.</para> <!-- gtk+-1.2, glib+-1.2 -->
+    <para>
+      <parameter>--disable-xv</parameter>: This parameter is required if
+      an <application>X Window System</application> is not installed.  It also
+      prevents <command>configure</command> testing for
+      <filename class="libraryfile">libXv</filename> which is only used for an
+      obsolete program <command>playdv</command> that will not be built with
+      current <application>linux</application> headers and would also need
+      other obsolete dependencies.
+    </para> <!-- gtk+-1.2, glib+-1.2 -->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -133,5 +155,7 @@
         <term><command>dubdv</command></term>
         <listitem>
-          <para>inserts audio into a digital video stream.</para>
+          <para>
+            inserts audio into a digital video stream.
+          </para>
           <indexterm zone="libdv dubdv">
             <primary sortas="b-dubdv">dubdv</primary>
@@ -143,6 +167,8 @@
         <term><command>dvconnect</command></term>
         <listitem>
-          <para>is a small utility to send or capture raw data from and to the
-          camcorder.</para>
+          <para>
+            is a small utility to send or capture raw data from and to the
+            camcorder.
+          </para>
           <indexterm zone="libdv dvconnect">
             <primary sortas="b-dvconnect">dvconnect</primary>
@@ -154,5 +180,7 @@
         <term><command>encodedv</command></term>
         <listitem>
-          <para>encodes a series of images to a digital video stream.</para>
+          <para>
+            encodes a series of images to a digital video stream.
+          </para>
           <indexterm zone="libdv encodedv">
             <primary sortas="b-encodedv">encodedv</primary>
@@ -164,5 +192,7 @@
         <term><command>playdv</command></term>
         <listitem>
-          <para>displays digital video streams on the screen.</para>
+          <para>
+            displays digital video streams on the screen.
+          </para>
           <indexterm zone="libdv playdv">
             <primary sortas="b-playdv">playdv</primary>
@@ -174,6 +204,8 @@
         <term><filename class='libraryfile'>libdv.so</filename></term>
         <listitem>
-          <para>provides functions for programs interacting with the
-          Quasar DV CODEC.</para>
+          <para>
+            provides functions for programs interacting with the
+            Quasar DV CODEC.
+          </para>
           <indexterm zone="libdv libdv-lib">
             <primary sortas="c-libdv">libdv.{so,a}</primary>
Index: multimedia/libdriv/libdvdnav.xml
===================================================================
--- multimedia/libdriv/libdvdnav.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libdvdnav.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to Libdvdnav</title>
 
-    <para><application>libdvdnav</application> is a library that allows easy use
-    of sophisticated DVD navigation features such as DVD menus, multiangle
-    playback and even interactive DVD games.</para>
+    <para>
+      <application>libdvdnav</application> is a library that allows easy use
+      of sophisticated DVD navigation features such as DVD menus, multiangle
+      playback and even interactive DVD games.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libdvdnav-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libdvdnav-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libdvdnav-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libdvdnav-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libdvdnav-md5sum;</para>
+        <para>
+          Download MD5 sum: &libdvdnav-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libdvdnav-size;</para>
+        <para>
+          Download size: &libdvdnav-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libdvdnav-buildsize;</para>
+        <para>
+          Estimated disk space required: &libdvdnav-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libdvdnav-time;</para>
+        <para>
+          Estimated build time: &libdvdnav-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -61,5 +75,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libdvdread"/></para>
+    <para role="required">
+      <xref linkend="libdvdread"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -70,6 +86,8 @@
     <title>Installation of Libdvdnav</title>
 
-    <para>Install <application>libdvdnav</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libdvdnav</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr    \
@@ -78,8 +96,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</userinput></screen>
@@ -120,5 +141,7 @@
         <term><filename class="libraryfile">libdvdnav.so</filename></term>
         <listitem>
-          <para>DVD navigation library.</para>
+          <para>
+            is the DVD navigation library.
+          </para>
           <indexterm zone="libdvdnav libdvdnav-lib">
             <primary sortas="c-libdvdnav">libdvdnav.so</primary>
Index: multimedia/libdriv/libdvdread.xml
===================================================================
--- multimedia/libdriv/libdvdread.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libdvdread.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,6 +30,8 @@
     <title>Introduction to Libdvdread</title>
 
-    <para><application>libdvdread</application> is a library which
-    provides a simple foundation for reading DVDs.</para>
+    <para>
+      <application>libdvdread</application> is a library which
+      provides a simple foundation for reading DVDs.
+    </para>
 
     &lfs91_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libdvdread-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libdvdread-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libdvdread-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libdvdread-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libdvdread-md5sum;</para>
+        <para>
+          Download MD5 sum: &libdvdread-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libdvdread-size;</para>
+        <para>
+          Download size: &libdvdread-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libdvdread-buildsize;</para>
+        <para>
+          Estimated disk space required: &libdvdread-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libdvdread-time;</para>
+        <para>
+          Estimated build time: &libdvdread-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -64,6 +78,8 @@
     <title>Installation of Libdvdread</title>
 
-    <para>Install <application>libdvdread</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libdvdread</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr    \
@@ -72,8 +88,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</userinput></screen>
@@ -113,5 +132,7 @@
         <term><filename class="libraryfile">libdvdread.so</filename></term>
         <listitem>
-          <para>provides functionality required to access DVDs.</para>
+          <para>
+            provides functionality required to access DVDs.
+          </para>
           <indexterm zone="libdvdread libdvdread-lib">
             <primary sortas="c-libdvdread">libdvdread.so</primary>
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libmad.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,6 +30,8 @@
     <title>Introduction to libmad</title>
 
-    <para><application>libmad</application> is a high-quality
-    MPEG audio decoder capable of 24-bit output.</para>
+    <para>
+      <application>libmad</application> is a high-quality
+      MPEG audio decoder capable of 24-bit output.
+    </para>
 
     &lfs91_checked;
@@ -38,20 +40,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libmad-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libmad-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libmad-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libmad-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libmad-md5sum;</para>
+        <para>
+          Download MD5 sum: &libmad-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libmad-size;</para>
+        <para>
+          Download size: &libmad-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libmad-buildsize;</para>
+        <para>
+          Estimated disk space required: &libmad-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libmad-time;</para>
+        <para>
+          Estimated build time: &libmad-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -60,6 +74,8 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/libmad-&libmad-version;-fixes-1.patch"/></para>
+        <para>
+          Required patch: <ulink
+          url="&patch-root;/libmad-&libmad-version;-fixes-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -73,6 +89,8 @@
     <title>Installation of libmad</title>
 
-    <para>Install <application>libmad</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libmad</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../libmad-&libmad-version;-fixes-1.patch                &amp;&amp;
@@ -84,16 +102,24 @@
 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>
 
-    <para>Some packages check for the <application>pkg-config</application> file
-    for <application>libmad</application>. This file is particularly needed so
-    that <application>Cdrdao</application> can recognize the installed
-    <application>libmad</application>.</para>
+    <para>
+      Some packages check for the <application>pkg-config</application> file
+      for <application>libmad</application>. This file is particularly needed
+      so that <application>Cdrdao</application> can recognize the installed
+      <application>libmad</application>.
+    </para>
 
-    <para>As the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      As the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/mad.pc &lt;&lt; "EOF"
@@ -149,5 +175,7 @@
         <term><filename class='libraryfile'>libmad.so</filename></term>
         <listitem>
-          <para>is a MPEG audio decoder library.</para>
+          <para>
+            is a MPEG audio decoder library.
+          </para>
           <indexterm zone="libmad libmad-lib">
             <primary sortas="c-libmad">libmad.so</primary>
Index: multimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libmpeg2.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,10 +30,12 @@
     <title>Introduction to libmpeg2</title>
 
-    <para>The <application>libmpeg2</application> package contains a library
-    for decoding MPEG-2 and MPEG-1 video streams. The library is able to decode
-    all MPEG streams that conform to certain restrictions: <quote>constrained
-    parameters</quote> for MPEG-1, and <quote>main profile</quote> for MPEG-2.
-    This is useful for programs and applications needing to decode MPEG-2 and
-    MPEG-1 video streams.</para>
+    <para>
+      The <application>libmpeg2</application> package contains a library for
+      decoding MPEG-2 and MPEG-1 video streams. The library is able to decode
+      all MPEG streams that conform to certain restrictions: <quote>constrained
+      parameters</quote> for MPEG-1, and <quote>main profile</quote> for MPEG-2.
+      This is useful for programs and applications needing to decode MPEG-2 and
+      MPEG-1 video streams.
+    </para>
 
     &lfs91_checked;
@@ -42,20 +44,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libmpeg2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libmpeg2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libmpeg2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libmpeg2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libmpeg2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libmpeg2-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libmpeg2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libmpeg2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libmpeg2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libmpeg2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libmpeg2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libmpeg2-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -75,6 +89,8 @@
     <title>Installation of libmpeg2</title>
 
-    <para>Install <application>libmpeg2</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libmpeg2</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>sed -i 's/static const/static/' libmpeg2/idct_mmx.c &amp;&amp;
@@ -85,9 +101,13 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. To
-    perform a more comprehensive regression test, see the file
-    <filename>test/README</filename> in the source tree.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>. To
+      perform a more comprehensive regression test, see the file
+      <filename>test/README</filename> in the source tree.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -102,6 +122,8 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i ...</command>: This <command>sed</command> fixes
-    problems with recent GCC compilers.</para>
+    <para>
+      <command>sed -i ...</command>: This <command>sed</command> fixes
+      problems with recent GCC compilers.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -151,5 +173,7 @@
         <term><command>extract_mpeg2</command></term>
         <listitem>
-          <para>extracts MPEG video streams from a multiplexed stream.</para>
+          <para>
+            extracts MPEG video streams from a multiplexed stream.
+          </para>
           <indexterm zone="libmpeg2 extract_mpeg2">
             <primary sortas="b-extract_mpeg2">extract_mpeg2</primary>
@@ -161,5 +185,7 @@
         <term><command>mpeg2dec</command></term>
         <listitem>
-          <para>decodes MPEG1 and MPEG2 video streams.</para>
+          <para>
+            decodes MPEG1 and MPEG2 video streams.
+          </para>
           <indexterm zone="libmpeg2 mpeg2dec">
             <primary sortas="b-mpeg2dec">mpeg2dec</primary>
@@ -171,5 +197,7 @@
         <term><filename class='libraryfile'>libmpeg2.so</filename></term>
         <listitem>
-          <para>contains API functions used to decode MPEG video streams.</para>
+          <para>
+            contains API functions used to decode MPEG video streams.
+          </para>
           <indexterm zone="libmpeg2 libmpeg2-lib">
             <primary sortas="c-libmpeg2">libmpeg2.so</primary>
@@ -181,6 +209,8 @@
         <term><filename class='libraryfile'>libmpeg2convert.so</filename></term>
         <listitem>
-          <para>contains API functions used for color conversions of MPEG
-          video streams.</para>
+          <para>
+            contains API functions used for color conversions of MPEG
+            video streams.
+          </para>
           <indexterm zone="libmpeg2 libmpeg2convert">
             <primary sortas="c-libmpeg2convert">libmpeg2convert.so</primary>
Index: multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libmusicbrainz.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,15 +30,19 @@
     <title>Introduction to libmusicbrainz</title>
 
-    <para>The <application>libmusicbrainz</application> package contains a
-    library which allows you to access the data held on the MusicBrainz server.
-    This is useful for adding MusicBrainz lookup capabilities to other
-    applications.</para>
-
-    <para>MusicBrainz is a community music metadatabase that attempts to create
-    a comprehensive music information site. You can use the MusicBrainz data
-    either by browsing the web site, or you can access the data from a client
-    program &mdash; for example, a CD player program can use MusicBrainz to
-    identify CDs and provide information about the CD, about the artist or
-    other related information.</para>
+    <para>
+      The <application>libmusicbrainz</application> package contains a library
+      which allows you to access the data held on the MusicBrainz server.
+      This is useful for adding MusicBrainz lookup capabilities to other
+      applications.
+    </para>
+
+    <para>
+      MusicBrainz is a community music metadatabase that attempts to create
+      a comprehensive music information site. You can use the MusicBrainz data
+      either by browsing the web site, or you can access the data from a client
+      program &mdash; for example, a CD player program can use MusicBrainz to
+      identify CDs and provide information about the CD, about the artist or
+      other related information.
+    </para>
 
     &lfs91_checked;
@@ -47,20 +51,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libmusicbrainz-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libmusicbrainz-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libmusicbrainz-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libmusicbrainz-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libmusicbrainz-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libmusicbrainz-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libmusicbrainz-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libmusicbrainz-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libmusicbrainz-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libmusicbrainz-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libmusicbrainz-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libmusicbrainz-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -69,6 +85,8 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch"/></para>
+        <para>
+          Required patch: <ulink
+          url="&patch-root;/libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -89,6 +107,8 @@
     <title>Installation of libmusicbrainz</title>
 
-    <para>Install <application>libmusicbrainz</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libmusicbrainz</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch &amp;&amp;
@@ -98,14 +118,20 @@
 make</userinput></screen>
 
-    <para>If <application>Python</application> is installed, build the bindings
-    with the following commands:</para>
+    <para>
+      If <application>Python</application> is installed, build the bindings
+      with the following commands:
+    </para>
 
 <screen><userinput>(cd python &amp;&amp; python setup.py build)</userinput></screen>
 
-    <para>This package does not come with a stand-alone test suite (to
-    test you must have <application>Python</application> installed and perform
-    the test after the package is installed).</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a stand-alone test suite (to
+      test you must have <application>Python</application> installed and perform
+      the test after the package is installed).
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -113,10 +139,14 @@
     /usr/share/doc/libmusicbrainz-&libmusicbrainz-version;/mb_howto.txt</userinput></screen>
 
-    <para>To test the Python bindings, issue the following:
-    <command>(cd python &amp;&amp; python setup.py test)</command>.</para>
-
-    <para>If you built the Python bindings, issue the following commands as
-    the <systemitem class="username">root</systemitem> user to install
-    them:</para>
+    <para>
+      To test the Python bindings, issue the following:
+      <command>(cd python &amp;&amp; python setup.py test)</command>.
+    </para>
+
+    <para>
+      If you built the Python bindings, issue the following commands as
+      the <systemitem class="username">root</systemitem> user to install
+      them:
+    </para>
 
 <screen role="root"><userinput>(cd python &amp;&amp; python setup.py install)</userinput></screen>
@@ -156,6 +186,8 @@
         <term><filename class='libraryfile'>libmusicbrainz.so</filename></term>
         <listitem>
-          <para>contains API functions to access the MusicBrainz database, both
-          for looking up data and also for submitting new data.</para>
+          <para>
+            contains API functions to access the MusicBrainz database, both
+            for looking up data and also for submitting new data.
+          </para>
           <indexterm zone="libmusicbrainz libmusicbrainz-lib">
             <primary sortas="c-libmusicbrainz">libmusicbrainz.{so,a}</primary>
Index: multimedia/libdriv/libogg.xml
===================================================================
--- multimedia/libdriv/libogg.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libogg.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to libogg</title>
 
-    <para>The <application>libogg</application> package contains the Ogg file
-    structure. This is useful for creating (encoding) or playing (decoding) a
-    single physical bit stream.</para>
+    <para>
+      The <application>libogg</application> package contains the Ogg file
+      structure. This is useful for creating (encoding) or playing (decoding) a
+      single physical bit stream.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libogg-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libogg-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libogg-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libogg-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libogg-md5sum;</para>
+        <para>
+          Download MD5 sum: &libogg-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libogg-size;</para>
+        <para>
+          Download size: &libogg-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libogg-buildsize;</para>
+        <para>
+          Estimated disk space required: &libogg-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libogg-time;</para>
+        <para>
+          Estimated build time: &libogg-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,6 +80,8 @@
     <title>Installation of libogg</title>
 
-    <para>Install <application>libogg</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libogg</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr    \
@@ -74,7 +90,11 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -113,6 +133,8 @@
         <term><filename class='libraryfile'>libogg.so</filename></term>
         <listitem>
-          <para>provides the functions required for programs to
-          read or write Ogg formatted bit streams.</para>
+          <para>
+            provides the functions required for programs to
+            read or write Ogg formatted bit streams.
+          </para>
           <indexterm zone="libogg libogg-lib">
             <primary sortas="c-libogg">libogg.so</primary>
Index: multimedia/libdriv/libsamplerate.xml
===================================================================
--- multimedia/libdriv/libsamplerate.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libsamplerate.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -31,6 +31,8 @@
     <title>Introduction to libsamplerate</title>
 
-    <para><application>libsamplerate</application> is a sample rate converter
-    for audio.</para>
+    <para>
+      <application>libsamplerate</application> is a sample rate converter
+      for audio.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libsamplerate-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libsamplerate-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libsamplerate-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libsamplerate-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libsamplerate-md5sum;</para>
+        <para>
+          Download MD5 sum: &libsamplerate-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libsamplerate-size;</para>
+        <para>
+          Download size: &libsamplerate-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libsamplerate-buildsize;</para>
+        <para>
+          Estimated disk space required: &libsamplerate-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libsamplerate-time;</para>
+        <para>
+          Estimated build time: &libsamplerate-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -73,14 +87,19 @@
     <title>Installation of libsamplerate</title>
 
-    <para>Install <application>libsamplerate</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libsamplerate</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>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make htmldocdir=/usr/share/doc/libsamplerate-&libsamplerate-version; install</userinput></screen>
@@ -118,5 +137,7 @@
         <term><command>sndfile-resample</command></term>
         <listitem>
-          <para>is a sample rate converter using libsndfile for file I/O.</para>
+          <para>
+            is a sample rate converter using libsndfile for file I/O.
+          </para>
           <indexterm zone="libsamplerate sndfile-resample">
             <primary sortas="b-sndfile-resample">sndfile-resample</primary>
Index: multimedia/libdriv/libsndfile.xml
===================================================================
--- multimedia/libdriv/libsndfile.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libsndfile.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -41,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libsndfile-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libsndfile-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libsndfile-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libsndfile-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libsndfile-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libsndfile-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libsndfile-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libsndfile-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libsndfile-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libsndfile-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libsndfile-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libsndfile-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -93,5 +105,7 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
     <para>
@@ -145,5 +159,7 @@
         <term><command>sndfile-cmp</command></term>
         <listitem>
-          <para>compares two audio files.</para>
+          <para>
+            compares two audio files.
+          </para>
           <indexterm zone="libsndfile sndfile-cmp">
             <primary sortas="b-sndfile-cmp">sndfile-cmp</primary>
@@ -155,5 +171,7 @@
         <term><command>sndfile-concat</command></term>
         <listitem>
-          <para>concatenates two or more audio files.</para>
+          <para>
+            concatenates two or more audio files.
+          </para>
           <indexterm zone="libsndfile sndfile-concat">
             <primary sortas="b-sndfile-concat">sndfile-concat</primary>
@@ -165,5 +183,7 @@
         <term><command>sndfile-convert</command></term>
         <listitem>
-          <para>converts a sound files from one format to another.</para>
+          <para>
+            converts a sound files from one format to another.
+          </para>
           <indexterm zone="libsndfile sndfile-convert">
             <primary sortas="b-sndfile-convert">sndfile-convert</primary>
@@ -175,5 +195,7 @@
         <term><command>sndfile-deinterleave</command></term>
         <listitem>
-          <para>splits a multi-channel into multiple single channel files.</para>
+          <para>
+            splits a multi-channel into multiple single channel files.
+          </para>
           <indexterm zone="libsndfile sndfile-deinterleave">
             <primary sortas="b-sndfile-deinterleave">sndfile-deinterleave</primary>
@@ -185,5 +207,7 @@
         <term><command>sndfile-info</command></term>
         <listitem>
-          <para>displays information about a sound file.</para>
+          <para>
+            displays information about a sound file.
+          </para>
           <indexterm zone="libsndfile sndfile-info">
             <primary sortas="b-sndfile-info">sndfile-info</primary>
@@ -195,6 +219,7 @@
         <term><command>sndfile-interleave</command></term>
         <listitem>
-          <para>converts multiple single channel files into a multi-channel
-          file.</para>
+          <para>
+            converts multiple single channel files into a multi-channel file.
+          </para>
           <indexterm zone="libsndfile sndfile-interleave">
             <primary sortas="b-sndfile-interleave">sndfile-interleave</primary>
@@ -206,5 +231,7 @@
         <term><command>sndfile-metadata-get</command></term>
         <listitem>
-          <para>retrieves metadata from a sound file.</para>
+          <para>
+            retrieves metadata from a sound file.
+          </para>
           <indexterm zone="libsndfile sndfile-metadata-get">
             <primary sortas="b-sndfile-metadata-get">sndfile-metadata-get</primary>
@@ -216,5 +243,7 @@
         <term><command>sndfile-metadata-set</command></term>
         <listitem>
-          <para>sets metadata in a sound file.</para>
+          <para>
+            sets metadata in a sound file.
+          </para>
           <indexterm zone="libsndfile sndfile-metadata-set">
             <primary sortas="b-sndfile-metadata-set">sndfile-metadata-set</primary>
@@ -226,5 +255,7 @@
         <term><command>sndfile-play</command></term>
         <listitem>
-          <para>plays a sound file.</para>
+          <para>
+            plays a sound file.
+          </para>
           <indexterm zone="libsndfile sndfile-play">
             <primary sortas="b-sndfile-play">sndfile-play</primary>
@@ -236,5 +267,7 @@
         <term><command>sndfile-regtest</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>
+            does this .....
+          </para>
           <indexterm zone="libsndfile sndfile-regtest">
             <primary sortas="b-sndfile-regtest">sndfile-regtest</primary>
@@ -246,5 +279,7 @@
         <term><command>sndfile-salvage</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>
+            does this .....
+          </para>
           <indexterm zone="libsndfile sndfile-salvage">
             <primary sortas="b-sndfile-salvage">sndfile-salvage</primary>
@@ -256,6 +291,7 @@
         <term><filename class='libraryfile'>libsndfile.so</filename></term>
         <listitem>
-          <para>contains the <application>libsndfile</application> API
-          functions.</para>
+          <para>
+            contains the <application>libsndfile</application> API functions.
+          </para>
           <indexterm zone="libsndfile libsndfile-lib">
             <primary sortas="c-libsndfile">libsndfile.so</primary>
Index: multimedia/libdriv/libtheora.xml
===================================================================
--- multimedia/libdriv/libtheora.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libtheora.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -41,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libtheora-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libtheora-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libtheora-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libtheora-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libtheora-md5sum;</para>
+        <para>
+          Download MD5 sum: &libtheora-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libtheora-size;</para>
+        <para>
+          Download size: &libtheora-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libtheora-buildsize;</para>
+        <para>
+          Estimated disk space required: &libtheora-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libtheora-time;</para>
+        <para>
+          Estimated build time: &libtheora-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -88,6 +100,8 @@
     <title>Installation of libtheora</title>
 
-    <para>Install <application>libtheora</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libtheora</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c &amp;&amp;
@@ -95,13 +109,19 @@
 make</userinput></screen>
 
-    <para>If you wish to run the tests, issue: <command>make check</command>.</para>
+    <para>
+      If you wish to run the tests, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you wish to install the examples (so that you can hack on
-    <literal>theora</literal>), install them as the <systemitem
-    class="username">root</systemitem> user:</para>
+    <para>
+      If you wish to install the examples (so that you can hack on
+      <literal>theora</literal>), install them as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>cd examples/.libs &amp;&amp;
@@ -150,6 +170,7 @@
         <term><filename class='libraryfile'>libtheora*.so</filename></term>
         <listitem>
-          <para>libraries provide the functions to read and write video
-          files.</para>
+          <para>
+            contains the functions to read and write video files.
+          </para>
           <indexterm zone="libtheora libtheora-lib">
             <primary sortas="c-libtheora">libtheora*.so</primary>
Index: multimedia/libdriv/libvpx.xml
===================================================================
--- multimedia/libdriv/libvpx.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/libvpx.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to libvpx</title>
 
-    <para>This package, from the WebM project, provides the reference
-    implementations of the VP8 Codec, used in most current html5 video,
-    and of the next-generation VP9 Codec.</para>
+    <para>
+      This package, from the WebM project, provides the reference
+      implementations of the VP8 Codec, used in most current html5 video,
+      and of the next-generation VP9 Codec.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libvpx-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libvpx-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libvpx-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libvpx-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libvpx-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libvpx-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libvpx-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libvpx-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libvpx-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libvpx-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvpx-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvpx-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -83,6 +97,8 @@
     <title>Installation of libvpx</title>
 
-    <para>Install <application>libvpx</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>libvpx</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>sed -i 's/cp -p/cp/' build/make/Makefile &amp;&amp;
@@ -96,8 +112,12 @@
 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>
@@ -108,16 +128,24 @@
     <title>Command Explanations</title>
 
-    <para><command>sed ... </command>: This command
-    corrects ownership and permissions of installed files.</para>
-
-    <para><command>mkdir libvpx-build &amp;&amp; cd
-    libvpx-build</command>: The <application>libvpx</application> developers
-    recommend building in a dedicated build directory.</para>
-
-    <para><option>--disable-vp8</option>: This switch prevents building of VP8
-    codec support.</para>
-
-    <para><option>--disable-vp9</option>: This switch prevents building of VP9
-    codec support.</para>
+    <para>
+      <command>sed ... </command>: This command
+      corrects ownership and permissions of installed files.
+    </para>
+
+    <para>
+      <command>mkdir libvpx-build &amp;&amp; cd libvpx-build</command>:
+      The <application>libvpx</application> developers
+      recommend building in a dedicated build directory.
+    </para>
+
+    <para>
+      <option>--disable-vp8</option>: This switch prevents building of VP8
+      codec support.
+    </para>
+
+    <para>
+      <option>--disable-vp9</option>: This switch prevents building of VP9
+      codec support.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -149,5 +177,7 @@
         <term><command>vpxdec</command></term>
         <listitem>
-          <para>is the WebM Project VP8 and VP9 decoder.</para>
+          <para>
+            is the WebM Project VP8 and VP9 decoder.
+          </para>
           <indexterm zone="libvpx vpxdec">
             <primary sortas="b-vpxdec">vpxdec</primary>
@@ -159,5 +189,7 @@
         <term><command>vpxenc</command></term>
         <listitem>
-          <para>is the WebM project VP8 and VP9 encoder.</para>
+          <para>
+            is the WebM project VP8 and VP9 encoder.
+          </para>
           <indexterm zone="libvpx vpxenc">
             <primary sortas="b-vpxenc">vpxenc</primary>
@@ -169,5 +201,7 @@
         <term><filename class='libraryfile'>libvpx.so</filename></term>
         <listitem>
-          <para>provides functions to use the VP8 and VP9 video codecs.</para>
+          <para>
+            provides functions to use the VP8 and VP9 video codecs.
+          </para>
           <indexterm zone="libvpx libvpx-lib">
             <primary sortas="c-libvpx">libvpx.so</primary>
Index: multimedia/libdriv/mlt.xml
===================================================================
--- multimedia/libdriv/mlt.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/mlt.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,9 +30,11 @@
     <title>Introduction to MLT</title>
 
-    <para><application>MLT</application> package is the Media Lovin Toolkit.
-    It is an open source multimedia framework, designed and developed for
-    television broadcasting. It provides a toolkit for broadcasters, video
-    editors, media players, transcoders, web streamers and many more types of
-    applications.</para>
+    <para>
+      <application>MLT</application> package is the Media Lovin Toolkit.
+      It is an open source multimedia framework, designed and developed for
+      television broadcasting. It provides a toolkit for broadcasters, video
+      editors, media players, transcoders, web streamers and many more types of
+      applications.
+    </para>
 
     &lfs91_checked;
@@ -41,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&mlt-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&mlt-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&mlt-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&mlt-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &mlt-md5sum;</para>
+        <para>
+          Download MD5 sum: &mlt-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &mlt-size;</para>
+        <para>
+          Download size: &mlt-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &mlt-buildsize;</para>
+        <para>
+          Estimated disk space required: &mlt-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &mlt-time;</para>
+        <para>
+          Estimated build time: &mlt-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -90,6 +104,7 @@
     <title>Installation of MLT</title>
 
-    <para>Install <application>MLT</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>MLT</application> by running the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr     \
@@ -100,13 +115,21 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite. However a test .mp4
-    file can be played in a local graphical environment with 
-    <userinput>./src/melt/melt &lt;filename&gt;.mp4</userinput>.</para>
+    <para>
+      This package does not come with a test suite. However a test .mp4
+      file can be played in a local graphical environment with 
+      <command>./src/melt/melt &lt;filename&gt;.mp4</command>.
+    </para>
 
-    <note><para>This application uses advanced graphical capabilites.  In
-    some cases, firmware for your specific graphics adaptor may be needed.
-    See <xref linkend="video-firmware"/> for more information.</para></note>
+    <note>
+      <para>
+        This application uses advanced graphical capabilites.  In
+        some cases, firmware for your specific graphics adaptor may be needed.
+        See <xref linkend="video-firmware"/> for more information.
+      </para>
+    </note>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -143,5 +166,7 @@
         <term><command>melt</command></term>
         <listitem>
-          <para>is a test tool for MLT.</para>
+          <para>
+            is a test tool for MLT.
+          </para>
           <indexterm zone="mlt melt">
             <primary sortas="b-melt">melt</primary>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/sdl.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,7 +30,9 @@
     <title>Introduction to SDL</title>
 
-    <para>The Simple DirectMedia Layer (<application>SDL</application>
-    for short) is a cross-platform library designed to make it easy to write
-    multimedia software, such as games and emulators.</para>
+    <para>
+      The Simple DirectMedia Layer (<application>SDL</application>
+      for short) is a cross-platform library designed to make it easy to write
+      multimedia software, such as games and emulators.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&sdl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sdl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sdl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sdl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sdl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sdl-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&sdl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sdl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sdl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sdl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sdl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sdl-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -84,6 +98,8 @@
     <title>Installation of SDL</title>
 
-    <para>Install <application>SDL</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>SDL</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>sed -e '/_XData32/s:register long:register _Xconst long:' \
@@ -94,5 +110,7 @@
 make</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -107,9 +125,10 @@
     <title>Testing SDL</title>
 
-    <para>If you wish to, test the installation of
-    <application>SDL</application> using the included
-    test programs. It is not required to install any of the resulting binaries
-    to validate the installation. Issue the following commands to build the
-    test programs:</para>
+    <para>
+      If you wish to, test the installation of <application>SDL</application>
+      using the included test programs. It is not required to install any of
+      the resulting binaries to validate the installation. Issue the following
+      commands to build the test programs:
+    </para>
 
 <screen remap="test"><userinput>cd test &amp;&amp;
@@ -117,8 +136,10 @@
 make</userinput></screen>
 
-    <para>You'll need to manually run all the test programs (they are listed in
-    the <filename>README</filename> file in this directory).  Many of them will
-    need to be manually killed, and you'll need to turn your speakers on with
-    the volume at a suitable level.</para>
+    <para>
+      You'll need to manually run all the test programs (they are listed in
+      the <filename>README</filename> file in this directory).  Many of them
+      will need to be manually killed, and you'll need to turn your speakers
+      on with the volume at a suitable level.
+    </para>
 
   </sect2>
@@ -127,19 +148,27 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -e ...</command>: This command fixes compilation with
-    libX11-1.6.0 and later.</para>
+    <para>
+      <command>sed -e ...</command>: This command fixes compilation with
+      libX11-1.6.0 and later.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
-    <para><option>--disable-alsa-shared</option>: This switch disables
-    dynamically loading ALSA shared libraries.</para>
-
-    <para><option>--disable-sdl-dlopen</option>: This switch disables using
-    dlopen for shared object loading. Loading image backend libraries like
-    libpng dynamically on the fly does not work.</para>
-
-    <para><option>--disable-x11-shared</option>: This switch disables
-    dynamically loading X11 shared libraries.</para>
+    <para>
+      <option>--disable-alsa-shared</option>: This switch disables
+      dynamically loading ALSA shared libraries.
+    </para>
+
+    <para>
+      <option>--disable-sdl-dlopen</option>: This switch disables using
+      dlopen for shared object loading. Loading image backend libraries like
+      libpng dynamically on the fly does not work.
+    </para>
+
+    <para>
+      <option>--disable-x11-shared</option>: This switch disables
+      dynamically loading X11 shared libraries.
+    </para>
 
   </sect2>
@@ -181,7 +210,9 @@
         <term><command>sdl-config</command></term>
         <listitem>
-          <para>determines the compile and linker flags that should be used to
-          compile and link programs that use
-          <filename class='libraryfile'>libSDL</filename>.</para>
+          <para>
+            determines the compile and linker flags that should be used to
+            compile and link programs that use
+            <filename class='libraryfile'>libSDL</filename>.
+          </para>
           <indexterm zone="sdl sdl-config">
             <primary sortas="b-sdl-config">sdl-config</primary>
@@ -193,7 +224,9 @@
         <term><filename class='libraryfile'>libSDL.so</filename></term>
         <listitem>
-          <para> library provides low level access to audio, keyboard, mouse,
-          joystick, 3D hardware via OpenGL, and
-          2D frame buffer across multiple platforms.</para>
+          <para>
+            contains functions that provide low level access to audio,
+            keyboard, mouse, joystick, 3D hardware via OpenGL, and
+            2D frame buffer across multiple platforms.
+          </para>
           <indexterm zone="sdl libsdl">
             <primary sortas="c-libsdl">libSDL.so</primary>
Index: multimedia/libdriv/sdl2.xml
===================================================================
--- multimedia/libdriv/sdl2.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/sdl2.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,8 +30,9 @@
     <title>Introduction to SDL2</title>
 
-    <para>The Simple DirectMedia Layer Version 2
-    (<application>SDL2</application> for short) is a cross-platform library
-    designed to make it easy to write multimedia software, such as games and
-    emulators.</para>
+    <para>
+      The Simple DirectMedia Layer Version 2 (<application>SDL2</application>
+      for short) is a cross-platform library designed to make it easy to write
+      multimedia software, such as games and emulators.
+    </para>
 
     &lfs91_checked;
@@ -40,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&sdl2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sdl2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sdl2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sdl2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sdl2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sdl2-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&sdl2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sdl2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sdl2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sdl2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sdl2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sdl2-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -92,6 +105,8 @@
     <title>Installation of SDL2</title>
 
-    <para>First, if you are building on a 32-bit i686 system, apply a patch
-    containing a fix for the OpenGL headers and their data types:</para>
+    <para>
+      First, if you are building on a 32-bit i686 system, apply a patch
+      containing a fix for the OpenGL headers and their data types:
+    </para>
 
 <screen><userinput remap="pre">case $(uname -m) in
@@ -99,6 +114,8 @@
 esac</userinput></screen>
 
-    <para>Install <application>SDL2</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>SDL2</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
@@ -115,16 +132,22 @@
 
     <note>
-      <para>If you wish to build and run the package regression
-      tests, do not delete the static libraries below until after
-      the tests are built.</para>
+      <para>
+        If you wish to build and run the package regression
+        tests, do not delete the static libraries below until after
+        the tests are built.
+      </para>
     </note>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install              &amp;&amp;
 rm -v /usr/lib/libSDL2*.a</userinput></screen>
 
-    <para>If you built the documentation, install it as the <systemitem
-    class="username">root</systemitem> user:</para>
+    <para>
+      If you built the documentation, install it as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"
@@ -139,10 +162,10 @@
     <title>Testing SDL2</title>
 
-    <para>If you wish to, test the installation of
-    <application>SDL2</application> using the included
-    test programs. 
-    None of the resulting binaries need to be installed.
-    Issue the following commands to build the
-    test programs:</para>
+    <para>
+      If you wish to, test the installation of <application>SDL2</application>
+      using the included test programs.  None of the resulting binaries need
+      to be installed.  Issue the following commands to build the test
+      programs:
+    </para>
 
 <screen><userinput>cd test &amp;&amp;
@@ -150,8 +173,10 @@
 make</userinput></screen>
 
-    <para>Each of the test programs (they are listed in the
-    <filename>README</filename> file in this directory) will need to be run
-    individually.  Many of them will need to be manually killed. Additionally,
-    speakers need to be on with the volume at a suitable level.</para>
+    <para>
+      Each of the test programs (they are listed in the
+      <filename>README</filename> file in this directory) will need to be run
+      individually.  Many of them will need to be manually killed. Additionally,
+      speakers need to be on with the volume at a suitable level.
+    </para>
 
   </sect2>
@@ -160,17 +185,25 @@
     <title>Command Explanations</title>
 
-    <para><command>rm -v /usr/lib/libSDL2*.a</command>: Normally 
-    static libraries can be disabled with a <option>--disable-static</option>
-    option to configure, but that breaks the build in this package.</para>
-
-    <para><option>--disable-alsa-shared</option>: This switch disables
-    dynamically loading ALSA shared libraries.</para>
-
-    <para><option>--disable-sdl-dlopen</option>: This switch disables using
-    dlopen for shared object loading. Loading image backend libraries like
-    libpng dynamically on the fly does not work.</para>
-
-    <para><option>--disable-x11-shared</option>: This switch disables
-    dynamically loading X11 shared libraries.</para>
+    <para>
+      <command>rm -v /usr/lib/libSDL2*.a</command>: Normally 
+      static libraries can be disabled with a <option>--disable-static</option>
+      option to configure, but that breaks the build in this package.
+    </para>
+
+    <para>
+      <option>--disable-alsa-shared</option>: This switch disables
+      dynamically loading ALSA shared libraries.
+    </para>
+
+    <para>
+      <option>--disable-sdl-dlopen</option>: This switch disables using
+      dlopen for shared object loading. Loading image backend libraries like
+      libpng dynamically on the fly does not work.
+    </para>
+
+    <para>
+      <option>--disable-x11-shared</option>: This switch disables
+      dynamically loading X11 shared libraries.
+    </para>
 
   </sect2>
@@ -213,7 +246,9 @@
         <term><command>sdl2-config</command></term>
         <listitem>
-          <para>determines the compile and linker flags that should be used to
-          compile and link programs that use
-          <filename class='libraryfile'>libSDL2</filename>.</para>
+          <para>
+            determines the compile and linker flags that should be used to
+            compile and link programs that use
+            <filename class='libraryfile'>libSDL2</filename>.
+          </para>
           <indexterm zone="sdl2 sdl2-config">
             <primary sortas="b-sdl2-config">sdl2-config</primary>
@@ -225,7 +260,9 @@
         <term><filename class='libraryfile'>libSDL2.so</filename></term>
         <listitem>
-          <para> library provides low level access to audio, keyboard, mouse,
-          joystick, 3D hardware via OpenGL, and
-          2D frame buffer across multiple platforms.</para>
+          <para>
+            contains functions that provide low level access to audio,
+            keyboard, mouse, joystick, 3D hardware via OpenGL, and
+            2D frame buffer across multiple platforms.
+          </para>
           <indexterm zone="sdl2 libsdl2">
             <primary sortas="c-libsdl2">libSDL2.so</primary>
Index: multimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/speex.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -38,8 +38,10 @@
     <title>Introduction to Speex</title>
 
-    <para><application>Speex</application> is an audio compression format
-    designed especially for speech. It is well-adapted to internet applications
-    and provides useful features that are not present in most other
-    CODECs.</para>
+    <para>
+      <application>Speex</application> is an audio compression format
+      designed especially for speech. It is well-adapted to internet
+      applications and provides useful features that are not present in most
+      other CODECs.
+    </para>
 
     &lfs91_checked;
@@ -48,20 +50,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&speex-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&speex-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &speex-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &speex-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &speex-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &speex-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&speex-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&speex-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &speex-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &speex-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &speex-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &speex-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -70,20 +84,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&speexdsp-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&speexdsp-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &speexdsp-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &speexdsp-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &speexdsp-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &speexdsp-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&speexdsp-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&speexdsp-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &speexdsp-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &speexdsp-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &speexdsp-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &speexdsp-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -119,9 +145,13 @@
     <title>Installation of Speex</title>
 
-    <para>This package consists of two separate tarballs.
-    They need to be extracted and built independently.</para>
-
-    <para>Install <application>Speex</application> by running the
-    following commands:</para>
+    <para>
+      This package consists of two separate tarballs.
+      They need to be extracted and built independently.
+    </para>
+
+    <para>
+      Install <application>Speex</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr    \
@@ -130,11 +160,17 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>As the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      As the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>Now extract and install the speexdsp package:</para>
+    <para>
+      Now extract and install the speexdsp package:
+    </para>
 
 <screen><userinput>cd ..                          &amp;&amp;
@@ -147,5 +183,7 @@
 make</userinput></screen>
 
-    <para>Again, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Again, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -191,6 +229,8 @@
         <term><command>speexdec</command></term>
         <listitem>
-          <para>decodes a <application>Speex</application> file and
-          produces a WAV or raw file.</para>
+          <para>
+            decodes a <application>Speex</application> file and
+            produces a WAV or raw file.
+          </para>
           <indexterm zone="speex speexdec">
             <primary sortas="b-speexdec">speexdec</primary>
@@ -202,6 +242,7 @@
         <term><command>speexenc</command></term>
         <listitem>
-          <para>encodes a WAV or raw files using
-          <application>Speex</application>.</para>
+          <para>
+            encodes a WAV or raw files using <application>Speex</application>.
+          </para>
           <indexterm zone="speex speexenc">
             <primary sortas="b-speexenc">speexenc</primary>
@@ -213,5 +254,7 @@
         <term><filename class='libraryfile'>libspeex.so</filename></term>
         <listitem>
-          <para>provides functions for the audio encoding/decoding programs.</para>
+          <para>
+            provides functions for the audio encoding/decoding programs.
+          </para>
           <indexterm zone="speex libspeex">
             <primary sortas="c-libspeex">libspeex.so</primary>
@@ -223,6 +266,8 @@
         <term><filename class='libraryfile'>libspeexdsp.so</filename></term>
         <listitem>
-          <para>is a speech processing library that goes along with the
-          <application>Speex</application> codec.</para>
+          <para>
+            is a speech processing library that goes along with the
+            <application>Speex</application> codec.
+          </para>
           <indexterm zone="speex libspeexdsp">
             <primary sortas="c-libspeexdsp">libspeexdsp.so</primary>
Index: multimedia/libdriv/taglib.xml
===================================================================
--- multimedia/libdriv/taglib.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/taglib.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -88,6 +88,8 @@
     <title>Installation of Taglib</title>
 
-    <para>Install <application>Taglib</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Taglib</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/xine-lib.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -43,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xine-lib-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xine-lib-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xine-lib-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xine-lib-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xine-lib-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xine-lib-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&xine-lib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xine-lib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xine-lib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xine-lib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xine-lib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xine-lib-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -130,10 +142,14 @@
 make</userinput></screen>
 
-    <para>To create the API documentation, <application>Doxygen</application>
-    must be installed and issue the following command:</para>
+    <para>
+      To create the API documentation, <application>Doxygen</application>
+      must be installed and issue the following command:
+    </para>
 
 <screen remap="doc"><userinput>doxygen doc/Doxyfile</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>
@@ -143,14 +159,18 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <note><para>
-      When installing, the Makefile does some additional
-      linking.  If you do not have Xorg in /usr, the LIBRARY_PATH
-      variable needs to be defined for the root user.  If
-      using sudo to assume root, use the -E option to pass
-      your current environment variables for the install process.
-    </para></note>
-
-    <para>If you built the API documentation, issue the following commands as
-    the <systemitem class="username">root</systemitem> user to install it:</para>
+    <note>
+      <para>
+        When installing, the Makefile does some additional
+        linking.  If you do not have Xorg in /usr, the LIBRARY_PATH
+        variable needs to be defined for the root user.  If
+        using sudo to assume root, use the -E option to pass
+        your current environment variables for the install process.
+      </para>
+    </note>
+
+    <para>
+      If you built the API documentation, issue the following commands as
+      the <systemitem class="username">root</systemitem> user to install it:
+    </para>
 
 <screen role="root"
@@ -249,5 +269,7 @@
         <term><filename class='libraryfile'>libxine.so</filename></term>
         <listitem>
-          <para> provides the API for processing audio/video files.</para>
+          <para>
+            provides the API for processing audio/video files.
+          </para>
           <indexterm zone="xine-lib libxine">
             <primary sortas="c-libxine">libxine.so</primary>
Index: multimedia/libdriv/xvid.xml
===================================================================
--- multimedia/libdriv/xvid.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/libdriv/xvid.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -30,6 +30,7 @@
   <title>Introduction to XviD</title>
 
-    <para><application>XviD</application> is an MPEG-4
-    compliant video CODEC.</para>
+    <para>
+      <application>XviD</application> is an MPEG-4 compliant video CODEC.
+    </para>
 
     &lfs91_checked;
@@ -38,20 +39,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xvid-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&xvid-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&xvid-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&xvid-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &xvid-md5sum;</para>
+        <para>
+          Download MD5 sum: &xvid-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &xvid-size;</para>
+        <para>
+          Download size: &xvid-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &xvid-buildsize;</para>
+        <para>
+          Estimated disk space required: &xvid-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &xvid-time;</para>
+        <para>
+          Estimated build time: &xvid-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -70,10 +83,16 @@
     <title>Installation of XviD</title>
 
-    <note><para>This package tarball expands to <filename
-    class='directory'>xvidcore</filename>, not the expected <filename
-    class='directory'>xvidcore-&xvid-version;</filename>.</para></note>
+    <note>
+      <para>
+      This package tarball expands to <filename
+      class='directory'>xvidcore</filename>, not the expected <filename
+      class='directory'>xvidcore-&xvid-version;</filename>.
+      </para>
+    </note>
 
-    <para>Install <application>XviD</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>XviD</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>cd build/generic &amp;&amp;
@@ -82,7 +101,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>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile &amp;&amp;
@@ -90,7 +113,4 @@
 
 chmod -v 755 /usr/lib/libxvidcore.so.4.3 &amp;&amp;
-<!-- Not necessary anymore, make install already creates them
-ln -v -sf libxvidcore.so.4.3 /usr/lib/libxvidcore.so.4 &amp;&amp;
-ln -v -sf libxvidcore.so.4   /usr/lib/libxvidcore.so   &amp;&amp;-->
 install -v -m755 -d /usr/share/doc/xvidcore-&xvid-version;/examples &amp;&amp;
 install -v -m644 ../../doc/* /usr/share/doc/xvidcore-&xvid-version; &amp;&amp;
@@ -103,20 +123,14 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's/^LN_S=@LN_S@/&amp; -f -v/' platform.inc.in</command>:
-    Fix error during <command>make install</command> if reintalling
-    or upgrading.</para>
+    <para>
+      <command>sed -i 's/^LN_S=@LN_S@/&amp; -f -v/' platform.inc.in</command>:
+      Fix error during <command>make install</command> if reintalling
+      or upgrading.
+    </para>
 
-    <para><command>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile</command>:
-    This command disables installing the static library.</para>
-
-<!-- see comment after chmod -v 755
-    <para><command>ln -v -sf libxvidcore.so.4 /usr/lib/libxvidcore.so</command>:
-    This command makes applications linked against
-    <filename class="libraryfile">.so</filename> names, link to
-    <filename class="libraryfile">.so.<replaceable>&lt;MAJOR&gt;</replaceable></filename>.
-    This ensures better binary compatibility, as
-    <application>XviD</application> developers take care not changing the
-    <replaceable>&lt;MAJOR&gt;</replaceable> number until there is an incompatible
-    ABI change.</para>-->
+    <para>
+      <command>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile</command>:
+      This command disables installing the static library.
+    </para>
 
   </sect2>
@@ -145,6 +159,8 @@
       <term><filename class='libraryfile'>libxvidcore.so</filename></term>
       <listitem>
-        <para>provides functions to encode and decode most
-        MPEG-4 video data.</para>
+        <para>
+          provides functions to encode and decode most
+          MPEG-4 video data.
+        </para>
         <indexterm zone="xvid libxvidcore">
           <primary sortas="c-libxvidcore">libxvidcore.so</primary>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 22618785217f3294e548a12a953b98b2a48d6dff)
+++ multimedia/videoutils/mplayer.xml	(revision 2eeb86959e7a22fa35944696cd0deaa884edfe22)
@@ -85,5 +85,7 @@
       <title>Required Patch</title>
       <listitem>
-        <para><ulink url="&patch-root;/MPlayer-1.3.0-x264_fix-1.patch"/></para>
+        <para>
+          <ulink url="&patch-root;/MPlayer-1.3.0-x264_fix-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -418,7 +420,11 @@
       </para>
 
-      <note><para>To play a DVD, it may be useful to ensure a /dev/dvd
-      device is created.  You may need to set this up as described in
-      <xref linkend="dev-dvd"/>.</para></note>
+      <note>
+        <para>
+          To play a DVD, it may be useful to ensure a /dev/dvd
+          device is created.  You may need to set this up as described in
+          <xref linkend="dev-dvd"/>.
+        </para>
+      </note>
 
       <indexterm zone="mplayer mplayer-config">
@@ -492,5 +498,7 @@
         <term><command>mplayer</command></term>
         <listitem>
-          <para> is the main MPlayer video player.</para>
+          <para>
+            is the main MPlayer video player.
+          </para>
           <indexterm zone="mplayer mplayer-prog">
             <primary sortas="b-mplayer">mplayer</primary>
