Index: general/genlib/libdrm.xml
===================================================================
--- general/genlib/libdrm.xml	(revision f7fbe1f7ef603abb14d0ce8a40bba2bef76d5885)
+++ general/genlib/libdrm.xml	(revision 28b61748782a5080952921bec2c6e31dfd811966)
@@ -7,5 +7,5 @@
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "9a299e021d81bab6c82307582c78319d">
+  <!ENTITY libdrm-md5sum        "626a3dc44a40ef37565b61732b688567">
   <!ENTITY libdrm-size          "484 KB">
   <!ENTITY libdrm-buildsize     "9.5 MB">
@@ -97,7 +97,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --enable-udev \
-            --enable-vmwgfx-experimental-api &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --enable-udev &amp;&amp;
 make</userinput></screen>
 
@@ -116,10 +114,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vmwgfx-experimental-api</option>: This parameter
-      enables use of VMWGFX experimental kernel API used by the
-      VMware 3D Gallium driver.
-    </para>
 
     <para>
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision f7fbe1f7ef603abb14d0ce8a40bba2bef76d5885)
+++ general/graphlib/librsvg.xml	(revision 28b61748782a5080952921bec2c6e31dfd811966)
@@ -133,6 +133,11 @@
 
     <para>
-      <option>--disable-gtk-theme</option>: Add this option if you have not
-      installed GTK+ 2.
+      <option>--disable-introspection</option>: Use this switch if you have
+      not installed <application>Gobject Introspection</application>.
+    </para>
+
+    <para>
+      <option>--disable-gtk-theme</option>: Use this switch if you have not
+      installed <application>GTK+</application> 2.
     </para>
 
Index: general/graphlib/pixman.xml
===================================================================
--- general/graphlib/pixman.xml	(revision f7fbe1f7ef603abb14d0ce8a40bba2bef76d5885)
+++ general/graphlib/pixman.xml	(revision 28b61748782a5080952921bec2c6e31dfd811966)
@@ -7,11 +7,11 @@
   <!ENTITY pixman-download-http "http://cairographics.org/releases/pixman-&pixman-version;.tar.gz">
   <!ENTITY pixman-download-ftp  " ">
-  <!ENTITY pixman-md5sum        "276242da5b3af1258d072cf205d18f0b">
-  <!ENTITY pixman-size          "726 KB">
-  <!ENTITY pixman-buildsize     "23 MB">
-  <!ENTITY pixman-time          "0.6 SBU">
+  <!ENTITY pixman-md5sum        "0554c354aed2d7845180f310a9a15f20">
+  <!ENTITY pixman-size          "736 KB">
+  <!ENTITY pixman-buildsize     "26 MB">
+  <!ENTITY pixman-time          "0.5 SBU">
 ]>
 
-<sect1 id="pixman" xreflabel="pixman-&pixman-version;">
+<sect1 id="pixman" xreflabel="Pixman-&pixman-version;">
   <?dbhtml filename="pixman.html"?>
 
@@ -21,16 +21,18 @@
   </sect1info>
 
-  <title>pixman-&pixman-version;</title>
+  <title>Pixman-&pixman-version;</title>
 
   <indexterm zone="pixman">
-    <primary sortas="a-pixman">pixman</primary>
+    <primary sortas="a-Pixman">Pixman</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to pixman</title>
+    <title>Introduction to Pixman</title>
 
-    <para>The <application>pixman</application> package contains a library that
-    provides low-level pixel manipulation features such as image compositing
-    and trapezoid rasterization.</para>
+    <para>
+      The <application>Pixman</application> package contains a library that
+      provides low-level pixel manipulation features such as image
+      compositing and trapezoid rasterization.
+    </para>
 
     &lfs72_checked;
@@ -39,27 +41,42 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&pixman-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&pixman-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&pixman-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&pixman-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &pixman-md5sum;</para>
+        <para>
+          Download MD5 sum: &pixman-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &pixman-size;</para>
+        <para>
+          Download size: &pixman-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &pixman-buildsize;</para>
+        <para>
+          Estimated disk space required: &pixman-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &pixman-time;</para>
+        <para>
+          Estimated build time: &pixman-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">pixman Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Pixman Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Optional (required to run the test suite)</bridgehead>
-    <para role="optional"><xref linkend="gtk2"/></para>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk2"/> and
+      <xref linkend="libpng"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -69,17 +86,20 @@
 
   <sect2 role="installation">
-    <title>Installation of pixman</title>
+    <title>Installation of Pixman</title>
 
-    <para>Install <application>pixman</application> by running the following
+    <para>Install <application>Pixman</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note that
-    <application>GTK+2</application> must be installed.</para>
+    <para>
+      To test the results, issue: <command>make check</command>. Note that
+      <application>GTK+2</application> must be installed.
+    </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>
@@ -99,12 +119,14 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>none</seg>
-        <seg>libpixman-1.so</seg>
-        <seg>/usr/include/pixman-1</seg>
+        <seg>
+          libpixman-1.so
+        </seg>
+        <seg>
+          /usr/include/pixman-1
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -115,11 +137,13 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libpixman1">
-        <term><filename class='libraryfile'>libpixman1.so</filename></term>
+      <varlistentry id="libpixman">
+        <term><filename class="libraryfile">libpixman-1.so</filename></term>
         <listitem>
-          <para>contains functions that provide low-level pixel manipulation
-          features.</para>
-          <indexterm zone="pixman libpixman1">
-            <primary sortas="c-libpixman1">libpixman1.so</primary>
+          <para>
+            contains functions that provide low-level pixel manipulation
+            features.
+          </para>
+          <indexterm zone="pixman libpixman">
+            <primary sortas="c-libpixman">libpixman-1.so</primary>
           </indexterm>
         </listitem>
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision f7fbe1f7ef603abb14d0ce8a40bba2bef76d5885)
+++ general/sysutils/colord.xml	(revision 28b61748782a5080952921bec2c6e31dfd811966)
@@ -8,6 +8,6 @@
            "http://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
   <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "e1e3bfd048afa63e3187e9b9dc68f0c7">
-  <!ENTITY colord-size          "536 KB">
+  <!ENTITY colord-md5sum        "1e7c4164c35b8415af108fb2a0db7e1f">
+  <!ENTITY colord-size          "540 KB">
   <!ENTITY colord-buildsize     "16 MB">
   <!ENTITY colord-time          "0.2 SBU">
@@ -118,4 +118,6 @@
             --localstatedir=/var \
             --libexecdir=/usr/lib/colord \
+            --enable-vala \
+            --disable-gusb \
             --disable-static &amp;&amp;
 make</userinput></screen>
@@ -135,4 +137,17 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <option>--enable-vala</option>: This switch enables
+      building of the Vala bindings. Remove if you don't
+      have <xref linkend="vala"/> installed.
+    </para>
+
+    <para>
+       <option>--disable-gusb</option>: This switch disables
+       building of the <application>libgusb</application>
+       specific code. Remove it if you have installed
+       <application>libgusb</application>.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -163,4 +178,5 @@
           /usr/include/colord-1,
           /usr/lib/colord,
+          /usr/lib/colord-plugins,
           /usr/lib/colord-sensors,
           /usr/share/color,
Index: general/sysutils/ibus.xml
===================================================================
--- general/sysutils/ibus.xml	(revision f7fbe1f7ef603abb14d0ce8a40bba2bef76d5885)
+++ general/sysutils/ibus.xml	(revision 28b61748782a5080952921bec2c6e31dfd811966)
@@ -7,5 +7,5 @@
   <!ENTITY ibus-download-http "http://ibus.googlecode.com/files/ibus-&ibus-version;.tar.gz">
   <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "28b26c84f021a0c15023d6326d4ad58e">
+  <!ENTITY ibus-md5sum        "be482479357210283e91a47f43a0a0fe">
   <!ENTITY ibus-size          "1.9 MB">
   <!ENTITY ibus-buildsize     "45 MB">
@@ -24,5 +24,5 @@
 
   <indexterm zone="ibus">
-    <primary sortas="a-ibus">IBus</primary>
+    <primary sortas="a-IBus">IBus</primary>
   </indexterm>
 
