Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 4c77a94985dc8996e756bc32243eab9714c64d12)
+++ xsoft/other/thunderbird.xml	(revision d41c02bf616064b6adc2e8b1ba404547e51fe3a3)
@@ -9,6 +9,6 @@
   <!ENTITY thunderbird-download-ftp
   "ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
-  <!ENTITY thunderbird-md5sum            "624bef982d7ac610b1175737d9905150">
-  <!ENTITY thunderbird-size              "93 MB">
+  <!ENTITY thunderbird-md5sum            "1d7127a3282e62d95eb9b59d47291b70">
+  <!ENTITY thunderbird-size              "97 MB">
   <!ENTITY thunderbird-buildsize         "3 GB (46 MB installed)">
   <!ENTITY thunderbird-time              "26 SBU">
@@ -33,6 +33,8 @@
     <title>Introduction to Thunderbird</title>
 
-    <para><application>Thunderbird</application> is a stand-alone mail/news
-    client based on the <application>Mozilla</application> codebase.</para>
+    <para>
+      <application>Thunderbird</application> is a stand-alone mail/news client
+      based on the <application>Mozilla</application> codebase.
+    </para>
 
     &lfs71_checked;
@@ -41,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&thunderbird-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&thunderbird-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &thunderbird-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &thunderbird-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &thunderbird-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &thunderbird-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&thunderbird-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&thunderbird-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &thunderbird-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &thunderbird-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &thunderbird-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &thunderbird-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -63,29 +77,43 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>
-    <xref linkend="zip"/> and <xref linkend="unzip"/></para>
-
-    <para>Note: <application>libjpeg</application> and
-    <application>libpng</application> (patched for apng support) should have
-    been installed before <application>gdk-pixbuf</application> and should
-    exist on your system. If for some strange reason you haven&apos;t installed
-    them, you should remove the <option>--with-system-jpeg</option> and
-    <option>--with-system-png</option> options from the
-    <filename>mozconfig</filename> file created below.</para>
+    <para role="required">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="zip"/> and
+      <xref linkend="unzip"/>
+    </para>
+
+    <para>
+      Note: <application>libjpeg</application> and
+      <application>libpng</application> (patched for apng support) should have
+      been installed before <application>gdk-pixbuf</application> and should
+      exist on your system. If for some strange reason you haven't installed
+      them, you should remove the <option>--with-system-jpeg</option> and
+      <option>--with-system-png</option> options from the
+      <filename>mozconfig</filename> file created below.
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="dbus-glib"/>,
-    <xref linkend="doxygen"/>, <xref linkend="gnome-vfs"/> and
-    <xref linkend="libgnomeui"/> (for gnome integration),
-    <xref linkend="libnotify"/>, <xref linkend="nss"/>, <xref linkend="nspr"/>,
-    <xref linkend="startup-notification"/>, <xref linkend="sqlite"/>,
-    <xref linkend="yasm"/> (or <xref linkend="libvpx"/>),
-    <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
-    <ulink url="http://libevent.org/">Libevent</ulink>,
-    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
-    the jemalloc code), and <xref linkend="wget"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/Thunderbird"/></para>
+    <para role="optional">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="gnome-vfs"/> and <xref linkend="libgnomeui"/>
+      (for integration with the old version of <application>Gnome</application>),
+      <xref linkend="libnotify"/>,
+      <xref linkend="nss"/>,
+      <xref linkend="nspr"/>,
+      <xref linkend="startup-notification"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="yasm"/> (or <xref linkend="libvpx"/>),
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
+      <ulink url="http://libevent.org/">Libevent</ulink>,
+      <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
+      the jemalloc code) and
+      <xref linkend="wget"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/Thunderbird"/>
+    </para>
   </sect2>
 
@@ -93,11 +121,13 @@
     <title>Installation of Thunderbird</title>
 
-    <para>The configuration of <application>Thunderbird</application> is
-    accomplished by creating a <filename>mozconfig</filename> file containing
-    the desired configuration options. A default <filename>mozconfig</filename>
-    is created below. To see the entire list of available configuration options
-    (and an abbreviated description of each one), issue
-    <command>./configure --help</command>. Create the file by issuing the
-    following command:</para>
+    <para>
+      The configuration of <application>Thunderbird</application> is
+      accomplished by creating a <filename>mozconfig</filename> file containing
+      the desired configuration options. A default
+      <filename>mozconfig</filename> is created below. To see the entire list of
+      available configuration options (and a brief description of each), issue
+      <command>./configure --help</command>. Create the file with the following
+      command:
+    </para>
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
@@ -144,6 +174,8 @@
 EOF</userinput></screen>
 
-    <para>Compile <application>Thunderbird</application> by issuing the
-    following commands:</para>
+    <para>
+      Compile <application>Thunderbird</application> by issuing the following
+      commands:
+    </para>
 
 <screen><userinput>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' \
@@ -152,9 +184,12 @@
 make -C thunderbuild/mail/installer</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Install <application>Thunderbird</application> by running the
-    following commands as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Install <application>Thunderbird</application> by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>mkdir -p /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
@@ -166,29 +201,36 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's#VPX_CODEC_USE ...</command>: This fixes
-    mozilla&apos;s <command>configure</command> script to properly detect
-    libvpx-v1.0.0. This sed is not needed if you have libvpx-v0.9.7 or earlier
-    installed or if you&apos;ve not installed <xref linkend="libvpx"/>.</para>
-
-    <para><command>make -f client.mk</command>: Mozilla products are packaged
-    to allow the use of a configuration file which can be used to pass the
-    configuration settings to the <command>configure</command> command.
-    <command>make</command> uses the <filename>client.mk</filename>
-    file to get initial configuration and setup parameters.</para>
-
-    <para><command>make -C thunderbuild/mail/installer</command>: this runs make
-    in the <filename class="directory">thunderbuild/mail/installer</filename>
-    folder. This gathers together all the parts of
-    <application>Thunderbird</application> and compresses them into a
-    tarball.</para>
-
-    <para><command>tar -xfv thunderbuild/mozilla/dist ...</command>: This
-    untars <application>Thunderbird</application>, the <option>-C</option>
-    option uncompresses the files in
-    /usr/lib/thunderbird-&thunderbird-version;. The
-    <option>--strip-components=1</option> option removes the leading
-    &apos;thunderbird&apos; directory from the filenames, allowing us to untar
-    it into a versioned directory.<!-- Running <command>make -C thunderbuild
-    install</command> would install an additional 480 MB of files--></para>
+    <para>
+      <command>sed -i 's#VPX_CODEC_USE_INPUT_PARTITION ...</command>: This fixes
+      mozilla's <command>configure</command> script to properly detect
+      <xref linkend="libvpx"/>. This sed is not needed if you have libvpx-v0.9.7
+      or earlier installed or if you've not installed
+      <application>Libvpx</application>.
+    </para>
+
+    <para>
+      <command>make -f client.mk</command>: Mozilla products are packaged to
+      allow the use of a configuration file which can be used to pass the
+      configuration settings to the <command>configure</command> command.
+      <command>make</command> uses the <filename>client.mk</filename> file to
+      get initial configuration and setup parameters.
+    </para>
+
+    <para>
+      <command>make -C thunderbuild/mail/installer</command>: this runs make in
+      the <filename class="directory">thunderbuild/mail/installer</filename>
+      folder. This gathers together all the parts of
+      <application>Thunderbird</application> and compresses them into a tarball.
+    </para>
+
+    <para>
+      <command>tar -xfv thunderbuild/mozilla/dist ...</command>: This untars
+      <application>Thunderbird</application>, the <option>-C</option> option
+      uncompresses the files in
+      <filename class="directory">/usr/lib/thunderbird-&thunderbird-version;</filename>.
+      The <option>--strip-components=1</option> option removes the leading
+      'thunderbird' directory from the filenames, allowing us to untar it into a
+      versioned directory.
+    </para>
   </sect2>
 
@@ -198,47 +240,56 @@
     <sect3><title>Configuration Information</title>
 
-      <para>If your Window or Desktop Manager does not allow you to configure
-      a default browser, you can add a configuration parameter to
-      <application>Thunderbird</application> so that a browser will start when
-      when you click on an Internet/intranet/local URL. The procedure to check
-      or modify any of the configuration parameters is quite simple and the
-      instructions here can be used to view or modify any of the
-      parameters.</para>
-
-      <para>First, open the configuration dialog by opening the
-      <quote>Edit</quote> drop-down menu. Choose <quote>Preferences</quote>
-      and then click on the <quote>Advanced</quote> icon on the top menu
-      bar. Choose the <quote>General</quote> tab and click on the
-      <quote>Config Editor</quote> button. This will display a list of the
-      configuration preferences and information related to each one. You can
-      use the <quote>Filter:</quote> bar to enter search criteria and narrow
-      down the listed items. Changing a preference can be done using two
-      methods. One, if the preference has a boolean value (True/False), simply
-      double-click on the preference to toggle the value and two, for other
-      preferences simply right-click on the desired line, choose
-      <quote>Modify</quote> from the menu and change the value. Creating new
-      preference items is accomplished in the same way, except choose
-      <quote>New</quote> from the menu and provide the desired data into the
-      fields when prompted.</para>
-
-      <para>The configuration preference item you need to check so that
-      <application>Thunderbird</application> uses a specified browser is the
-      <parameter>network.protocol-handler.app.http</parameter> which should
-      be set to the path of the desired browser, e.g.,
-      <option>/usr/bin/firefox</option>.</para>
+      <para>
+        If your Window or Desktop Manager does not allow you to configure a
+        default browser, you can add a configuration parameter to
+        <application>Thunderbird</application> so that a browser will start when
+        when you click on an Internet/intranet/local URL. The procedure to check
+        or modify any of the configuration parameters is quite simple and the
+        instructions here can be used to view or modify any of the parameters.
+      </para>
+
+      <para>
+        First, open the configuration dialog by opening the <quote>Edit</quote>
+        drop-down menu. Choose <quote>Preferences</quote> and then click on the
+        <quote>Advanced</quote> icon on the top menu bar. Choose the
+        <quote>General</quote> tab and click on the <quote>Config Editor</quote>
+        button. This will display a list of the configuration preferences and
+        information related to each one. You can use the <quote>Filter:</quote>
+        bar to enter search criteria and narrow down the listed items. Changing
+        a preference can be done using two methods. One, if the preference has a
+        boolean value (True/False), simply double-click on the preference to
+        toggle the value and two, for other preferences simply right-click on
+        the desired line, choose <quote>Modify</quote> from the menu and change
+        the value. Creating new preference items is accomplished in the same
+        way, except choose <quote>New</quote> from the menu and provide the
+        desired data into the fields when prompted.
+      </para>
+
+      <para>
+        The configuration preference item you need to check so that
+        <application>Thunderbird</application> uses a specified browser is the
+        <parameter>network.protocol-handler.app.http</parameter> which should be
+        set to the path of the desired browser, e.g.
+        <option>/usr/bin/firefox</option>.
+      </para>
 
     <tip>
-      <para>There is a multitude of configuration parameters you can tweak to
-      customize <application>Thunderbird</application>. A very extensive, but
-      not so up-to-date list of these parameters can be found at <ulink
-      url="http://preferential.mozdev.org/preferences.html"/>.</para>
+      <para>
+        There is a multitude of configuration parameters you can tweak to
+        customize <application>Thunderbird</application>. A very extensive, but
+        not so up-to-date list of these parameters can be found at
+        <ulink url="http://preferential.mozdev.org/preferences.html"/>.
+      </para>
     </tip>
 
-    <para>If you use a desktop environment like <application>Gnome</application>
-    or <application>KDE</application> you may wish to create a
-    thunderbird.desktop file so that <application>Thunderbird</application>
-    appears in the panel&apos;s menus. If you didn&apos;t enable
-    startup-notification in your mozconfig change the StartupNotify line to
-    false. As the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you use a desktop environment like <application>Gnome</application> or
+      <application>KDE</application> you may wish to create a
+      <filename>thunderbird.desktop</filename> file so that
+      <application>Thunderbird</application> appears in the panel's menus. If
+      you didn't enable startup-notification in your mozconfig change the
+      StartupNotify line to false. As the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF"
@@ -269,7 +320,8 @@
       <seglistitem>
         <seg>thunderbird</seg>
-        <seg>Numerous libraries, email/newsgroups components, plugins,
-        extensions, and helper modules installed in <filename
-        class="directory">/usr/lib/thunderbird-&thunderbird-version;</filename>
+        <seg>
+          Numerous libraries, email/newsgroups components, plugins, extensions,
+          and helper modules installed in <filename
+          class="directory">/usr/lib/thunderbird-&thunderbird-version;</filename>
         </seg>
         <seg>/usr/lib/thunderbird-&thunderbird-version;</seg>
@@ -285,6 +337,8 @@
         <term><command>thunderbird</command></term>
         <listitem>
-          <para>is <application>Mozilla</application>&apos;s next-generation
-          email and newsgroup client.</para>
+          <para>
+            is <application>Mozilla</application>'s next-generation email and
+            newsgroup client.
+          </para>
           <indexterm zone="thunderbird thunderbird-prog">
             <primary sortas="b-thunderbird">thunderbird</primary>
