Index: general.ent
===================================================================
--- general.ent	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ general.ent	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "28">                   <!-- Always 2 digits -->
+<!ENTITY day          "29">                   <!-- 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 28th, &year;">
+<!ENTITY releasedate  "April 29th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -796,5 +796,5 @@
 <!ENTITY gdl-version                  "3.4.2">
 <!ENTITY gdlmm-version                "3.3.2">
-<!ENTITY gnome-applets-version        "3.2.1">
+<!ENTITY gnome-applets-version        "3.4.1">
 <!ENTITY gssdp-version                "0.12.1">
 <!ENTITY gtkhtml-version              "4.4.1">
@@ -806,17 +806,17 @@
 <!ENTITY accerciser-version           "3.2.1">
 <!ENTITY aisleriot-version            "3.2.2">
-<!ENTITY anjuta-version               "3.2.1">
-<!ENTITY cheese-version               "3.2.2">
-<!ENTITY devhelp-version              "3.2.0">
-<!ENTITY evolution-version            "3.2.2">
+<!ENTITY anjuta-version               "3.4.0">
+<!ENTITY cheese-version               "3.4.1">
+<!ENTITY devhelp-version              "3.4.1">
+<!ENTITY evolution-version            "3.4.1">
 <!ENTITY epiphany-extensions-version  "3.2.0">
-<!ENTITY file-roller-version          "3.2.2">
-<!ENTITY gedit-version                "3.2.3">
+<!ENTITY file-roller-version          "3.4.1">
+<!ENTITY gedit-version                "3.4.1">
 <!ENTITY ghex-version                 "3.0.0">
-<!ENTITY glade-version                "3.10.2">
+<!ENTITY glade-version                "3.12.0">
 <!ENTITY gnome-color-manager-version  "3.2.1">
-<!ENTITY gnome-devel-docs-version     "3.2.1">
+<!ENTITY gnome-devel-docs-version     "3.4.1">
 <!ENTITY gnome-documents-version      "0.2.1">
-<!ENTITY gnome-games-version          "3.2.1">
+<!ENTITY gnome-games-version          "3.4.1">
 <!ENTITY gnome-nettool-version        "3.0.0">
 <!ENTITY gnome-screensaver-version    "3.4.1">
@@ -829,5 +829,5 @@
 program you invoke.  Development restarted Feb 12, so commented until a new release
 <!ENTITY hamster-applet-version       "2.30.2">-->
-<!ENTITY nautilus-sendto-version      "3.0.1">
+<!ENTITY nautilus-sendto-version      "3.0.2">
 <!ENTITY nemiver-version              "0.9.0">
 <!ENTITY rygel-version                "0.12.5">
Index: gnome/add/anjuta.xml
===================================================================
--- gnome/add/anjuta.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/anjuta.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY anjuta-download-http "&gnome-download-http;/anjuta/3.2/anjuta-&anjuta-version;.tar.xz">
-  <!ENTITY anjuta-download-ftp  "&gnome-download-ftp;/anjuta/3.2/anjuta-&anjuta-version;.tar.xz">
-  <!ENTITY anjuta-md5sum        "9a3625ce57bfb301d81e95fdaae62755">
-  <!ENTITY anjuta-size          "5.5 MB">
+  <!ENTITY anjuta-download-http "&gnome-download-http;/anjuta/3.4/anjuta-&anjuta-version;.tar.xz">
+  <!ENTITY anjuta-download-ftp  "&gnome-download-ftp;/anjuta/3.4/anjuta-&anjuta-version;.tar.xz">
+  <!ENTITY anjuta-md5sum        "e28827506760020da27a8aee4c470989">
+  <!ENTITY anjuta-size          "5.9 MB">
   <!ENTITY anjuta-buildsize     "212 MB">
   <!ENTITY anjuta-time          "4.0 SBU">
 ]>
 
-<sect1 id="anjuta" xreflabel="anjuta-&anjuta-version;">
+<sect1 id="anjuta" xreflabel="Anjuta-&anjuta-version;">
   <?dbhtml filename="anjuta.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>anjuta-&anjuta-version;</title>
+  <title>Anjuta-&anjuta-version;</title>
 
   <indexterm zone="anjuta">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to anjuta</title>
+    <title>Introduction to Anjuta</title>
 
     <para><application>Anjuta DevStudio</application> is a versatile software development
@@ -35,5 +35,5 @@
     GUI designer, profiler.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -59,22 +59,29 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">anjuta Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Anjuta Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <!-- gtk3 pulls in intltool, glib2, gdk-pixbuf -->
-    <para role="required"><xref linkend="gdl"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="vte"/>,
-    <xref linkend="libgda"/>, and
-    <xref linkend="gtksourceview"/></para>
+    <para role="required">
+      <xref linkend="gdl"/>,
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gtksourceview"/>,
+      <xref linkend="libgda"/> and
+      <xref linkend="vte"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="glade"/>a,
-    <xref linkend="devhelp"/>,
-    <xref linkend="vala"/>, and
-    <xref linkend="autogen"/></para>
+    <para role="recommended">
+      <xref linkend="autogen"/>,
+      <xref linkend="devhelp"/>,
+      <xref linkend="glade"/> and
+      <xref linkend="vala"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="subversion"/></para>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="subversion"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -84,11 +91,11 @@
 
   <sect2 role="installation">
-    <title>Installation of anjuta</title>
+    <title>Installation of Anjuta</title>
 
-    <para>Install <application>anjuta</application> by running the following
+    <para>Install <application>Anjuta</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-                               --disable-packagekit &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --disable-packagekit &amp;&amp;
 make</userinput></screen>
 
@@ -107,4 +114,7 @@
     of PackageKit which isn't suitable for BLFS.</para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -114,11 +124,20 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>anjuta, anjuta-launcher, anjuta-python-autocomplete.py, and anjuta-tags</seg>
-        <seg>libam-project.so, libanjuta-3.so, libanjuta-build-basic-autotools.so, libanjuta-class-gen.so, libanjuta-code-analyzer.so, libanjuta-cvs-plugin.so, libanjuta-debug-manager.so, libanjuta-devhelp.so, libanjuta-document-manager.so, libanjuta-file-wizard.so, libanjuta-gdb.so, libanjuta-git.so, libanjuta-glade.so, libanjuta-language-cpp-java.so, libanjuta-language-vala.so, libanjuta-loader.so, libanjuta-message-view.so, libanjuta-patch.so, libanjuta-project-import.so, libanjuta-project-manager.so, libanjuta-project-wizard.so, libanjuta-python-loader.so, libanjuta-run-program.so, libanjuta-snippets-manager.so, libanjuta-sourceview.so, libanjuta-starter.so, libanjuta-symbol-db.so, libanjuta-terminal.so, libanjuta-tools.so, libdir-project.so, libfile-manager.so, libgladeanjuta.so, libjs-support-plugin.so, libjs_debugger.so, liblanguage-manager.so, libmk-project.so, and libpython_plugin.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libanjuta-3.0/libanjuta/interfaces,lib/anjuta,share/{anjuta/{build,class-templates,glade,profiles,project/{anjuta-plugin/{po,src},cpp/{po,src},directory,gcj/src,gtk/{po,src},gtkapplication/{po,src},gtkmm/{po,src},java/{po,src},js_minimal/src,library/{po,src},licenses,m4,minimal,mkfile/{po,src},pygtk/src,python/{po,src},sdl/{po,src},terminal/{po,src},vala-gtk/src,wxwin/{po,src},xlib-dock/{po,src},xlib/{po,src}},tools,ui},doc/anjuta,gnome/help/{anjuta-build-tutorial/C/figures,anjuta-faqs/C,anjuta-manual/{C/figures,cs/figures,da/figures,de/figures,el/figures,es/figures,eu/figures,fr/figures,ja/figures,oc/figures,pt_BR/figures,sl/figures,sv/figures,th/figures,uk/figures,zh_CN/figures}},gtk-doc/html/libanjuta,pixmaps/anjuta}}</seg>
+        <seg>
+          anjuta, anjuta-launcher and anjuta-tags
+        </seg>
+        <seg>
+          libanjuta-3.so
+        </seg>
+        <seg>
+          /usr/include/libanjuta-3.0, /usr/lib/anjuta, /usr/share/anjuta,
+          /usr/share/doc/anjuta,
+          /usr/share/gnome/help/{anjuta-build-tutorial,anjuta-faqs,anjuta-manual},
+          /usr/share/gtk-doc/html/libanjuta and /usr/share/pixmaps/anjuta
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -142,39 +161,8 @@
         <term><command>anjuta-launcher</command></term>
         <listitem>
-          <para>is invoked by anjuta to launch programs from within the IDE and to
-            initialize a terminal for a debugging session.</para>
+          <para>is invoked by Anjuta to launch programs from within the IDE 
+          and to initialize a terminal for a debugging session.</para>
           <indexterm zone="anjuta anjuta-launcher">
             <primary sortas="b-anjuta-launcher">anjuta-launcher</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- comment the rest, just in case someone ever feels able to document them
-      <varlistentry id="anjuta-python-autocomplete.py">
-        <term><command>anjuta-python-autocomplete.py</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="anjuta anjuta-python-autocomplete.py">
-            <primary sortas="b-anjuta-python-autocomplete.py">anjuta-python-autocomplete.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="anjuta-tags">
-        <term><command>anjuta-tags</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="anjuta anjuta-tags">
-            <primary sortas="b-anjuta-tags">anjuta-tags</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libam-project">
-        <term><filename class='libraryfile'>libam-project.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libam-project">
-            <primary sortas="c-libam-project">libam-project.so</primary>
           </indexterm>
         </listitem>
@@ -184,5 +172,5 @@
         <term><filename class='libraryfile'>libanjuta-3.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains the Anjuta API functions.</para>
           <indexterm zone="anjuta libanjuta-3">
             <primary sortas="c-libanjuta-3">libanjuta-3.so</primary>
@@ -191,354 +179,4 @@
       </varlistentry>
 
-      <varlistentry id="libanjuta-build-basic-autotools">
-        <term><filename class='libraryfile'>libanjuta-build-basic-autotools.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-build-basic-autotools">
-            <primary sortas="c-libanjuta-build-basic-autotools">libanjuta-build-basic-autotools.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-class-gen">
-        <term><filename class='libraryfile'>libanjuta-class-gen.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-class-gen">
-            <primary sortas="c-libanjuta-class-gen">libanjuta-class-gen.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-code-analyzer">
-        <term><filename class='libraryfile'>libanjuta-code-analyzer.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-code-analyzer">
-            <primary sortas="c-libanjuta-code-analyzer">libanjuta-code-analyzer.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-cvs-plugin">
-        <term><filename class='libraryfile'>libanjuta-cvs-plugin.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-cvs-plugin">
-            <primary sortas="c-libanjuta-cvs-plugin">libanjuta-cvs-plugin.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-debug-manager">
-        <term><filename class='libraryfile'>libanjuta-debug-manager.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-debug-manager">
-            <primary sortas="c-libanjuta-debug-manager">libanjuta-debug-manager.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-devhelp">
-        <term><filename class='libraryfile'>libanjuta-devhelp.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-devhelp">
-            <primary sortas="c-libanjuta-devhelp">libanjuta-devhelp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-document-manager">
-        <term><filename class='libraryfile'>libanjuta-document-manager.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-document-manager">
-            <primary sortas="c-libanjuta-document-manager">libanjuta-document-manager.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-file-wizard">
-        <term><filename class='libraryfile'>libanjuta-file-wizard.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-file-wizard">
-            <primary sortas="c-libanjuta-file-wizard">libanjuta-file-wizard.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-gdb">
-        <term><filename class='libraryfile'>libanjuta-gdb.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-gdb">
-            <primary sortas="c-libanjuta-gdb">libanjuta-gdb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-git">
-        <term><filename class='libraryfile'>libanjuta-git.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-git">
-            <primary sortas="c-libanjuta-git">libanjuta-git.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-glade">
-        <term><filename class='libraryfile'>libanjuta-glade.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-glade">
-            <primary sortas="c-libanjuta-glade">libanjuta-glade.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-language-cpp-java">
-        <term><filename class='libraryfile'>libanjuta-language-cpp-java.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-language-cpp-java">
-            <primary sortas="c-libanjuta-language-cpp-java">libanjuta-language-cpp-java.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-language-vala">
-        <term><filename class='libraryfile'>libanjuta-language-vala.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-language-vala">
-            <primary sortas="c-libanjuta-language-vala">libanjuta-language-vala.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-loader">
-        <term><filename class='libraryfile'>libanjuta-loader.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-loader">
-            <primary sortas="c-libanjuta-loader">libanjuta-loader.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-message-view">
-        <term><filename class='libraryfile'>libanjuta-message-view.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-message-view">
-            <primary sortas="c-libanjuta-message-view">libanjuta-message-view.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-patch">
-        <term><filename class='libraryfile'>libanjuta-patch.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-patch">
-            <primary sortas="c-libanjuta-patch">libanjuta-patch.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-project-import">
-        <term><filename class='libraryfile'>libanjuta-project-import.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-project-import">
-            <primary sortas="c-libanjuta-project-import">libanjuta-project-import.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-project-manager">
-        <term><filename class='libraryfile'>libanjuta-project-manager.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-project-manager">
-            <primary sortas="c-libanjuta-project-manager">libanjuta-project-manager.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-project-wizard">
-        <term><filename class='libraryfile'>libanjuta-project-wizard.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-project-wizard">
-            <primary sortas="c-libanjuta-project-wizard">libanjuta-project-wizard.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-python-loader">
-        <term><filename class='libraryfile'>libanjuta-python-loader.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-python-loader">
-            <primary sortas="c-libanjuta-python-loader">libanjuta-python-loader.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-run-program">
-        <term><filename class='libraryfile'>libanjuta-run-program.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-run-program">
-            <primary sortas="c-libanjuta-run-program">libanjuta-run-program.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-snippets-manager">
-        <term><filename class='libraryfile'>libanjuta-snippets-manager.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-snippets-manager">
-            <primary sortas="c-libanjuta-snippets-manager">libanjuta-snippets-manager.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-sourceview">
-        <term><filename class='libraryfile'>libanjuta-sourceview.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-sourceview">
-            <primary sortas="c-libanjuta-sourceview">libanjuta-sourceview.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-starter">
-        <term><filename class='libraryfile'>libanjuta-starter.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-starter">
-            <primary sortas="c-libanjuta-starter">libanjuta-starter.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-symbol-db">
-        <term><filename class='libraryfile'>libanjuta-symbol-db.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-symbol-db">
-            <primary sortas="c-libanjuta-symbol-db">libanjuta-symbol-db.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-terminal">
-        <term><filename class='libraryfile'>libanjuta-terminal.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-terminal">
-            <primary sortas="c-libanjuta-terminal">libanjuta-terminal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanjuta-tools">
-        <term><filename class='libraryfile'>libanjuta-tools.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libanjuta-tools">
-            <primary sortas="c-libanjuta-tools">libanjuta-tools.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdir-project">
-        <term><filename class='libraryfile'>libdir-project.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libdir-project">
-            <primary sortas="c-libdir-project">libdir-project.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfile-manager">
-        <term><filename class='libraryfile'>libfile-manager.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libfile-manager">
-            <primary sortas="c-libfile-manager">libfile-manager.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgladeanjuta">
-        <term><filename class='libraryfile'>libgladeanjuta.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libgladeanjuta">
-            <primary sortas="c-libgladeanjuta">libgladeanjuta.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjs-support-plugin">
-        <term><filename class='libraryfile'>libjs-support-plugin.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libjs-support-plugin">
-            <primary sortas="c-libjs-support-plugin">libjs-support-plugin.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjs_debugger">
-        <term><filename class='libraryfile'>libjs_debugger.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libjs_debugger">
-            <primary sortas="c-libjs_debugger">libjs_debugger.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblanguage-manager">
-        <term><filename class='libraryfile'>liblanguage-manager.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta liblanguage-manager">
-            <primary sortas="c-liblanguage-manager">liblanguage-manager.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmk-project">
-        <term><filename class='libraryfile'>libmk-project.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libmk-project">
-            <primary sortas="c-libmk-project">libmk-project.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpython_plugin">
-        <term><filename class='libraryfile'>libpython_plugin.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="anjuta libpython_plugin">
-            <primary sortas="c-libpython_plugin">libpython_plugin.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
     </variablelist>
 
Index: gnome/add/cheese.xml
===================================================================
--- gnome/add/cheese.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/cheese.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY cheese-download-http "&gnome-download-http;/cheese/&gnome-version;/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-download-ftp  "&gnome-download-ftp;/cheese/&gnome-version;/cheese-&cheese-version;.tar.xz">
-  <!ENTITY cheese-md5sum        "a674bbe235cc960e578bb71b6aa55783">
-  <!ENTITY cheese-size          "3.4 MB">
-  <!ENTITY cheese-buildsize     "27 MB">
-  <!ENTITY cheese-time          "0.9 SBU">
+  <!ENTITY cheese-download-http "&gnome-download-http;/cheese/3.4/cheese-&cheese-version;.tar.xz">
+  <!ENTITY cheese-download-ftp  "&gnome-download-ftp;/cheese/3.4/cheese-&cheese-version;.tar.xz">
+  <!ENTITY cheese-md5sum        "350afb16522ed26b1fe4192e12991d0f">
+  <!ENTITY cheese-size          "3.6 MB">
+  <!ENTITY cheese-buildsize     "28 MB">
+  <!ENTITY cheese-time          "0.8 SBU">
 ]>
 
-<sect1 id="cheese" xreflabel="cheese-&cheese-version;">
+<sect1 id="cheese" xreflabel="Cheese-&cheese-version;">
   <?dbhtml filename="cheese.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>cheese-&cheese-version;</title>
+  <title>Cheese-&cheese-version;</title>
 
   <indexterm zone="cheese">
@@ -28,10 +28,10 @@
 
   <sect2 role="package">
-    <title>Introduction to cheese</title>
+    <title>Introduction to Cheese</title>
 
-    <para>The <application>cheese</application> package takes photos and videos
-    with your webcam, with fun graphical effects.</para>
+    <para>The <application>Cheese</application> package is used to 
+    take photos and videos with fun graphical effects.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57,19 +57,27 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">cheese Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Cheese Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="clutter-gst"/> ( with
-    <xref linkend="gst-plugins-base"/> using <xref linkend="libtheora"/>),
-    <xref linkend="clutter-gtk"/>,
-    <xref linkend="gnome-desktop"/>,
-    <xref linkend="gnome-video-effects"/>,
-    <xref linkend="libcanberra"/>,
-    <xref linkend="librsvg"/>,
-    <xref linkend="mx"/>, and
-    <xref linkend="udev"/></para>
+    <para role="required">
+      <xref linkend="clutter-gst"/>,
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="gnome-desktop"/>,
+      <xref linkend="gnome-video-effects"/>,
+      <xref linkend="itstool"/>,
+      <xref linkend="libgee"/>,
+      <xref linkend="libcanberra"/>,
+      <xref linkend="librsvg"/>,
+      <xref linkend="mx"/>,
+      <xref linkend="nautilus-sendto"/>,
+      <xref linkend="udev"/> and
+      <xref linkend="vala"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="rarian"/></para>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -79,10 +87,10 @@
 
   <sect2 role="installation">
-    <title>Installation of cheese</title>
+    <title>Installation of Cheese</title>
 
-    <para>Install <application>cheese</application> by running the following
+    <para>Install <application>Cheese</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -98,22 +106,9 @@
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <!-- a nice description, but no libexec is created
-    <para><parameter>\-\-libexecdir=$GNOME_PREFIX/lib/cheese</parameter>: This
-    parameter is used so that the <application>cheese</application> internal
-    support programs are installed in the preferred location of <filename
-    class='directory'>$GNOME_PREFIX/lib/cheese</filename> instead of <filename
-    class='directory'>$GNOME_PREFIX/libexec/cheese</filename>.</para>-->
-
-    <!-- despite suggestionsi otherwise, this is still offered by configure and
-    rarian, whick provides the scrollkeeper commands, is only used if present -->
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    have installed <application>rarian</application> but wish to disable the
-    updates to the scrollkeeper database.</para>
-
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -128,9 +123,15 @@
 
       <seglistitem>
-        <seg>cheese</seg>
-        <seg>libcheese.{so,a}, libcheese-gtk.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/cheese,lib/cheese,
-        share/{cheese/{effects,icons/hicolor/*,pixmaps},gnome/help/cheese/*,
-        gtk-doc/html/cheese,omf/cheese}}</seg>
+        <seg>
+          cheese
+        </seg>
+        <seg>
+          libcheese.so and libcheese-gtk.so
+        </seg>
+        <seg>
+          /usr/include/cheese, /usr/share/cheese,
+          /usr/share/gtk-doc/html/cheese and 
+          /usr/share/help/*/cheese
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -152,10 +153,10 @@
 
       <varlistentry id="libcheese">
-        <term><filename class='libraryfile'>libcheese.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libcheese.so</filename></term>
         <listitem>
           <para>contains the <application>cheese</application> API
           functions.</para>
           <indexterm zone="cheese libcheese">
-            <primary sortas="c-libcheese">libcheese.{so,a}</primary>
+            <primary sortas="c-libcheese">libcheese.so</primary>
           </indexterm>
         </listitem>
@@ -163,10 +164,9 @@
 
       <varlistentry id="libcheese-gtk">
-        <term><filename class='libraryfile'>libcheese-gtk.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libcheese-gtk.so</filename></term>
         <listitem>
-          <para>contains the <application>cheese</application> API
-          functions for Gtk+-2.</para>
+          <para>contains the <application>cheese</application> GTK+ Widgets.</para>
           <indexterm zone="cheese libcheese-gtk">
-            <primary sortas="c-libcheese-gtk">libcheese-gtk.{so,a}</primary>
+            <primary sortas="c-libcheese-gtk">libcheese-gtk.so</primary>
           </indexterm>
         </listitem>
Index: gnome/add/devhelp.xml
===================================================================
--- gnome/add/devhelp.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/devhelp.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY devhelp-download-http "&gnome-download-http;/devhelp/3.2/devhelp-&devhelp-version;.tar.xz">
-  <!ENTITY devhelp-download-ftp  "&gnome-download-ftp;/devhelp/3.2/devhelp-&devhelp-version;.tar.xz">
-  <!ENTITY devhelp-md5sum        "f1b9eb558d8d85a50a4ecfcdb4545807">
-  <!ENTITY devhelp-size          "476 KB">
-  <!ENTITY devhelp-buildsize     "11 MB">
-  <!ENTITY devhelp-time          "0.2 SBU">
+  <!ENTITY devhelp-download-http "&gnome-download-http;/devhelp/3.4/devhelp-&devhelp-version;.tar.xz">
+  <!ENTITY devhelp-download-ftp  "&gnome-download-ftp;/devhelp/3.4/devhelp-&devhelp-version;.tar.xz">
+  <!ENTITY devhelp-md5sum        "d9428af3d308c1f97c2a2eebe6b451c0">
+  <!ENTITY devhelp-size          "484 KB">
+  <!ENTITY devhelp-buildsize     "12 MB">
+  <!ENTITY devhelp-time          "0.3 SBU">
 ]>
 
-<sect1 id="devhelp" xreflabel="devhelp-&devhelp-version;">
+<sect1 id="devhelp" xreflabel="Devhelp-&devhelp-version;">
   <?dbhtml filename="devhelp.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>devhelp-&devhelp-version;</title>
+  <title>Devhelp-&devhelp-version;</title>
 
   <indexterm zone="devhelp">
@@ -28,10 +28,10 @@
 
   <sect2 role="package">
-    <title>Introduction to devhelp</title>
+    <title>Introduction to Devhelp</title>
 
     <para><application>Devhelp</application> is an API documentation browser for GTK+
     and GNOME. It works natively with gtk-doc.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57,11 +57,11 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">devhelp Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Devhelp Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><!-- intltool is implicit for gtk3 -->
-    <xref linkend="gtk3"/>,
-    <xref linkend="GConf"/>, and
-    <xref linkend="webkitgtk"/></para>
+    <para role="required">
+      <xref linkend="GConf"/> and
+      <xref linkend="webkitgtk"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -71,11 +71,11 @@
 
   <sect2 role="installation">
-    <title>Installation of devhelp</title>
+    <title>Installation of Devhelp</title>
 
-    <para>Install <application>devhelp</application> by running the following
+    <para>Install <application>Devhelp</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
@@ -88,25 +88,22 @@
   </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter ensures
-    the <application>gconf</application> schema is located sensibly, particularly when
-    GNOME_PREFIX is <filename class="directory">/usr</filename>.</para>
-
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>devhelp and devhelp.py</seg>
-        <seg>libdevhelp-3.so</seg>
-        <seg><envar>$GNOME_SYSCONFDIR</envar>/{include/devhelp-3.0/devhelp,lib/gedit/plugins,share/devhelp/{assistant,dtd,ui}}</seg>
+        <seg>
+          devhelp
+        </seg>
+        <seg>
+          libdevhelp-3.so
+        </seg>
+        <seg>
+          /usr/include/devhelp-3.0 and /usr/share/devhelp
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -127,18 +124,9 @@
       </varlistentry>
 
-      <!--<varlistentry id="devhelp.py">
-        <term><command>devhelp.py</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="devhelp devhelp.py">
-            <primary sortas="b-devhelp.py">devhelp.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
       <varlistentry id="libdevhelp-3">
         <term><filename class='libraryfile'>libdevhelp-3.so</filename></term>
         <listitem>
-          <para>library providing documentation browser functionality.</para>
+          <para>is a library that provides documentation browser 
+          functionality.</para>
           <indexterm zone="devhelp libdevhelp-3">
             <primary sortas="c-libdevhelp-3">libdevhelp-3.so</primary>
Index: gnome/add/evolution.xml
===================================================================
--- gnome/add/evolution.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/evolution.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-version;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-version;/evolution-&evolution-version;.tar.xz">
-  <!ENTITY evolution-md5sum        "1c661fb7a982ba6b3624becaa3079eb8">
-  <!ENTITY evolution-size          "11 MB">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/3.4/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/3.4/evolution-&evolution-version;.tar.xz">
+  <!ENTITY evolution-md5sum        "d178b6a9869f92e66b2022d4e35077ee">
+  <!ENTITY evolution-size          "13 MB">
   <!ENTITY evolution-buildsize     "420 MB">
-  <!ENTITY evolution-time          "18.6 SBU">
+  <!ENTITY evolution-time          "19 SBU">
 ]>
 
@@ -34,5 +34,5 @@
     <application>GNOME</application> environment.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61,39 +61,31 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="evolution-data-server"/>,
-    <xref linkend="gnome-desktop"/>,
-    <xref linkend="gtkhtml"/>,
-    <xref linkend="libcanberra"/>,
-    <xref linkend="libunique"/>, and
-    <xref linkend="shared-mime-info"/></para>
+    <para role="required">
+      <xref linkend="evolution-data-server"/>,
+      <xref linkend="gnome-desktop"/>,
+      <xref linkend="gtkhtml"/>,
+      <xref linkend="libcanberra"/> and
+      <xref linkend="shared-mime-info"/>
+    </para>
 
-    <bridgehead renderas="sect4">Recommended
-    (For SSL and S/MIME support)</bridgehead>
-    <para role="recommended"><xref linkend="nss"/></para>
-
-    <para>The <application>NSS</application> package is not required if you
-    have <xref linkend="firefox"/>, <xref linkend="thunderbird"/>,
-    <xref linkend="seamonkey"/> or
-    <ulink url="http://www.mozilla.org/products/mozilla1.x/">Mozilla</ulink>
-    installed. These packages contain internal copies of
-    <application>NSS</application> (or they used a system-installed copy).
-    If any of the four packages are installed, one way or another you will
-    already have NSS/NSPR libraries on your system.</para>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libgweather"/> and
+      <xref linkend="NetworkManager"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="clutter-gtk"/>,
-    <xref linkend="dbus-glib"/>,
-    <xref linkend="docbook-utils"/>,
-    <xref linkend="geoclue"/>,
-    <xref linkend="gstreamer"/>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="mitkrb"/>,
-    <ulink url="http://projects.gnome.org/libchamplain/">libchamplain</ulink>,
-    <xref linkend="libgweather"/>,
-    <xref linkend="libnotify"/>,
-    <ulink url="http://www.five-ten-sg.com/libpst/">libpst</ulink>,
-    <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
-    <xref linkend="NetworkManager"/> and
-    <xref linkend="openldap"/>.</para>
+    <para role="optional">
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="docbook-utils"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="mx"/>,
+      <xref linkend="libchamplain"/>,
+      <ulink url="http://www.five-ten-sg.com/libpst/">libpst</ulink>,
+      <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
+      <xref linkend="openldap"/> and
+      <ulink url="http://sourceforge.net/projects/ytnef/">libytnef</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -108,33 +100,8 @@
     commands:</para>
 
-    <note>
-      <para>The instructions below assume you have the NSS/NSPR libraries
-      installed on your system. If you elected not to install
-      <application>NSS</application> (or one of the other packages mentioned
-      above), you'll need to remove the following two parameter settings from
-      the <command>configure</command> command below:</para>
-
-      <literallayout><parameter>            --enable-nss
-            --enable-smime</parameter></literallayout>
-
-      <para>The <application>Evolution</application>
-      <command>configure</command> script only looks for the stand-alone
-      <application>NSS</application> package and the
-      <application>Mozilla</application> and
-      <application>Firefox</application> browsers for the NSS/NSPR libraries.
-      If you are using <application>Thunderbird</application> as your source
-      for the NSS/NSPR libraries, you will have to add the following two
-      parameter settings to the <command>configure</command> command
-      below:</para>
-
-      <literallayout><parameter>            --with-nspr-includes=/usr/include/nspr
-            --with-nss-includes=/usr/include/nss</parameter></literallayout>
-    </note>
-
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR \
-            --libexecdir=$GNOME_PREFIX/lib \
-            --enable-nss \
-            --enable-smime \
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib \
+            --disable-contact-maps \
             --disable-image-inline \
             --disable-pst-import &amp;&amp;
@@ -152,59 +119,40 @@
     <title>Command Explanations</title>
 
-    <!-- There doesn't appear to be any need for this
-    <para><parameter>-\-disable-gtk-doc</parameter>: This parameter disables
-    building the API documentation if you have
-    <application>GTK-Doc</application> installed. Remove this parameter if
-    you wish to build and install the documentation.</para>
-    -->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
+
+    <para><parameter>--libexecdir=/usr/lib</parameter>: This parameter
+    causes the libexec files to be installed in the preferred location of
+    <filename class="directory">/usr/lib/evolution</filename> instead of 
+    <filename class="directory">/usr/libexec/evolution</filename>.</para>
+
+    <para><option>--disable-contact-maps</option>: This parameter is used
+    to disable the contact-maps plugin. Remove if you have 
+    <xref linkend="clutter-gtk"/>, <xref linkend="libchamplain"/> and 
+    <xref linkend="mx"/> installed.</para>
+
+    <para><option>--disable-image-inline</option>: This parameter is used
+    to disable the image-inline plugin.</para>
+
+    <para><option>--disable-pst-import</option>: This parameter is used to
+    disable the pst-import plugin.</para>
+
+    <para><option>--with-clutter</option>: Use this parameter to
+    build <application>Evolution</application> with 
+    <application>Clutter</application> support.</para>
+
+    <para><option>--with-openldap</option>: This parameter will compile
+    <application>OpenLDAP</application> support into 
+    <application>Evolution</application>.</para>
+
+    <para><parameter>--with-krb5=/usr</parameter>: This parameter will compile
+    <application>Kerberos 5</application> support into
+    <application>Evolution</application>.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib</parameter>: This parameter
-    causes the libexec files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/evolution</filename> instead
-    of <filename
-    class="directory">$GNOME_PREFIX/libexec/evolution</filename>.</para>
-
-    <para><parameter>--enable-nss</parameter>: This parameter is used to pull
-    in the Mozilla Network Security Services libraries for SSL support.</para>
-
-    <para><parameter>--enable-smime</parameter>: This parameter is used to pull
-    in the Mozilla Network Security Services libraries for S/MIME
-    support.</para>
-
-    <para><parameter>--disable-image-inline</parameter>: This parameter is used
-    to disable the image-inline plugin.</para>
-
-    <para><parameter>--disable-pst-import</parameter>: This parameter is used to
-    disable the pst-import plugin.</para>
-
-    <!-- changed to optional since gnome-3.2 requires NM in my experience : ken -->
-    <para><option>--disable-nm</option>: This parameter is used to disable
-    <application>NetworkManager</application> support. Use it if you have not
-    installed <application>NetworkManager</application>.</para>
-
-    <!--
-    <para><parameter>-with-{nspr,nss}-includes</parameter>: This parameter is
-    used to identify where the Mozilla Network Security Services interface
-    headers are located. By default, <application>Evolution</application> uses
-    <filename>mozilla-{nss,nspr}.pc</filename> files to locate the headers
-    and chances are you will not have <application>Mozilla</application>
-    installed.</para>
-    -->
-
-    <para><option>--with-openldap</option>: This parameter will compile
-    LDAP support into <application>Evolution</application>.</para>
-
-    <para><option>--with-krb5=/usr</option>: This parameter will compile
-    <application>Kerberos5</application> support into
-    <application>Evolution</application>.</para>
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -214,49 +162,15 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>evolution, evolution-settings, evolution-addressbook-export,
-        evolution-alarm-notify, evolution-backup, and killev</seg>
-        <seg>libcomposer.so, libeabutil.so, libeconduit.so,
-        libecontacteditor.so, libecontactlisteditor.so, libemformat.so,
-        libemiscwidgets.so, libeshell.so, libessmime.so, libetable.so,
-        libetext.so, libetimezonedialog.so, libeutil.so, libevolution-a11y.so,
-        libevolution-addressbook-importers.so,
-        libevolution-calendar-importers.so, libevolution-calendar.so,
-        libevolution-mail-importers.so, libevolution-mail-settings.so,
-        libevolution-mail.so, libevolution-smime.so, libfilter.so, libmenus.so,
-        libevolution-module-addressbook.so, libevolution-module-calendar.so,
-        libevolution-module-mail.so, libevolution-module-plugin-lib.so,
-        liborg-gnome-addressbook-file.so, liborg-gnome-audio-inline.so,
-        liborg-gnome-backup-restore.so, liborg-gnome-bogo-junk-plugin.so,
-        liborg-gnome-calendar-file.so, liborg-gnome-calendar-http.so,
-        liborg-gnome-calendar-weather.so, liborg-gnome-default-mailer.so,
-        liborg-gnome-default-source.so, liborg-gnome-email-custom-header.so,
-        liborg-gnome-evolution-attachment-reminder.so,
-        liborg-gnome-evolution-bbdb.so, liborg-gnome-evolution-caldav.so,
-        liborg-gnome-evolution-google.so,
-        liborg-gnome-evolution-startup-wizard.so,
-        liborg-gnome-evolution-webdav.so, liborg-gnome-groupwise-features.so,
-        liborg-gnome-imap-features.so, liborg-gnome-itip-formatter.so,
-        liborg-gnome-mail-notification.so, liborg-gnome-mail-to-task.so,
-        liborg-gnome-mailing-list-actions.so, liborg-gnome-mark-all-read.so,
-        liborg-gnome-plugin-manager.so, liborg-gnome-prefer-plain.so,
-        liborg-gnome-publish-calendar.so, liborg-gnome-sa-junk-plugin.so,
-        liborg-gnome-save-calendar.so, liborg-gnome-subject-thread.so,
-        liborg-gnome-templates.so, and liborg-gnome-vcard-inline.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/evolution-&gnome-version;/{addressbook/gui/widgets,
-        calendar/{common,gui/dialogs},composer,e-conduit,e-util,em-format,
-        filter,mail,menus,misc,shell,table,text},
-        lib/evolution/&gnome-version;/{modules,plugins},
-        share/{evolution/&gnome-version;/{default/*,ecps,errors,etspec,
-        help/quickref/*,icons/hicolor/{16x16/{actions,apps,places,status},
-        22x22/{actions,apps,places},24x24/{actions,apps,places,status},
-        32x32/{actions,apps,status},48x48/{actions,apps,categories,status},
-        scalable/actions},images,sounds,ui,views/{addressbook,calendar,mail,
-        memos,tasks}},gnome/help/evolution/*,gtk-doc/html/eshell,
-        omf/evolution}}</seg>
+        <seg>
+          evolution and evolution-settings
+        </seg>
+        <seg>
+          /usr/include/evolution-3.4, /usr/lib/evolution, /usr/share/evolution,
+          /usr/share/gnome/help/evolution and /usr/share/gtk-doc/html/eshell
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -270,5 +184,6 @@
         <term><command>evolution</command></term>
         <listitem>
-          <para>is an email, calendar and address book suite..</para>
+          <para>is an email, calendar and address book suite for
+          the GNOME Desktop.</para>
           <indexterm zone="evolution evolution-prog">
             <primary sortas="g-evolution">evolution</primary>
Index: gnome/add/file-roller.xml
===================================================================
--- gnome/add/file-roller.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/file-roller.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY file-roller-download-http "&gnome-download-http;/file-roller/&gnome-version;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-download-ftp  "&gnome-download-ftp;/file-roller/&gnome-version;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-md5sum        "6285a67f02aadbd2f67880b4b0e0f7fc">
-  <!ENTITY file-roller-size          "1.7 MB">
-  <!ENTITY file-roller-buildsize     "45 MB">
-  <!ENTITY file-roller-time          "0.6 SBU">
+  <!ENTITY file-roller-download-http 
+           "&gnome-download-http;/file-roller/3.4/file-roller-&file-roller-version;.tar.xz">
+  <!ENTITY file-roller-download-ftp  
+           "&gnome-download-ftp;/file-roller/3.4/file-roller-&file-roller-version;.tar.xz">
+  <!ENTITY file-roller-md5sum        "1eef89f1d2be453479782a10f3b1eb22">
+  <!ENTITY file-roller-size          "1.5 MB">
+  <!ENTITY file-roller-buildsize     "39 MB">
+  <!ENTITY file-roller-time          "0.8 SBU">
 ]>
 
@@ -37,7 +39,4 @@
     interface to archiving utilities such as <application>tar</application> and
     <application>zip</application>.</para></note>
-
-    <!-- TODO: Cannot find a definitive list for what backend utilities are
-    supported, only supported file types. -->
 
     &lfs70_checked;
@@ -68,17 +67,25 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtk3"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/> and
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="nautilus"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="nautilus"/> and
-    <xref linkend="rarian"/></para>
+    <para role="optional">
+      <xref linkend="rarian"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="optional"><xref linkend="unrar"/>,
-    <xref linkend="unzip"/>, and
-    <xref linkend="zip"/></para>
+    <para role="optional">
+      <xref linkend="unrar"/>,
+      <xref linkend="unzip"/> and
+      <xref linkend="zip"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -93,7 +100,9 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib \
-            --disable-packagekit &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib \
+            --enable-magic \
+            --disable-packagekit \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -110,21 +119,15 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
+    <para><parameter>--enable-magic</parameter>: Use libmagic to detect
+    file type.</para>
 
     <para><parameter>--disable-packagekit</parameter>: This parameter disables use
     of PackageKit which isn't suitable for BLFS.</para>
 
-    <!-- despite suggestions, this is still offered by configure and
-    rarian, whick provides the scrollkeeper commands, is only used if present -->
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    have installed <application>rarian</application> but wish to disable the
-    updates to the scrollkeeper database.</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/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -135,13 +138,14 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>file-roller and rpm2cpio</seg>
-        <seg>libnautilus-fileroller.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/file-roller,
-        share/{file-roller/{icons/hicolor/{16x16/actions,24x24/actions},ui},
-        gnome/help/file-roller/*,locale/ur_PK/LC_MESSAGES,omf/file-roller}}</seg>
+        <seg>
+          file-roller
+        </seg>
+        <seg>
+          /usr/lib/file-roller and 
+          /usr/share/gnome/help/file-roller
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -162,14 +166,4 @@
       </varlistentry>
 
-      <varlistentry id="libnautilus-fileroller">
-        <term><filename class='libraryfile'>libnautilus-fileroller.so</filename></term>
-        <listitem>
-          <para>is a <application>Nautilus</application> extension library.</para>
-          <indexterm zone="file-roller libnautilus-fileroller">
-            <primary sortas="c-libnautilus-fileroller">libnautilus-fileroller.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
Index: gnome/add/gedit.xml
===================================================================
--- gnome/add/gedit.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/gedit.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-version;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-version;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-md5sum        "f7d27116971e2d7336231353de7dd2e9">
+  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/3.4/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/3.4/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-md5sum        "f3d057140091dc28aef81bbe3bfca029">
   <!ENTITY gedit-size          "2.8 MB">
-  <!ENTITY gedit-buildsize     "95 MB">
+  <!ENTITY gedit-buildsize     "105 MB">
   <!ENTITY gedit-time          "1.8 SBU">
 ]>
@@ -60,22 +60,26 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gsettings-desktop-schemas"/>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="gtksourceview"/>,
-    <xref linkend="libpeas"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gsettings-desktop-schemas"/>,
+      <xref linkend="gtksourceview"/>,
+      <xref linkend="itstool"/> and
+      <xref linkend="libpeas"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="enchant"/> and
-    <xref linkend="iso-codes"/> (to Provide Spell-Checking Capability),
-    <xref linkend="rarian"/></para>
+    <para role="recommended">
+      <xref linkend="enchant"/> and
+      <xref linkend="iso-codes"/> (to Provide Spell-Checking Capability),
+      <xref linkend="libsoup"/> and
+      <xref linkend="pygobject3"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="attr"/>,
-    <xref linkend="libsoup"/>,
-    <xref linkend="pygobject3"/>, and
-    <ulink url="http://launchpad.net/libzeitgeist">libzeitgeist</ulink></para>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/> and
+      <ulink url="http://launchpad.net/libzeitgeist">libzeitgeist</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -90,7 +94,6 @@
     commands:</para>
 
-<!-- /usr/lib/gedit is created for plugins, reuse for libexec's gedit-bugreport.sh -->
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/gedit &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib &amp;&amp;
 make</userinput></screen>
 
@@ -107,11 +110,11 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
 
-    <para><command>--libexecdir=$GNOME_PREFIX/lib/gedit</command> : this
-    parameter ensures the libexec file is installed to the same directory as
-    the plugins, instead of creating
-    <filename class="directory">$GNOME_PREFIX/libexec</filename></para>
+    <para><command>--libexecdir=/usr/lib</command> : this
+    parameter ensures the bugreport script is installed to the same 
+    directory as the plugins, instead of creating
+    <filename class="directory">/usr/libexec</filename></para>
 
     <para><option>--disable-spell</option>: Use this parameter to disables
@@ -122,7 +125,4 @@
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
-
   </sect2>
 
@@ -131,19 +131,20 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gedit and gnome-text-editor (a symlink to gedit)</seg>
-        <seg>libgedit-private.so, libchangecase.so, libdocinfo.so, libfilebrowser.so,
-        libmodelines.so, libsort.so, libspell.so, libtime.so</seg>
-        <!-- slimmed as much as possible, reformatted to avoid whitespace at wrong places -->
-        <seg><envar>$GNOME_PREFIX</envar>/include/gedit-3.0,
-        <envar>$GNOME_PREFIX</envar>/lib/gedit,
-        <envar>$GNOME_PREFIX</envar>/share/gedit-2,
-        <envar>$GNOME_PREFIX</envar>/share/gnome/help/gedit,
-        <envar>$GNOME_PREFIX</envar>/share/gtk-doc/html,
-        <envar>$GNOME_PREFIX</envar>/share/omf/gedit</seg>
+        <seg>
+          gedit
+        </seg>
+        <seg>
+          libgedit-private.so
+        </seg>
+        <seg>
+          /usr/include/gedit-3.0, /usr/lib/gedit,
+          /usr/share/gedit, /usr/share/gtk-doc/html/gedit
+          and /usr/share/help/*/gedit
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -158,5 +159,5 @@
         <listitem>
           <para>is a lightweight text editor integrated with the
-          GNOME desktop.</para>
+          GNOME Desktop.</para>
           <indexterm zone="gedit gedit-prog">
             <primary sortas="b-gedit">gedit</primary>
Index: gnome/add/glade.xml
===================================================================
--- gnome/add/glade.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/glade.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY glade-download-http "&gnome-download-http;/glade/3.10/glade-&glade-version;.tar.xz">
-  <!ENTITY glade-download-ftp  "&gnome-download-ftp;/glade/3.10/glade-&glade-version;.tar.xz">
-  <!ENTITY glade-md5sum        "b4363ccd9024a6ec7a82175317a5b6d1">
-  <!ENTITY glade-size          "2.3 MB">
-  <!ENTITY glade-buildsize     "61 MB">
-  <!ENTITY glade-time          "0.7 SBU">
+  <!ENTITY glade-download-http "&gnome-download-http;/glade/3.12/glade-&glade-version;.tar.xz">
+  <!ENTITY glade-download-ftp  "&gnome-download-ftp;/glade/3.12/glade-&glade-version;.tar.xz">
+  <!ENTITY glade-md5sum        "bc743c2b94b674770b67cbc0c90fb3eb">
+  <!ENTITY glade-size          "2.4 MB">
+  <!ENTITY glade-buildsize     "65 MB">
+  <!ENTITY glade-time          "0.8 SBU">
 ]>
 
-<sect1 id="glade" xreflabel="glade-&glade-version;">
+<sect1 id="glade" xreflabel="Glade-&glade-version;">
   <?dbhtml filename="glade.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>glade-&glade-version;</title>
+  <title>Glade-&glade-version;</title>
 
   <indexterm zone="glade">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to glade</title>
+    <title>Introduction to Glade</title>
 
     <para><application>Glade</application> is a RAD tool to enable quick and easy
@@ -34,5 +34,5 @@
     environment.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -58,12 +58,18 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">glade Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Glade Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="gtk3"/>, and
-    <xref linkend="libxml2"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/> and
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="rarian"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -73,10 +79,10 @@
 
   <sect2 role="installation">
-    <title>Installation of glade</title>
+    <title>Installation of Glade</title>
 
-    <para>Install <application>glade</application> by running the following
+    <para>Install <application>Glade</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -90,4 +96,12 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -95,11 +109,20 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>glade and glade-previewer</seg>
-        <seg>libgladegtk.so and libgladeui-2.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libgladeui-2.0/gladeui,lib/glade/modules,share/{glade/{catalogs,pixmaps/hicolor/{16x16/actions,22x22/actions}},gnome/help/glade/{C/figures,bg/figures,cs/figures,de/figures,el/figures,en_GB/figures,es/figures,eu/figures,fr/figures,hi/figures,it/figures,ja/figures,oc/figures,pt_BR/figures,ru/figures,sl/figures,sv/figures,uk/figures,zh_CN/figures},gtk-doc/html/gladeui,omf/glade}}</seg>
+        <seg>
+          glade and glade-previewer
+        </seg>
+        <seg>
+          libgladeui-2.so
+        </seg>
+        <seg>
+          /usr/include/libgladeui-2.0, /usr/lib/glade,
+          /usr/share/glade, /usr/share/gnome/help/glade,
+          /usr/share/gtk-doc/html/gladeui-2 and
+          /usr/share/omf/glade
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -113,5 +136,6 @@
         <term><command>glade</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>is used to create or edit user interface designs 
+          for GTK+ or GNOME applications.</para>
           <indexterm zone="glade glade-prog">
             <primary sortas="b-glade">glade</primary>
@@ -123,17 +147,7 @@
         <term><command>glade-previewer</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>is used to preview a glade UI definition.</para>
           <indexterm zone="glade glade-previewer">
             <primary sortas="b-glade-previewer">glade-previewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgladegtk">
-        <term><filename class='libraryfile'>libgladegtk.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="glade libgladegtk">
-            <primary sortas="c-libgladegtk">libgladegtk.so</primary>
           </indexterm>
         </listitem>
@@ -143,5 +157,5 @@
         <term><filename class='libraryfile'>libgladeui-2.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains the Glade API functions.</para>
           <indexterm zone="glade libgladeui-2">
             <primary sortas="c-libgladeui-2">libgladeui-2.so</primary>
Index: gnome/add/gnome-applets.xml
===================================================================
--- gnome/add/gnome-applets.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/gnome-applets.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY gnome-applets-download-http "&gnome-download-http;/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.xz">
-  <!ENTITY gnome-applets-download-ftp  "&gnome-download-ftp;/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.xz">
-  <!ENTITY gnome-applets-md5sum        "bce6d49f3bb2caff8d91c78599ffcfd0">
+  <!ENTITY gnome-applets-download-http 
+           "&gnome-download-http;/gnome-applets/3.4/gnome-applets-&gnome-applets-version;.tar.xz">
+  <!ENTITY gnome-applets-download-ftp  
+           "&gnome-download-ftp;/gnome-applets/3.4/gnome-applets-&gnome-applets-version;.tar.xz">
+  <!ENTITY gnome-applets-md5sum        "82a4946d10257239214cf18edeeb34c1">
   <!ENTITY gnome-applets-size          "7.7 MB">
   <!ENTITY gnome-applets-buildsize     "100 MB">
-  <!ENTITY gnome-applets-time          "1.4 SBU">
+  <!ENTITY gnome-applets-time          "1.8 SBU">
 ]>
 
@@ -34,5 +36,5 @@
     their output to the <application>GNOME</application> panel.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61,17 +63,27 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-icon-theme"/>,
-    <xref linkend="gnome-panel"/></para>
+    <para role="required">
+      <xref linkend="GConf"/>,
+      <xref linkend="gnome-icon-theme"/> and
+      <xref linkend="gnome-panel"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libgnomekbd"/>,
+      <xref linkend="libgtop"/>,
+      <xref linkend="libnotify"/>,
+      <xref linkend="NetworkManager"/> and
+      <xref linkend="rarian"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="rarian"/>,
-    <xref linkend="libgtop"/>,
-    <xref linkend="gst-plugins-base"/>,
-    <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>,
-    <xref linkend="libgnomekbd"/>,
-    <xref linkend="gucharmap"/>,
-    <xref linkend="docbook-utils"/>,
-    <ulink url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>, and
-    <xref linkend="libnotify"/></para>
+    <para role="optional">
+      <xref linkend="docbook-utils"/>,
+      <xref linkend="gst-plugins-base"/>,
+      <xref linkend="gucharmap"/>,
+      <ulink url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink> and
+      <xref linkend="pygobject2"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -86,7 +98,7 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR \
-            --libexecdir=$GNOME_PREFIX/lib/gnome-applets &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/gnome-applets &amp;&amp;
 make</userinput></screen>
 
@@ -95,6 +107,5 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-make -C man install-man</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -103,19 +114,15 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
 
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/gnome-applets</parameter>:
+    <para><parameter>--libexecdir=/usr/lib/gnome-applets</parameter>:
     This parameter causes the libexec files to be installed in the preferred
     location of in <filename
-    class="directory">$GNOME_PREFIX/lib/gnome-applets</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><command>make -C man install-man</command>: This command installs
-    the man-pages that are not installed during
-    <command>make install</command>.</para>
+    class="directory">/usr/lib/gnome-applets</filename> instead of
+    <filename class="directory">/usr/libexec</filename>.</para>
 
   </sect2>
@@ -126,21 +133,24 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>cpufreq-selector, accessx-status-applet, battstat-applet-2,
-        charpick_applet2, cpufreq-applet, drivemount_applet2, geyes_applet2,
-        gweather-applet-2, multiload-applet-2, null_applet, stickynotes_applet,
-        and trashapplet</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/gnome-applets,
-        share/{gnome-applets/{builder,geyes/{Bizarre,Bloodshot,Default-tiny,
-        Horrid,Tango}},gnome/help/{accessx-status/*,battstat/*,char-palette/*,
-        cpufreq-applet/*,drivemount/*,geyes/*,gweather/*,multiload/*,
-        stickynotes_applet/*,trashapplet/*},omf/{accessx-status,battstat,
-        char-palette,cpufreq-applet,drivemount,geyes,gweather,multiload,
-        stickynotes_applet,trashapplet},pixmaps/{accessx-status-applet,
-        cpufreq-applet,stickynotes},xmodmap}}</seg>
+        <seg>
+          accessx-status-applet, battstat-applet-2, charpick_applet2,
+          cpufreq-applet, cpufreq-selector, drivemount_applet2,
+          geyes_applet2, gweather-applet-2, invest-applet, invest-chart, 
+          mixer_applet2, multiload-applet-2, null_applet, 
+          stickynotes_applet and trashapplet
+        </seg>
+        <seg>
+          /usr/lib/bonobo/servers, /usr/lib/python2.7/site-packages/invest,
+          /usr/share/gnome/help/{accessx-status,battstat,char-palette,cpufreq-applet},
+          /usr/share/gnome/help/{drivemoun,geyes,gweather,invest-applet},
+          /usr/share/gnome/help/{mixer_applet2,multiload,stickynotes_applet,trashapplet},
+          /usr/share/gnome-applets, /usr/share/omf/{accessx-status,battstat,char-palette},
+          /usr/share/omf/{cpufreq-applet,drivemount,geyes,gweather,invest-applet},
+          /usr/share/omf/{mixer_applet2,multiload,stickynotes_applet} and
+          /usr/share/pixmaps/{accessx-status-applet,cpufreq-applet,stickynotes}
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/add/gnome-devel-docs.xml
===================================================================
--- gnome/add/gnome-devel-docs.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/gnome-devel-docs.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY gnome-devel-docs-download-http "&gnome-download-http;/gnome-devel-docs/3.2/gnome-devel-docs-&gnome-devel-docs-version;.tar.xz">
-  <!ENTITY gnome-devel-docs-download-ftp  "&gnome-download-ftp;/gnome-devel-docs/3.2/gnome-devel-docs-&gnome-devel-docs-version;.tar.xz">
-  <!ENTITY gnome-devel-docs-md5sum        "5c299d30ab5377d9b4b633d285f50c2c">
-  <!ENTITY gnome-devel-docs-size          "4.6 MB">
-  <!ENTITY gnome-devel-docs-buildsize     "44 MB">
-  <!ENTITY gnome-devel-docs-time          "1.4 SBU">
+  <!ENTITY gnome-devel-docs-download-http 
+           "&gnome-download-http;/gnome-devel-docs/3.4/gnome-devel-docs-&gnome-devel-docs-version;.tar.xz">
+  <!ENTITY gnome-devel-docs-download-ftp  
+           "&gnome-download-ftp;/gnome-devel-docs/3.4/gnome-devel-docs-&gnome-devel-docs-version;.tar.xz">
+  <!ENTITY gnome-devel-docs-md5sum        "041dc56bda5a542c404351ea4efb2898">
+  <!ENTITY gnome-devel-docs-size          "5.9 MB">
+  <!ENTITY gnome-devel-docs-buildsize     "52 MB">
+  <!ENTITY gnome-devel-docs-time          "1.8 SBU">
 ]>
 
@@ -33,5 +35,5 @@
     on a11y for developing the <application>GNOME</application> desktop environment.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -60,8 +62,12 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-doc-utils"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional"><xref linkend="rarian"/></para>
+    <para role="optional">
+      <xref linkend="rarian"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -76,5 +82,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -92,12 +98,12 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/{accessibility-devel-guide/{C/figures,de/figures,el/figures,es/figures,fr/figures,ja/figures,pt_BR/figures,sl/figures},gnome-devel-demos/{C/{guitar-tuner,image-viewer,magic-mirror,media,message-board,photo-wall,record-collection},de/{guitar-tuner,image-viewer,magic-mirror,media,message-board,photo-wall,record-collection},es/{guitar-tuner,image-viewer,magic-mirror,media,message-board,photo-wall,record-collection},gl/{guitar-tuner,image-viewer,magic-mirror,media,message-board,photo-wall,record-collection}},hig-book/{C/images,de/images,el/images,es/images,fr/images,sl/images,zh_CN/images,zh_HK/images,zh_TW/images},integration-guide/{C,cs,de,el,en_GB,es,fr,gl,it,pt_BR,sl,sv,zh_CN},optimization-guide/{C/figures,cs/figures,de/figures,el/figures,es/figures,fr/figures,gl/figures,sl/figures,zh_CN/figures},platform-overview/{C,ca,cs,de,el,es,fr,gl,it,ja,oc,pt_BR,ru,sl,uk,zh_CN}},omf/{accessibility-devel-guide,hig-book,integration-guide,optimization-guide}}</seg>
+        <seg>
+          /usr/share/gnome/help/{accessibility-devel-guide,gnome-devel-demos},
+          /usr/share/gnome/help/{hig-book,integration-guide} and
+          /usr/share/gnome/help/{optimization-guide,platform-overview}
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/add/gnome-games.xml
===================================================================
--- gnome/add/gnome-games.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/gnome-games.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,14 +5,20 @@
   %general-entities;
 
-  <!ENTITY gnome-games-download-http            "&gnome-download-http;/gnome-games/&gnome-version;/gnome-games-&gnome-games-version;.tar.xz">
-  <!ENTITY gnome-games-download-ftp             "&gnome-download-ftp;/gnome-games/&gnome-version;/gnome-games-&gnome-games-version;.tar.xz">
-  <!ENTITY gnome-games-md5sum                   "ea918bdb469f7bf550750862bbda2b12">
-  <!ENTITY gnome-games-size                     "22 MB">
+  <!ENTITY gnome-games-download-http            
+           "&gnome-download-http;/gnome-games/3.4/gnome-games-&gnome-games-version;.tar.xz">
+  <!ENTITY gnome-games-download-ftp             
+           "&gnome-download-ftp;/gnome-games/3.4/gnome-games-&gnome-games-version;.tar.xz">
+  <!ENTITY gnome-games-md5sum                   "7dc21d85550b58818a8db432f364bf3e">
+  <!ENTITY gnome-games-size                     "20 MB">
   <!ENTITY gnome-games-buildsize                "176 MB">
-  <!ENTITY gnome-games-time                     "2.5 SBU">
+  <!ENTITY gnome-games-time                     "2.2 SBU">
+
+<!-- No 3.4 release yet.
   <!ENTITY gnome-games-extra-data-version       "3.2.0">
-  <!ENTITY gnome-games-extra-data-download-http "&gnome-download-http;/gnome-games-extra-data/&gnome-version;/gnome-games-extra-data-&gnome-games-extra-data-version;.tar.xz">
+
+  <!ENTITY gnome-games-extra-data-download-http 
+           "&gnome-download-http;/gnome-games-extra-data/&gnome-version;/gnome-games-extra-data-&gnome-games-extra-data-version;.tar.xz">
   <!ENTITY gnome-games-extra-data-md5sum        "6649fa10772261059a3c9615d8b8298b">
-  <!ENTITY gnome-games-extra-data-size          "1.9 MB">
+  <!ENTITY gnome-games-extra-data-size          "1.9 MB"> -->
 ]>
 
@@ -34,7 +40,8 @@
     <title>Introduction to GNOME Games</title>
 
-    <para>The <application>GNOME Games</application> package contains games.
-    Background graphics, artwork and themes for glines, gnobots-2, iagno and
-    mahjngg are supplied in a separate package.</para>
+    <para>The <application>GNOME Games</application> is a collection 
+    of simple, but addictive games from the GNOME Desktop project. 
+    They represent many of the popular games and include card games, 
+    puzzle games and arcade games.</para>
 
     &lfs70_checked;
@@ -62,5 +69,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Download</bridgehead>
+<!--    <bridgehead renderas="sect3">Additional Download</bridgehead>
 
     <itemizedlist spacing="compact">
@@ -75,27 +82,22 @@
         <para>Download size: &gnome-games-extra-data-size;</para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">GNOME Games Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="clutter-gtk"/>,
-    <xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="libcanberra"/>,
-    <xref linkend="librsvg"/>,
-    <xref linkend="pygobject2"/>,
-    <xref linkend="sqlite"/>,
-    <xref linkend="which"/>,
-    <xref linkend="perl-xml-parser"/>, and
-    <xref linkend="xorg7"/>
-</para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="rarian"/></para>
+    <para role="required">
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="itstool"/>,
+      <xref linkend="libcanberra"/>,
+      <xref linkend="librsvg"/> and
+      <xref linkend="pygobject3"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="check"/>, and <ulink
-    url="http://www.ggzgamingzone.org/">ggz-gtk-client</ulink></para>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -115,5 +117,5 @@
 groupadd -fg 60 games &amp;&amp;
 useradd -c 'Games High Score Owner' -d /var/lib/games \
-        -g games -s /bin/false -u 60 games || [ $? == 9 ] &amp;&amp;
+        -g games -s /bin/false -u 60 games &amp;&amp;
 chown -v games:games /var/lib/games</userinput></screen>
 
@@ -121,12 +123,9 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR \
-            --localstatedir=/var/lib \
-            --disable-tests &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --localstatedir=/var/lib &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note that
-    even with <command>--disable-tests</command>, tests for glchess will be run.</para>
+    <para>To test the results, issue: <command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -134,14 +133,14 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you want to install the <application>GNOME Games</application> Extra Data package, run the following commands:</para>
+<!--    <para>If you want to install the <application>GNOME Games</application> Extra Data package, run the following commands:</para>
 
 <screen><userinput>tar -xvf ../gnome-games-extra-data-&gnome-games-extra-data-version;.tar.xz &amp;&amp;
 cd gnome-games-extra-data-&gnome-games-extra-data-version; &amp;&amp;
-./configure --prefix=$GNOME_PREFIX &amp;&amp;
+./configure -prefix=$GNOME_PREFIX &amp;&amp;
 make</userinput></screen>
 
     <para>Now again , as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen> -->
 
   </sect2>
@@ -150,9 +149,6 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
 
     <para><parameter>--localstatedir=/var/lib</parameter>: This parameter is
@@ -166,11 +162,4 @@
     functionality to save high game scores will be disabled.</para>
 
-    <para><parameter>--disable-tests</parameter>: Remove this parameter if you
-    have <application>Check</application> installed and you wish to build the
-    test apps.</para>
-
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
-
   </sect2>
 
@@ -180,28 +169,22 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>glchess, glines, gnect, gnibbles, gnobots2, gnome-gnuchess,
-        gnome-sudoku, gnomine, gnotravex, gnotski, gtali, iagno,
-        mahjongg, quadrapassel</seg>
-        <seg>libgames-support-gi.{so,a}</seg>
-        <seg>/usr/lib/python&python2-majorver;/site-packages/{glchess/{chess/fics,
-        ggz,gtkui,scene/{cairo,opengl},ui},gnome_sudoku/gtk_goodies},
-        <envar>$GNOME_PREFIX</envar>/{lib/gnome-games,share/{glchess/textures,
-        gnome-games-common/cards,gnome-games/{glines/pixmaps,
-        gnect/pixmaps,gnibbles/{games,pixmaps},gnobots2/{games,pixmaps,themes},
-        gnomine/pixmaps,gnotski/pixmaps,gtali/pixmaps,iagno/pixmaps,
-        icons/hicolor/{16x16/actions,22x22/actions,24x24/actions,32x32/actions,
-        48x48/actions,scalable/actions},
-        mahjongg/{games,pixmaps},pixmaps,quadrapassel/pixmaps,sounds,
-        gnome-sudoku/{images,puzzles},
-        gnome/help/{glchess/*,glines/*,gnect/*,gnibbles/*,
-        gnobots2/*,gnome-sudoku/*,gnomine/*,gnotravex/*,gnotski/*,gtali/*,
-        iagno/*,mahjongg/*,quadrapassel/*},
-        omf/{glchess,glines,gnect,gnibbles,gnobots2,gnome-sudoku,
-        gnomine,gnotski,gtali,iagno,mahjongg,quadrapassel}}},
-        /var/lib/games</seg>
+        <seg>
+          glchess, glines, gnect, gnibbles, gnobots2, gnome-sudoku,
+          gnomine, gnotravex, gnotski, gtali, iagno, lightsoff,
+          mahjongg, quadrapassel and swell-foop
+        </seg>
+        <seg>
+          /usr/lib/gnome-games, /usr/lib/python2.7/site-packages/gnome_sudoku,
+          /usr/share/{glchess,glines,gnect,gnibbles,gnobots2,gnome-games},
+          /usr/share/{gnome-sudoku,gnomine,gnotravex,gnotski,gtali},
+          /usr/share/help/*/{glchess,glines,gnect,gnibbles,gnobots2,gnome-sudoku}, 
+          /usr/share/help/*/{gnomine,gnotravex,gnotski,gtali,iagno,lightsoff},
+          /usr/share/help/*/{mahjongg,quadrapassel,swell-foop},
+          /usr/share/{iagno,lightsoff,mahjongg,quadrapassel} and
+          /var/lib/games
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -267,14 +250,4 @@
       </varlistentry>
 
-      <varlistentry id="gnome-gnuchess">
-        <term><command>gnome-gnuchess</command></term>
-        <listitem>
-          <para>is a chess game which supports several chess engines.</para>
-          <indexterm zone="gnome-games gnome-gnuchess">
-            <primary sortas="b-gnome-gnuchess">gnome-gnuchess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gnome-sudoku">
         <term><command>gnome-sudoku</command></term>
Index: gnome/add/nautilus-sendto.xml
===================================================================
--- gnome/add/nautilus-sendto.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/add/nautilus-sendto.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -5,13 +5,15 @@
   %general-entities;
 
-  <!ENTITY nautilus-sendto-download-http "&gnome-download-http;/nautilus-sendto/3.0/nautilus-sendto-&nautilus-sendto-version;.tar.xz">
-  <!ENTITY nautilus-sendto-download-ftp  "&gnome-download-ftp;/nautilus-sendto/3.0/nautilus-sendto-&nautilus-sendto-version;.tar.xz">
-  <!ENTITY nautilus-sendto-md5sum        "291b01089bdd02e46c2e47508e75e013">
+  <!ENTITY nautilus-sendto-download-http 
+           "&gnome-download-http;/nautilus-sendto/3.0/nautilus-sendto-&nautilus-sendto-version;.tar.xz">
+  <!ENTITY nautilus-sendto-download-ftp  
+           "&gnome-download-ftp;/nautilus-sendto/3.0/nautilus-sendto-&nautilus-sendto-version;.tar.xz">
+  <!ENTITY nautilus-sendto-md5sum        "cfd7e91cdd27adaed50bf7050229c8bc">
   <!ENTITY nautilus-sendto-size          "369 KB">
-  <!ENTITY nautilus-sendto-buildsize     "7.6 MB">
+  <!ENTITY nautilus-sendto-buildsize     "8.0 MB">
   <!ENTITY nautilus-sendto-time          "0.2 SBU">
 ]>
 
-<sect1 id="nautilus-sendto" xreflabel="nautilus-sendto-&nautilus-sendto-version;">
+<sect1 id="nautilus-sendto" xreflabel="Nautilus-Sendto-&nautilus-sendto-version;">
   <?dbhtml filename="nautilus-sendto.html"?>
 
@@ -21,5 +23,5 @@
   </sect1info>
 
-  <title>nautilus-sendto-&nautilus-sendto-version;</title>
+  <title>Nautilus-Sendto-&nautilus-sendto-version;</title>
 
   <indexterm zone="nautilus-sendto">
@@ -28,7 +30,7 @@
 
   <sect2 role="package">
-    <title>Introduction to nautilus-sendto</title>
+    <title>Introduction to Nautilus-Sendto</title>
 
-    <para>The <application>nautilus-sendto</application> package provides the
+    <para>The <application>Nautilus-Sendto</application> package provides the
     <application>Nautilus</application> file manager with a context menu
     component for quickly sending files to accounts in an
@@ -39,5 +41,5 @@
     Claws</application>).</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63,13 +65,21 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">nautilus-sendto Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Nautilus-Sendto Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="nautilus"/></para>
+    <para role="required">
+      <xref linkend="nautilus"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="evolution-data-server"/> and
+      <xref linkend="gupnp"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="evolution"/>,
-    <xref linkend="evolution-data-server"/>, and
-    <ulink url="http://www.gupnp.org/">gUPnP</ulink></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -79,10 +89,10 @@
 
   <sect2 role="installation">
-    <title>Installation of nautilus-sendto</title>
+    <title>Installation of Nautilus-Sendto</title>
 
-    <para>Install <application>nautilus-sendto</application> by running the following
+    <para>Install <application>Nautilus-Sendto</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -98,6 +108,9 @@
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -108,14 +121,15 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>nautilus-sendto</seg>
-        <seg>libnstbluetooth.so, libnstburn.so, libnstgajim.so, libnstpidgin.so,
-        libnstremovable_devices.so, libnstupnp.so, and libnautilus-sendto.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/nautilus-sendto,
-        lib/nautilus-sendto/plugins,share/{gtk-doc/html/nautilus-sendto,
-        nautilus-sendto/ui}}</seg>
+        <seg>
+          nautilus-sendto
+        </seg>
+        <seg>
+          /usr/include/nautilus-sendto, /usr/lib/nautilus-sendto,
+          /usr/share/gtk-doc/html/nautilus-sendto and
+          /usr/share/nautilus-sendto
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -137,74 +151,4 @@
       </varlistentry>
 
-      <varlistentry id="libnstbluetooth">
-        <term><filename class='libraryfile'>libnstbluetooth.so</filename></term>
-        <listitem>
-          <para>is the bluetooth plugin library.</para>
-          <indexterm zone="nautilus-sendto libnstbluetooth">
-            <primary sortas="c-libnstbluetooth">libnstbluetooth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnstburn">
-        <term><filename class='libraryfile'>libnstburn.so</filename></term>
-        <listitem>
-          <para>is the nautilus-burn plugin library.</para>
-          <indexterm zone="nautilus-sendto libnstburn">
-            <primary sortas="c-libnstburn">libnstburn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnstgajim">
-        <term><filename class='libraryfile'>libnstgajim.so</filename></term>
-        <listitem>
-          <para>is the <application>Gajim</application> plugin library.</para>
-          <indexterm zone="nautilus-sendto libnstgajim">
-            <primary sortas="c-libnstgajim">libnstgajim.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnstpidgin">
-        <term><filename class='libraryfile'>libnstpidgin.so</filename></term>
-        <listitem>
-          <para>is the <application>Pidgin</application> plugin library.</para>
-          <indexterm zone="nautilus-sendto libnstpidgin">
-            <primary sortas="c-libnstpidgin">libnstpidgin.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnstremovable_devices">
-        <term><filename class='libraryfile'>libnstremovable_devices.so</filename></term>
-        <listitem>
-          <para>is the removable-devices plugin library.</para>
-          <indexterm zone="nautilus-sendto libnstremovable_devices">
-            <primary sortas="c-libnstremovable_devices">libnstremovable_devices.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnstupnp">
-        <term><filename class='libraryfile'>libnstupnp.so</filename></term>
-        <listitem>
-          <para>is the upnp plugin library.</para>
-          <indexterm zone="nautilus-sendto libnstupnp">
-            <primary sortas="c-libnstupnp">libnstupnp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnautilus-sendto">
-        <term><filename class='libraryfile'>libnautilus-sendto.so</filename></term>
-        <listitem>
-          <para>contains the <application>nautilus-sendto</application> API functions.</para>
-          <indexterm zone="nautilus-sendto libnautilus-sendto">
-            <primary sortas="c-libnautilus-sendto">libnautilus-sendto.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ gnome/core/gnome-panel.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -64,5 +64,4 @@
     <para role="required">
       <xref linkend="gnome-desktop"/>,
-      <xref linkend="gnome-doc-utils"/>,
       <xref linkend="gnome-menus"/>,
       <xref linkend="libcanberra"/>,
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 07078ccbbc059bda94641f06270339639e8e5958)
+++ introduction/welcome/changelog.xml	(revision 8202762341b2748e09081b4179f328d802d7c0cc)
@@ -42,4 +42,42 @@
 
 -->
+    <listitem>
+      <para>April 29th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Anjuta 3.4.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Cheese 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Devhelp 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Evolution 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - File-Roller 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Gedit 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Glade 3.12.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - gnome-applets 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - gnome-devel-docs 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - gnome-games 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - nautilus-sendto 3.0.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
