Index: general.ent
===================================================================
--- general.ent	(revision 9957a52b17b9e7e9be17cdc62542e82cdbece751)
+++ general.ent	(revision f41cb316d6d228052a7138e8af81a349f80a89bc)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "22">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 21st, &year;">
+<!ENTITY releasedate  "April 22st, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -232,5 +232,5 @@
 <!ENTITY telepathy-logger-version     "0.4.0">
 <!ENTITY telepathy-mission-control-version "5.12.0">
-<!ENTITY folks-version                "0.6.4.1">
+<!ENTITY folks-version                "0.6.9">
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY boost-version                "1.49.0">
@@ -715,5 +715,5 @@
 <!-- Chapter 32 -->
 <!-- Libraries -->
-<!ENTITY caribou-version              "0.4.1">
+<!ENTITY caribou-version              "0.4.2">
 <!ENTITY GConf-version                "3.2.5">
 <!ENTITY gjs-version                  "1.30.0">
@@ -730,5 +730,5 @@
 <!ENTITY vte-version                  "0.32.1">
 <!ENTITY yelp-xsl-version             "3.4.1">
-<!ENTITY zenity-version               "3.2.0">
+<!ENTITY zenity-version               "3.4.0">
 
 <!-- Shell -->
@@ -752,5 +752,5 @@
 <!ENTITY mousetweaks-version          "3.2.1">
 <!ENTITY mutter-version               "3.2.1">
-<!ENTITY network-manager-applet-version "0.9.2.0">
+<!ENTITY network-manager-applet-version "0.9.4.1">
 
 <!-- Extras -->
Index: general/genlib/folks.xml
===================================================================
--- general/genlib/folks.xml	(revision 9957a52b17b9e7e9be17cdc62542e82cdbece751)
+++ general/genlib/folks.xml	(revision f41cb316d6d228052a7138e8af81a349f80a89bc)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY folks-download-http "&gnome-download-http;/folks/0.6/folks-&folks-version;.tar.bz2">
-  <!ENTITY folks-download-ftp  "&gnome-download-ftp;/folks/0.6/folks-&folks-version;.tar.bz2">
-  <!ENTITY folks-md5sum        "05c3a353bdaccf1f7bdf9fce97aba1e6">
-  <!ENTITY folks-size          "1.5 MB">
+  <!ENTITY folks-download-http "&gnome-download-http;/folks/0.6/folks-&folks-version;.tar.xz">
+  <!ENTITY folks-download-ftp  "&gnome-download-ftp;/folks/0.6/folks-&folks-version;.tar.xz">
+  <!ENTITY folks-md5sum        "49b739a9359a9b030844a2719cf5bb45">
+  <!ENTITY folks-size          "1.4 MB">
   <!ENTITY folks-buildsize     "53 MB">
-  <!ENTITY folks-time          "0.7 SBU">
+  <!ENTITY folks-time          "1.0 SBU">
 ]>
 
@@ -36,5 +36,5 @@
     metacontacts.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63,12 +63,25 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/>,
-    <xref linkend="libgee"/>, and
-    <xref linkend="telepathy-glib"/></para>
+    <para role="required">
+      <xref linkend="intltool"/>,
+      <xref linkend="libgee"/>, and
+      <xref linkend="telepathy-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="evolution-data-server"/>,
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="vala"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="vala"/> and <ulink
-    url="http://live.gnome.org/Valadoc/">valadoc</ulink> (Required for
-    generating the documentation)</para>
+    <para role="optional">
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/libsocialweb/">
+      libsocialweb</ulink>,
+      <xref linkend="tracker"/> and 
+      <ulink url="http://live.gnome.org/Valadoc/">valadoc</ulink> 
+      (Required for generating the documentation)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -83,5 +96,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --enable-vala &amp;&amp;
 make</userinput></screen>
 
@@ -100,4 +113,7 @@
     from the Vala sources.</para>
 
+    <para><parameter>--enable-tracker-backend</parameter>: This parameter enables
+    documentation generation.</para>
+
     <para><parameter>--enable-docs</parameter>: This parameter enables
     documentation generation.</para>
@@ -109,14 +125,20 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>folks-import</seg>
-        <seg>libfolks-backend-key-file.so,libfolks-backend-telepathy.so,
-        libfolks-telepathy.so, and libfolks.so</seg>
-        <seg>/usr/{include/folks,lib/folks/22/backends/{key-file,
-        telepathy}}</seg>
+        <seg>
+          folks-import and folks-inspect
+        </seg>
+        <seg>
+          libfolks-eds.so, libfolks-libsocialweb.so,
+          libfolks.so, libfolks-telepathy.so and
+          libfolks-tracker.so
+        </seg>
+        <seg>
+          /usr/include/folks and /usr/lib/folks
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -130,6 +152,6 @@
         <term><command>folks-import</command></term>
         <listitem>
-          <para>is a tool to import meta-contact data from
-          <application>Pidgin</application>.</para>
+          <para>is used to import meta-contact information to 
+          libfolks.</para>
           <indexterm zone="folks folks-import">
             <primary sortas="b-folks-import">folks-import</primary>
@@ -138,32 +160,33 @@
       </varlistentry>
 
-      <!-- <varlistentry id="libfolks-backend-key-file">
-        <term><filename class='libraryfile'>libfolks-backend-key-file.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="folks libfolks-backend-key-file">
-            <primary sortas="c-libfolks-backend-key-file">libfolks-backend-key-file.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
-      <varlistentry id="libfolks-backend-telepathy">
-        <term><filename class='libraryfile'>libfolks-backend-telepathy.so</filename></term>
-        <listitem>
-          <para>contains functions for the <application>Telepathy</application>
-          backend.</para>
-          <indexterm zone="folks libfolks-backend-telepathy">
-            <primary sortas="c-libfolks-backend-telepathy">libfolks-backend-telepathy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfolks-telepathy">
-        <term><filename class='libraryfile'>libfolks-telepathy.so</filename></term>
-        <listitem>
-          <para>contains Telepathy-specific implementations of the libfolks
-          classes.</para>
-          <indexterm zone="folks libfolks-telepathy">
-            <primary sortas="c-libfolks-telepathy">libfolks-telepathy.so</primary>
+      <varlistentry id="folks-inspect">
+        <term><command>folks-inspect</command></term>
+        <listitem>
+          <para>is used to inspect meta-contact information in 
+          libfolks.</para>
+          <indexterm zone="folks folks-inspect">
+            <primary sortas="b-folks-inspect">folks-inspect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libfolks-eds">
+        <term><filename class='libraryfile'>libfolks-eds.so</filename></term>
+        <listitem>
+          <para>contains Evolution-specific implementations of the libfolks
+          classes.</para>
+          <indexterm zone="folks libfolks-eds">
+            <primary sortas="c-libfolks-eds">libfolks-eds.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libfolks-libsocialweb">
+        <term><filename class='libraryfile'>libfolks-libsocialweb.so</filename></term>
+        <listitem>
+          <para>contains libsocialweb-specific implementations of the libfolks
+          classes.</para>
+          <indexterm zone="folks libfolks-libsocialweb">
+            <primary sortas="c-libfolks-libsocialweb">libfolks-libsocialweb.so</primary>
           </indexterm>
         </listitem>
@@ -180,4 +203,26 @@
       </varlistentry>
 
+      <varlistentry id="libfolks-telepathy">
+        <term><filename class='libraryfile'>libfolks-telepathy.so</filename></term>
+        <listitem>
+          <para>contains Telepathy-specific implementations of the libfolks
+          classes.</para>
+          <indexterm zone="folks libfolks-telepathy">
+            <primary sortas="c-libfolks-telepathy">libfolks-telepathy.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libfolks-tracker">
+        <term><filename class='libraryfile'>libfolks-tracker.so</filename></term>
+        <listitem>
+          <para>contains Tracker-specific implementations of the libfolks
+          classes.</para>
+          <indexterm zone="folks libfolks-tracker">
+            <primary sortas="c-libfolks-tracker">libfolks-tracker.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: gnome/core/caribou.xml
===================================================================
--- gnome/core/caribou.xml	(revision 9957a52b17b9e7e9be17cdc62542e82cdbece751)
+++ gnome/core/caribou.xml	(revision f41cb316d6d228052a7138e8af81a349f80a89bc)
@@ -7,7 +7,7 @@
   <!ENTITY caribou-download-http "&gnome-download-http;/caribou/0.4/caribou-&caribou-version;.tar.xz">
   <!ENTITY caribou-download-ftp  "&gnome-download-ftp;/caribou/0.4/caribou-&caribou-version;.tar.xz">
-  <!ENTITY caribou-md5sum        "c03cb3e121547222e9c4fe7bf527fee0">
-  <!ENTITY caribou-size          "353 KB">
-  <!ENTITY caribou-buildsize     "13 MB">
+  <!ENTITY caribou-md5sum        "0e3ba9db7bc9dd9dbd04a4007aac3cf3">
+  <!ENTITY caribou-size          "368 KB">
+  <!ENTITY caribou-buildsize     "10 MB">
   <!ENTITY caribou-time          "0.2 SBU">
 ]>
@@ -30,10 +30,8 @@
     <title>Introduction to caribou</title>
 
-    <para><application>Caribou</application> is an on screen keyboard, and
-    a shared library for other on screen keyboards
+    <para><application>Caribou</application> is an input assistive technology 
+    intended for switch and pointer users. </para>
 
-    </para>
-
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -62,18 +60,28 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pygobject3"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="clutter"/>,
-    <xref linkend="libgee"/>,
-    <xref linkend="libxklavier"/>, and
-    <xref linkend="vala"/></para>
+    <para role="required">
+      <xref linkend="clutter"/>,
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="libgee"/>,
+      <xref linkend="libxklavier"/>,
+      <xref linkend="pygobject3"/> and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if building GNOME)
+    </para>
 
     <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
     <para role="optional">For most <application>GNOME</application> users, this
-    package is only required as a compile-time dependency for other packages. If
-    you intend to use its keyboard you will require
-    <xref linkend="pyatspi2"/>,
-    <xref linkend="dbus-python"/>
-    and <xref linkend="dconf"/> at runtime.</para>
+      package is only required as a compile-time dependency for other packages. If
+      you intend to use its keyboard you will require
+      <xref linkend="pyatspi2"/>,
+      <xref linkend="dbus-python"/> and 
+      <xref linkend="dconf"/> at runtime.
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -88,8 +96,9 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR \
-            --libexecdir=$GNOME_PREFIX/lib/caribou \
-            --disable-gtk2-module &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/caribou \
+            --disable-gtk2-module \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -106,11 +115,7 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter puts
-    the gconf schemas in the correct location, instead of
-    <filename class="directory">/usr/libexec</filename></para>
-
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/caribou</parameter>: This
+    <para><parameter>--libexecdir=/usr/lib/caribou</parameter>: This
     parameter ensures <filename>antler-keyboard</filename> is put in a directory
-    which accords with the FHS, instead of
+    which accords with the FHS instead of
     <filename class="directory">/usr/libexec</filename>.</para>
 
@@ -119,6 +124,6 @@
     the module has no use in a <application>GNOME</application> desktop.</para>
 
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -129,11 +134,19 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>antler-keyboard, caribou, and caribou-preferences</seg>
-        <seg>libcaribou-gtk-module.{so,a} and libcaribou.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libcaribou,lib/{caribou,python2.7/site-packages/caribou/{antler,daemon,settings}},share/{antler,caribou/layouts/{fullscale,scan,touch}}}</seg>
+        <seg>
+          caribou and caribou-preferences
+        </seg>
+        <seg>
+          libcaribou.so
+        </seg>
+        <seg>
+          /usr/include/libcaribou, /usr/lib/caribou,
+          /usr/lib/python2.7/site-packages/caribou,
+          /usr/share/antler and /usr/share/caribou
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -144,15 +157,5 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="antler-keyboard">
-        <term><command>antler-keyboard</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="caribou antler-keyboard">
-            <primary sortas="b-antler-keyboard">antler-keyboard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="caribou-prog">
+<!--      <varlistentry id="caribou-prog">
         <term><command>caribou-prog</command></term>
         <listitem>
@@ -172,22 +175,12 @@
           </indexterm>
         </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcaribou-gtk-module">
-        <term><filename class='libraryfile'>libcaribou-gtk-module.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="caribou libcaribou-gtk-module">
-            <primary sortas="c-libcaribou-gtk-module">libcaribou-gtk-module.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
       <varlistentry id="libcaribou">
-        <term><filename class='libraryfile'>libcaribou.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libcaribou.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains the caribou API functions.</para>
           <indexterm zone="caribou libcaribou">
-            <primary sortas="c-libcaribou">libcaribou.{so,a}</primary>
+            <primary sortas="c-libcaribou">libcaribou.so</primary>
           </indexterm>
         </listitem>
Index: gnome/core/gnome-icon-theme-extras.xml
===================================================================
--- gnome/core/gnome-icon-theme-extras.xml	(revision 9957a52b17b9e7e9be17cdc62542e82cdbece751)
+++ gnome/core/gnome-icon-theme-extras.xml	(revision f41cb316d6d228052a7138e8af81a349f80a89bc)
@@ -11,5 +11,5 @@
   <!ENTITY gnome-icon-theme-extras-md5sum        "ec991c43eebde3b8f04e4ad0efccdba1">
   <!ENTITY gnome-icon-theme-extras-size          "1.6 MB">
-  <!ENTITY gnome-icon-theme-extras-buildsize     "12.0 MB">
+  <!ENTITY gnome-icon-theme-extras-buildsize     "12 MB">
   <!ENTITY gnome-icon-theme-extras-time          "less than 0.1 SBU">
 ]>
Index: gnome/core/network-manager-applet.xml
===================================================================
--- gnome/core/network-manager-applet.xml	(revision 9957a52b17b9e7e9be17cdc62542e82cdbece751)
+++ gnome/core/network-manager-applet.xml	(revision f41cb316d6d228052a7138e8af81a349f80a89bc)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY network-manager-applet-download-http "&gnome-download-http;/network-manager-applet/0.9/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-download-ftp  "&gnome-download-ftp;/network-manager-applet/0.9/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum        "9623aeb6c782a8d782500cf12c887b5b">
+  <!ENTITY network-manager-applet-download-http 
+           "&gnome-download-http;/network-manager-applet/0.9/network-manager-applet-&network-manager-applet-version;.tar.xz">
+  <!ENTITY network-manager-applet-download-ftp  
+           "&gnome-download-ftp;/network-manager-applet/0.9/network-manager-applet-&network-manager-applet-version;.tar.xz">
+  <!ENTITY network-manager-applet-md5sum        "a8de4ace4a40e432838e434f0bf71e7a">
   <!ENTITY network-manager-applet-size          "1.1 MB">
   <!ENTITY network-manager-applet-buildsize     "43 MB">
-  <!ENTITY network-manager-applet-time          "0.3 SBU">
+  <!ENTITY network-manager-applet-time          "0.4 SBU">
 ]>
 
@@ -30,8 +32,8 @@
     <title>Introduction to network-manager-applet</title>
 
-    <para>The <application>network-manager-applet</application> is a tool to configure
-    wired and wireless network connections.</para>
+    <para>The <application>network-manager-applet</application> is a tool used to 
+    configure wired and wireless network connections through GUI.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -60,15 +62,23 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="GConf"/>,
-    <xref linkend="gnome-keyring"/>,
-    <xref linkend="NetworkManager"/>,
-    <xref linkend="libnotify"/>,
-    <xref linkend="pkgconfig"/>, and
-    <xref linkend="polkit"/></para>
+    <para role="required">
+      <xref linkend="gtk3"/>,
+      <xref linkend="GConf"/>,
+      <xref linkend="iso-codes"/>,
+      <xref linkend="libgnome-keyring"/>,
+      <xref linkend="libnotify"/> and
+      <xref linkend="NetworkManager"/>
+    </para>
+
+    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
+    <para role="required">
+      <xref linkend="polkit-gnome"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="mobile-broadband-provider-info"/></para>
+    <para role="optional">
+      <xref linkend="gnome-bluetooth"/> and
+      <xref linkend="mobile-broadband-provider-info"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -83,6 +93,8 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/NetworkManager \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -98,9 +110,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter
-    controls the location where the gconf xml defaults are installed.</para>
-
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -115,7 +124,13 @@
 
       <seglistitem>
-        <seg>nm-applet and nm-connection-editor</seg>
-        <seg>libnm-gtk.{so,a}</seg>
-        <seg><envar>$GNOME_SYSCONFDIR</envar>/xdg/autostart, <envar>$GNOME_PREFIX</envar>/{include/libnm-gtk,share/{libnm-gtk,nm-applet}}</seg>
+        <seg>
+          nm-applet and nm-connection-editor
+        </seg>
+        <seg>
+          libnm-gtk.so
+        </seg>
+        <seg>
+          /usr/include/libnm-gtk, /usr/share/libnm-gtk /usr/share/nm-applet
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -126,18 +141,8 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="nm-applet">
-        <term><command>nm-applet</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="network-manager-applet nm-applet">
-            <primary sortas="b-nm-applet">nm-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="nm-connection-editor">
         <term><command>nm-connection-editor</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>Allows users to view and edit network connection settings.</para>
           <indexterm zone="network-manager-applet nm-connection-editor">
             <primary sortas="b-nm-connection-editor">nm-connection-editor</primary>
@@ -147,9 +152,9 @@
 
       <varlistentry id="libnm-gtk">
-        <term><filename class='libraryfile'>libnm-gtk.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libnm-gtk.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains the NetworkManager GTK+ functions.</para>
           <indexterm zone="network-manager-applet libnm-gtk">
-            <primary sortas="c-libnm-gtk">libnm-gtk.{so,a}</primary>
+            <primary sortas="c-libnm-gtk">libnm-gtk.so</primary>
           </indexterm>
         </listitem>
Index: gnome/core/zenity.xml
===================================================================
--- gnome/core/zenity.xml	(revision 9957a52b17b9e7e9be17cdc62542e82cdbece751)
+++ gnome/core/zenity.xml	(revision f41cb316d6d228052a7138e8af81a349f80a89bc)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY zenity-download-http "&gnome-download-http;/zenity/&gnome-version;/zenity-&zenity-version;.tar.xz">
-  <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/&gnome-version;/zenity-&zenity-version;.tar.xz">
-  <!ENTITY zenity-md5sum        "97822640e869bca81c0c33fd2a2436dc">
-  <!ENTITY zenity-size          "3.1 MB">
-  <!ENTITY zenity-buildsize     "19 MB">
-  <!ENTITY zenity-time          "0.2 SBU">
+  <!ENTITY zenity-download-http "&gnome-download-http;/zenity/3.4/zenity-&zenity-version;.tar.xz">
+  <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/3.4/zenity-&zenity-version;.tar.xz">
+  <!ENTITY zenity-md5sum        "ca34df4496a39c676215562ed5199ef9">
+  <!ENTITY zenity-size          "3.5 MB">
+  <!ENTITY zenity-buildsize     "23 MB">
+  <!ENTITY zenity-time          "0.4 SBU">
 ]>
 
@@ -36,5 +36,5 @@
     shell scripts.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63,10 +63,15 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtk3"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="which"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libnotify"/></para>
+    <para role="optional">
+      <xref linkend="libnotify"/> and
+      <xref linkend="webkitgtk"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -81,5 +86,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -92,5 +97,5 @@
   </sect2>
 
-  <sect2 role="commands">
+<!--  <sect2 role="commands">
     <title>Command Explanations</title>
 
@@ -98,5 +103,5 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
@@ -105,12 +110,13 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gdialog and zenity</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/zenity/*,omf/zenity,
-        zenity/clothes}</seg>
+        <seg>
+          gdialog and zenity
+        </seg>
+        <seg>
+          /usr/share/gnome/help/zenity and /usr/share/zenity
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9957a52b17b9e7e9be17cdc62542e82cdbece751)
+++ introduction/welcome/changelog.xml	(revision f41cb316d6d228052a7138e8af81a349f80a89bc)
@@ -43,4 +43,22 @@
 -->
     <listitem>
+      <para>April 22nd, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - network-manager-applet 0.9.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Folks 0.6.9.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - caribou 0.4.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Zenity 3.4.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 21st, 2012</para>
       <itemizedlist>
