Index: general.ent
===================================================================
--- general.ent	(revision e5be0a1a7fc71016ef74522bd6e19d586b7e0051)
+++ general.ent	(revision d42aa42d3a1ba9a73fbb41c37665867da6c6cceb)
@@ -125,5 +125,5 @@
 <!ENTITY libusb-version               "0.1.12">
 <!ENTITY iso-codes-version            "0.58-1">
-<!ENTITY gmime-version                "2.2.2">
+<!ENTITY gmime-version                "2.2.10">
 <!ENTITY libidn-version               "0.6.14">
 <!ENTITY dbus-glib-version            "0.74">
Index: general/genlib/gmime.xml
===================================================================
--- general/genlib/gmime.xml	(revision e5be0a1a7fc71016ef74522bd6e19d586b7e0051)
+++ general/genlib/gmime.xml	(revision d42aa42d3a1ba9a73fbb41c37665867da6c6cceb)
@@ -8,8 +8,8 @@
   <!ENTITY gmime-download-ftp  " ">
   <!-- <!ENTITY gmime-download-ftp  "&gentoo-ftp-repo;/gmime-&gmime-version;.tar.gz"> -->
-  <!ENTITY gmime-md5sum        "e9b07d187270dee4c30b1fe8392f396b">
-  <!ENTITY gmime-size          "926 KB">
-  <!ENTITY gmime-buildsize     "18.7 MB">
-  <!ENTITY gmime-time          "0.4 SBU">
+  <!ENTITY gmime-md5sum        "6b5be6a0d4d9380fd0491ad2536c4087">
+  <!ENTITY gmime-size          "947 KB">
+  <!ENTITY gmime-buildsize     "21 MB">
+  <!ENTITY gmime-time          "0.4 SBU (includes building the Mono bindings)">
 ]>
 
@@ -68,9 +68,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://go-mono.com/sources/">Gtk#</ulink>
-    (requires a .NET framework:
-    <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink> or
-    <ulink url="http://www.southern-storm.com.au/portable_net.html">DotGNU
-    Portable.NET</ulink>)</para>
+    <para role="optional"><xref linkend="gtk-doc"/> and
+    <ulink url="http://go-mono.com/sources/">Gtk#</ulink> (requires
+    <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>)</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -88,6 +86,17 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite that provides meaningful
-    results.</para>
+    <para>If you have <xref linkend="docbook-utils"/> installed and you wish
+    to generate the API tutorials, issue the following commands:</para>
+
+<screen><userinput>cd docs/tutorial &amp;&amp;
+docbook2html --nochunks gmime-tut.sgml &amp;&amp;
+docbook2pdf             gmime-tut.sgml &amp;&amp;
+docbook2ps              gmime-tut.sgml &amp;&amp;
+docbook2txt             gmime-tut.sgml &amp;&amp;
+cd ../..</userinput></screen>
+
+    <para>To test the results, issue <command>make check</command>. Note that
+    some tests may fail because the corresponding sub-system is not installed
+    or configured properly.</para>
 
     <para>This package will overwrite the <command>uudecode</command> and
@@ -102,18 +111,15 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d \
-    /usr/share/doc/gmime-&gmime-version;/{tutorial,examples,tests} &amp;&amp;
-install -v -m644 README /usr/share/doc/gmime-&gmime-version; &amp;&amp;
-install -v -m644 examples/{README,{basic,imap}-example.c} \
-    /usr/share/doc/gmime-&gmime-version;/examples &amp;&amp;
-install -v -m755 examples/{basic,imap}-example \
-    /usr/share/doc/gmime-&gmime-version;/examples &amp;&amp;
-install -v -m644 tests/test-{best,html,iconv,mbox,mime,parser}.c \
-                 tests/test{-{partial,pgp{,mime},streams}.c,?.eml} \
-    /usr/share/doc/gmime-&gmime-version;/tests &amp;&amp;
-install -v -m755 tests/test-{best,html,iconv,mbox,mime,parser} \
-                 tests/test-{partial,pgp{,mime},streams} \
-    /usr/share/doc/gmime-&gmime-version;/tests &amp;&amp;
-cp -v -R docs/tutorial/html/* /usr/share/doc/gmime-&gmime-version;/tutorial</userinput></screen>
+install -v -m755 -d /usr/share/doc/gmime-&gmime-version; &amp;&amp;
+install -v -m644 README docs{,/tutorial}/gmime* \
+                    /usr/share/doc/gmime-&gmime-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e5be0a1a7fc71016ef74522bd6e19d586b7e0051)
+++ introduction/welcome/changelog.xml	(revision d42aa42d3a1ba9a73fbb41c37665867da6c6cceb)
@@ -46,4 +46,7 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to GMime-2.2.10.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to libwnck-2.18.3.</para>
         </listitem>
