Index: archive/gmime.xml
===================================================================
--- archive/gmime.xml	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
+++ archive/gmime.xml	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gmime-download-http "&gnome-download-http;/gmime/2.6/gmime-&gmime-version;.tar.xz">
+  <!ENTITY gmime-download-ftp  "&gnome-download-ftp;/gmime/2.6/gmime-&gmime-version;.tar.xz">
+  <!ENTITY gmime-md5sum        "247072236d84bd0fbbff299d69bdf333">
+  <!ENTITY gmime-size          "5.0 MB">
+  <!ENTITY gmime-buildsize     "28 MB (with tests)">
+  <!ENTITY gmime-time          "0.5 SBU (with tests)">
+]>
+
+<sect1 id="gmime" xreflabel="GMime-&gmime-version;">
+  <?dbhtml filename="gmime.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GMime-&gmime-version;</title>
+
+  <indexterm zone="gmime">
+    <primary sortas="a-GMime-2">GMime 2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GMime</title>
+
+    <para>
+      The <application>GMime</application> package contains a set of
+      utilities for parsing and creating messages using the Multipurpose
+      Internet Mail Extension (MIME) as defined by the applicable RFCs. See the
+      <ulink url="http://spruce.sourceforge.net/gmime/">GMime web site</ulink>
+      for the RFCs resourced. This is useful as it provides an API which adheres
+      to the MIME specification as closely as possible while also providing
+      programmers with an extremely easy to use interface to the API functions.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gmime-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gmime-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gmime-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gmime-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gmime-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gmime-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GMime Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/> and
+      <xref linkend="libgpg-error"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="docbook-utils"/>,
+      <xref linkend="gpgme"/>,
+      <xref linkend="gtk-doc"/> and
+      <ulink url="http://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
+      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gmime"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GMime</title>
+
+    <para>
+      Install <application>GMime</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>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--enable-smime</option>: Use this switch if you have
+      installed <xref linkend="gpgme"/> and wish to enable
+      S/MIME support in <application>GMime</application>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libgmime-2.6.so
+        </seg>
+        <seg>
+          /usr/include/gmime-2.6 and
+          /usr/share/gtk-doc/html/gmime-2.6
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgmime-2">
+        <term><filename class="libraryfile">libgmime-2.6.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions used by programs that need to comply to
+            the MIME standards.
+          </para>
+          <indexterm zone="gmime libgmime-2">
+            <primary sortas="c-libgmime-2">libgmime-2.6.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: chive/gmime3.xml
===================================================================
--- archive/gmime3.xml	(revision 37d3725fcc40a4376ec6a4f4a9e5cc7657be73dc)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gmime3-download-http "&gnome-download-http;/gmime/3.2/gmime-&gmime3-version;.tar.xz">
-  <!ENTITY gmime3-download-ftp  "&gnome-download-ftp;/gmime/3.2/gmime-&gmime3-version;.tar.xz">
-  <!ENTITY gmime3-md5sum        "7ecd9aa75e0cd2e8668206b1d53df874">
-  <!ENTITY gmime3-size          "2.1 MB">
-  <!ENTITY gmime3-buildsize     "25 MB (with tests)">
-  <!ENTITY gmime3-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="gmime3" xreflabel="GMime-&gmime3-version;">
-  <?dbhtml filename="gmime3.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GMime-&gmime3-version;</title>
-
-  <indexterm zone="gmime3">
-    <primary sortas="a-GMime-3">GMime 3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GMime</title>
-
-    <para>
-      The <application>GMime</application> package contains a set of
-      utilities for parsing and creating messages using the Multipurpose
-      Internet Mail Extension (MIME) as defined by the applicable RFCs. See the
-      <ulink url="http://spruce.sourceforge.net/gmime/">GMime web site</ulink>
-      for the RFCs resourced. This is useful as it provides an API which adheres
-      to the MIME specification as closely as possible while also providing
-      programmers with an extremely easy to use interface to the API functions.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gmime3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gmime3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gmime3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gmime3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gmime3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gmime3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GMime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and 
-      <xref linkend="libidn2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="vala"/>, and 
-      <ulink url="http://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
-      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gmime"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GMime</title>
-
-    <para>
-      Install <application>GMime</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgmime-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gmime-3.0 and
-          /usr/share/gtk-doc/html/gmime-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgmime-3">
-        <term><filename class="libraryfile">libgmime-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used by programs that need to comply to
-            the MIME standards.
-          </para>
-          <indexterm zone="gmime libgmime-3">
-            <primary sortas="c-libgmime-3">libgmime-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 37d3725fcc40a4376ec6a4f4a9e5cc7657be73dc)
+++ general/genlib/genlib.xml	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
@@ -72,6 +72,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime3.xml"/> -->
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gobject-introspection.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/>
Index: neral/genlib/gmime.xml
===================================================================
--- general/genlib/gmime.xml	(revision 37d3725fcc40a4376ec6a4f4a9e5cc7657be73dc)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gmime-download-http "&gnome-download-http;/gmime/2.6/gmime-&gmime-version;.tar.xz">
-  <!ENTITY gmime-download-ftp  "&gnome-download-ftp;/gmime/2.6/gmime-&gmime-version;.tar.xz">
-  <!ENTITY gmime-md5sum        "247072236d84bd0fbbff299d69bdf333">
-  <!ENTITY gmime-size          "5.0 MB">
-  <!ENTITY gmime-buildsize     "28 MB (with tests)">
-  <!ENTITY gmime-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="gmime" xreflabel="GMime-&gmime-version;">
-  <?dbhtml filename="gmime.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GMime-&gmime-version;</title>
-
-  <indexterm zone="gmime">
-    <primary sortas="a-GMime-2">GMime 2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GMime</title>
-
-    <para>
-      The <application>GMime</application> package contains a set of
-      utilities for parsing and creating messages using the Multipurpose
-      Internet Mail Extension (MIME) as defined by the applicable RFCs. See the
-      <ulink url="http://spruce.sourceforge.net/gmime/">GMime web site</ulink>
-      for the RFCs resourced. This is useful as it provides an API which adheres
-      to the MIME specification as closely as possible while also providing
-      programmers with an extremely easy to use interface to the API functions.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gmime-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gmime-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gmime-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gmime-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gmime-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gmime-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GMime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
-      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gmime"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GMime</title>
-
-    <para>
-      Install <application>GMime</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-smime</option>: Use this switch if you have
-      installed <xref linkend="gpgme"/> and wish to enable
-      S/MIME support in <application>GMime</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgmime-2.6.so
-        </seg>
-        <seg>
-          /usr/include/gmime-2.6 and
-          /usr/share/gtk-doc/html/gmime-2.6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgmime-2">
-        <term><filename class="libraryfile">libgmime-2.6.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used by programs that need to comply to
-            the MIME standards.
-          </para>
-          <indexterm zone="gmime libgmime-2">
-            <primary sortas="c-libgmime-2">libgmime-2.6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/gmime3.xml
===================================================================
--- general/genlib/gmime3.xml	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
+++ general/genlib/gmime3.xml	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gmime3-download-http "&gnome-download-http;/gmime/3.2/gmime-&gmime3-version;.tar.xz">
+  <!ENTITY gmime3-download-ftp  "&gnome-download-ftp;/gmime/3.2/gmime-&gmime3-version;.tar.xz">
+  <!ENTITY gmime3-md5sum        "7ecd9aa75e0cd2e8668206b1d53df874">
+  <!ENTITY gmime3-size          "2.1 MB">
+  <!ENTITY gmime3-buildsize     "25 MB (with tests)">
+  <!ENTITY gmime3-time          "0.3 SBU (with tests)">
+]>
+
+<sect1 id="gmime3" xreflabel="GMime-&gmime3-version;">
+  <?dbhtml filename="gmime3.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GMime-&gmime3-version;</title>
+
+  <indexterm zone="gmime3">
+    <primary sortas="a-GMime-3">GMime 3</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GMime</title>
+
+    <para>
+      The <application>GMime</application> package contains a set of
+      utilities for parsing and creating messages using the Multipurpose
+      Internet Mail Extension (MIME) as defined by the applicable RFCs. See the
+      <ulink url="http://spruce.sourceforge.net/gmime/">GMime web site</ulink>
+      for the RFCs resourced. This is useful as it provides an API which adheres
+      to the MIME specification as closely as possible while also providing
+      programmers with an extremely easy to use interface to the API functions.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gmime3-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gmime3-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gmime3-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gmime3-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gmime3-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gmime3-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GMime Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/> and
+      <xref linkend="libgpg-error"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and 
+      <xref linkend="libidn2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="docbook-utils"/>,
+      <xref linkend="gpgme"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="vala"/>, and 
+      <ulink url="http://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
+      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gmime"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GMime</title>
+
+    <para>
+      Install <application>GMime</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>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libgmime-3.0.so
+        </seg>
+        <seg>
+          /usr/include/gmime-3.0 and
+          /usr/share/gtk-doc/html/gmime-3.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgmime-3">
+        <term><filename class="libraryfile">libgmime-3.0.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions used by programs that need to comply to
+            the MIME standards.
+          </para>
+          <indexterm zone="gmime3 libgmime-3">
+            <primary sortas="c-libgmime-3">libgmime-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/highlight.xml
===================================================================
--- general/genutils/highlight.xml	(revision 37d3725fcc40a4376ec6a4f4a9e5cc7657be73dc)
+++ general/genutils/highlight.xml	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
@@ -7,7 +7,7 @@
   <!ENTITY highlight-download-http "http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2">
   <!ENTITY highlight-download-ftp  " ">
-  <!ENTITY highlight-md5sum        "b2f02178bda9ff2a0acbe5b50219566d">
+  <!ENTITY highlight-md5sum        "33f7f5548ac86e18a39b93fbefbe7e5d">
   <!ENTITY highlight-size          "1.3 MB">
-  <!ENTITY highlight-buildsize     "22 MB (with gui)">
+  <!ENTITY highlight-buildsize     "23 MB (with gui)">
   <!ENTITY highlight-time          "0.3 SBU (Using paralllelism=4; with gui)">
 ]>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 37d3725fcc40a4376ec6a4f4a9e5cc7657be73dc)
+++ introduction/welcome/changelog.xml	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
@@ -46,4 +46,15 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to gmime-3.2.7.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to balsa-2.6.2. Fixes
+          <ulink url="&blfs-ticket-root;14421">#14421</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to highlight-3.60. Fixes
+          <ulink url="&blfs-ticket-root;14420">#14420</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to libgpg-error-1.41. Fixes
           <ulink url="&blfs-ticket-root;14419">#14419</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 37d3725fcc40a4376ec6a4f4a9e5cc7657be73dc)
+++ packages.ent	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
@@ -254,5 +254,5 @@
 <!ENTITY gtkhtml-version              "4.10.0">
 <!ENTITY hd2u-version                 "1.0.4">
-<!ENTITY highlight-version            "3.59">
+<!ENTITY highlight-version            "3.60">
 <!ENTITY ibus-version                 "1.5.23">
 <!ENTITY imagemagick6-version         "6.9.10">
@@ -921,5 +921,5 @@
 
 <!-- Chapter 41 -->
-<!ENTITY balsa-version                "2.5.11">
+<!ENTITY balsa-version                "2.6.2">
 <!ENTITY ekiga-version                "4.0.1">
 <!ENTITY feh-version                  "3.6.1">
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 37d3725fcc40a4376ec6a4f4a9e5cc7657be73dc)
+++ xsoft/other/balsa.xml	(revision bd17317681c1df39c59f082fe63de22b52f2cba1)
@@ -7,8 +7,8 @@
   <!ENTITY balsa-download-http "http://pawsa.fedorapeople.org/balsa/balsa-&balsa-version;.tar.bz2">
   <!ENTITY balsa-download-ftp  " ">
-  <!ENTITY balsa-md5sum        "4cf4144f95e86de5aebcd33dc3a003e6">
-  <!ENTITY balsa-size          "4.3 MB">
-  <!ENTITY balsa-buildsize     "80 MB">
-  <!ENTITY balsa-time          "0.5 SBU">
+  <!ENTITY balsa-md5sum        "2361369eb566e53ddc2f6afa34eb7a9d">
+  <!ENTITY balsa-size          "4.4 MB">
+  <!ENTITY balsa-buildsize     "66 MB">
+  <!ENTITY balsa-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
@@ -77,5 +77,5 @@
       <xref linkend="aspell"/>,
       <xref linkend="enchant"/>,
-      <xref linkend="gmime"/>,
+      <xref linkend="gmime3"/>,
       <xref linkend="gpgme"/>,
       <xref linkend="gtk3"/>,and
