Index: general.ent
===================================================================
--- general.ent	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ general.ent	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -810,5 +810,5 @@
 <!ENTITY file-roller-version          "3.4.1">
 <!ENTITY gedit-version                "3.4.1">
-<!ENTITY ghex-version                 "3.0.0">
+<!ENTITY ghex-version                 "3.4.0">
 <!ENTITY glade-version                "3.12.0">
 <!ENTITY gnome-color-manager-version  "3.2.1">
@@ -827,8 +827,8 @@
 <!ENTITY hamster-applet-version       "2.30.2">-->
 <!ENTITY nautilus-sendto-version      "3.0.2">
-<!ENTITY nemiver-version              "0.9.0">
+<!ENTITY nemiver-version              "0.9.2">
 <!ENTITY rygel-version                "0.12.5">
-<!ENTITY seahorse-version             "3.2.2">
-<!ENTITY totem-version                "3.2.1">
+<!ENTITY seahorse-version             "3.4.1">
+<!ENTITY totem-version                "3.4.1">
 <!ENTITY vinagre-version              "3.2.2">
 
Index: gnome/add/file-roller.xml
===================================================================
--- gnome/add/file-roller.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/add/file-roller.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -74,9 +74,5 @@
     <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>
Index: gnome/add/ghex.xml
===================================================================
--- gnome/add/ghex.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/add/ghex.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY ghex-download-http "&gnome-download-http;/ghex/3.0/ghex-&ghex-version;.tar.xz">
-  <!ENTITY ghex-download-ftp  "&gnome-download-ftp;/ghex/3.0/ghex-&ghex-version;.tar.xz">
-  <!ENTITY ghex-md5sum        "ffa346d6fa97b9e787680159a5479b84">
+  <!ENTITY ghex-download-http "&gnome-download-http;/ghex/3.4/ghex-&ghex-version;.tar.xz">
+  <!ENTITY ghex-download-ftp  "&gnome-download-ftp;/ghex/3.4/ghex-&ghex-version;.tar.xz">
+  <!ENTITY ghex-md5sum        "02e6c46deaefa507c70a333769aa8524">
   <!ENTITY ghex-size          "1.3 MB">
-  <!ENTITY ghex-buildsize     "15.7 MB">
-  <!ENTITY ghex-time          "0.2 SBU">
+  <!ENTITY ghex-buildsize     "15 MB">
+  <!ENTITY ghex-time          "0.3 SBU">
 ]>
 
-<sect1 id="ghex" xreflabel="ghex-&ghex-version;">
+<sect1 id="ghex" xreflabel="Ghex-&ghex-version;">
   <?dbhtml filename="ghex.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>ghex-&ghex-version;</title>
+  <title>Ghex-&ghex-version;</title>
 
   <indexterm zone="ghex">
@@ -28,7 +28,7 @@
 
   <sect2 role="package">
-    <title>Introduction to ghex</title>
+    <title>Introduction to Ghex</title>
 
-    <para><application>gGhex</application> allows the user to view and edit data from
+    <para><application>Ghex</application> allows the user to view and edit data from
     any file in hex and ASCII.</para>
 
@@ -57,12 +57,16 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">ghex Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Ghex Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk3"/> and
-    <xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/> and
+      <xref linkend="gtk3"/>
+     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional"><xref linkend="rarian"/></para>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -72,10 +76,10 @@
 
   <sect2 role="installation">
-    <title>Installation of ghex</title>
+    <title>Installation of Ghex</title>
 
-    <para>Install <application>ghex</application> by running the following
+    <para>Install <application>Ghex</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,7 +102,14 @@
 
       <seglistitem>
-        <seg>ghex</seg>
-        <seg>libgtkhex-3.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gtkhex-3,share/{ghex,gnome/help/ghex/{C/figures,cs/figures,de/figures,es/figures,fr/figures,it/figures,ja/figures,ko/figures,oc/figures,sl/figures,sv/figures,th/figures,zh_CN/figures,zh_TW/figures},omf/ghex}}</seg>
+        <seg>
+          ghex
+        </seg>
+        <seg>
+          libgtkhex-3.so
+        </seg>
+        <seg>
+          /usr/include/gtkhex-3, /usr/share/gnome/help/ghex and
+          /usr/share/omf/ghex
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -112,20 +123,20 @@
         <term><command>ghex</command></term>
         <listitem>
-          <para>is a hex editor.</para>
+          <para>is a GTK+ binary file editor.</para>
           <indexterm zone="ghex ghex-prog">
-            <primary sortas="b-ghex-prog">ghex-prog</primary>
+            <primary sortas="b-ghex">ghex</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <!--<varlistentry id="libgtkhex-3">
+      <varlistentry id="libgtkhex-3">
         <term><filename class='libraryfile'>libgtkhex-3.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains the Ghex API functions.</para>
           <indexterm zone="ghex libgtkhex-3">
             <primary sortas="c-libgtkhex-3">libgtkhex-3.so</primary>
           </indexterm>
         </listitem>
-      </varlistentry>-->
+      </varlistentry>
 
     </variablelist>
Index: gnome/add/glade.xml
===================================================================
--- gnome/add/glade.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/add/glade.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -66,9 +66,13 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="rarian"/>
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gtk-doc"/>
     </para>
 
Index: gnome/add/gnome-devel-docs.xml
===================================================================
--- gnome/add/gnome-devel-docs.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/add/gnome-devel-docs.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -67,5 +67,5 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional">
+    <para role="recommended">
       <xref linkend="rarian"/>
     </para>
Index: gnome/add/nemiver.xml
===================================================================
--- gnome/add/nemiver.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/add/nemiver.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -7,11 +7,11 @@
   <!ENTITY nemiver-download-http "&gnome-download-http;/nemiver/0.9/nemiver-&nemiver-version;.tar.xz">
   <!ENTITY nemiver-download-ftp  "&gnome-download-ftp;/nemiver/0.9/nemiver-&nemiver-version;.tar.xz">
-  <!ENTITY nemiver-md5sum        "03a2c34d4c04fd69749c01975a97c0c2">
+  <!ENTITY nemiver-md5sum        "88601c0acba141591fe7acb1840d9299">
   <!ENTITY nemiver-size          "2.2 MB">
-  <!ENTITY nemiver-buildsize     "527 MB">
-  <!ENTITY nemiver-time          "6 SBU">
+  <!ENTITY nemiver-buildsize     "170 MB">
+  <!ENTITY nemiver-time          "4.5 SBU">
 ]>
 
-<sect1 id="nemiver" xreflabel="nemiver-&nemiver-version;">
+<sect1 id="nemiver" xreflabel="Nemiver-&nemiver-version;">
   <?dbhtml filename="nemiver.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>nemiver-&nemiver-version;</title>
+  <title>Nemiver-&nemiver-version;</title>
 
   <indexterm zone="nemiver">
@@ -28,10 +28,10 @@
 
   <sect2 role="package">
-    <title>Introduction to nemiver</title>
+    <title>Introduction to Nemiver</title>
 
     <para><application>Nemiver</application> is an ongoing attempt to write a standalone
     graphical debugger that integrates well in the GNOME desktop environment.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -60,16 +60,25 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gdb"/>,
-    <xref linkend="gdlmm"/>,
-    <xref linkend="ghex"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtkmm3"/>,
-    <xref linkend="gtksourceviewmm"/>,
-    <xref linkend="libgtop"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="vte"/></para>
+    <para role="required">
+      <xref linkend="dconf"/>,
+      <xref linkend="gdb"/>,
+      <xref linkend="gdlmm"/>,
+      <xref linkend="ghex"/>,
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gsettings-desktop-schemas"/>,
+      <xref linkend="gtksourceviewmm"/>,
+      <xref linkend="libgtop"/> and
+      <xref linkend="vte"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="boost"/></para>
+    <para role="optional">
+      <xref linkend="boost"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -84,5 +93,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -98,6 +107,6 @@
     <title>Command Explanations</title>
 
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -108,11 +117,15 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>nemiver</seg>
-        <seg>libcpptraitmod.{so,a}, libdbgperspectiveplugin.{so,a}, libgdbmod.{so,a}, libgsettingsmgrmod.{so,a}, libnemivercommon.{so,a}, libnemiverdbdsqlite.{so,a}, libvarlistmod.{so,a}, libvarlistwalkermod.{so,a}, libvarobjwalkermod.{so,a}, libvarwalkermod.{so,a}, and libworkbenchmod.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/nemiver/{C/figures,cs/figures,de/figures,es/figures,fr/figures,gl/figures,oc/figures,sl/figures,sv/figures,zh_CN/figures},nemiver/{menus,ui},omf/nemiver}</seg>
+        <seg>
+          nemiver
+        </seg>
+        <seg>
+          /usr/include/nemiver, /usr/lib/nemiver,
+          /usr/share/gnome/help/nemiver,
+          /usr/share/nemiver and /usr/share/omf/nemiver
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -126,120 +139,10 @@
         <term><command>nemiver</command></term>
         <listitem>
-          <para>is the GNOME debugger.</para>
+          <para>is the graphical debugger for GNOME.</para>
           <indexterm zone="nemiver nemiver-prog">
-            <primary sortas="b-nemiver-prog">nemiver-prog</primary>
+            <primary sortas="b-nemiver">nemiver</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-
-  <!--<varlistentry id="libcpptraitmod">
-        <term><filename class='libraryfile'>libcpptraitmod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libcpptraitmod">
-            <primary sortas="c-libcpptraitmod">libcpptraitmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdbgperspectiveplugin">
-        <term><filename class='libraryfile'>libdbgperspectiveplugin.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libdbgperspectiveplugin">
-            <primary sortas="c-libdbgperspectiveplugin">libdbgperspectiveplugin.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdbmod">
-        <term><filename class='libraryfile'>libgdbmod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libgdbmod">
-            <primary sortas="c-libgdbmod">libgdbmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgsettingsmgrmod">
-        <term><filename class='libraryfile'>libgsettingsmgrmod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libgsettingsmgrmod">
-            <primary sortas="c-libgsettingsmgrmod">libgsettingsmgrmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnemivercommon">
-        <term><filename class='libraryfile'>libnemivercommon.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libnemivercommon">
-            <primary sortas="c-libnemivercommon">libnemivercommon.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnemiverdbdsqlite">
-        <term><filename class='libraryfile'>libnemiverdbdsqlite.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libnemiverdbdsqlite">
-            <primary sortas="c-libnemiverdbdsqlite">libnemiverdbdsqlite.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvarlistmod">
-        <term><filename class='libraryfile'>libvarlistmod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libvarlistmod">
-            <primary sortas="c-libvarlistmod">libvarlistmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvarlistwalkermod">
-        <term><filename class='libraryfile'>libvarlistwalkermod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libvarlistwalkermod">
-            <primary sortas="c-libvarlistwalkermod">libvarlistwalkermod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvarobjwalkermod">
-        <term><filename class='libraryfile'>libvarobjwalkermod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libvarobjwalkermod">
-            <primary sortas="c-libvarobjwalkermod">libvarobjwalkermod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvarwalkermod">
-        <term><filename class='libraryfile'>libvarwalkermod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libvarwalkermod">
-            <primary sortas="c-libvarwalkermod">libvarwalkermod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libworkbenchmod">
-        <term><filename class='libraryfile'>libworkbenchmod.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="nemiver libworkbenchmod">
-            <primary sortas="c-libworkbenchmod">libworkbenchmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
 
     </variablelist>
Index: gnome/add/seahorse.xml
===================================================================
--- gnome/add/seahorse.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/add/seahorse.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY seahorse-download-http "&gnome-download-http;/seahorse/&gnome-version;/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-download-ftp  "&gnome-download-ftp;/seahorse/&gnome-version;/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-md5sum        "87f34a292f54e01a974695696e5dc842">
-  <!ENTITY seahorse-size          "1.9 MB">
-  <!ENTITY seahorse-buildsize     "51 MB">
-  <!ENTITY seahorse-time          "0.7 SBU">
+  <!ENTITY seahorse-download-http "&gnome-download-http;/seahorse/3.4/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-download-ftp  "&gnome-download-ftp;/seahorse/3.4/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-md5sum        "0d5215a1b6d5747afe0909f4d91f53b9">
+  <!ENTITY seahorse-size          "2.0 MB">
+  <!ENTITY seahorse-buildsize     "56 MB">
+  <!ENTITY seahorse-time          "0.8 SBU">
 ]>
 
@@ -34,5 +34,5 @@
     keys (using GPG/GPGME) and SSH keys.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61,20 +61,24 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gpgme"/> (required for LDAP support) or
-    <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>,
-    <xref linkend="gtk3"/>, and
-    <xref linkend="libgnome-keyring"/></para>
+    <para role="required">
+      <xref linkend="gcr"/>,
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gpgme"/>,
+      <xref linkend="gnupg"/> or <xref linkend="gnupg2"/> and
+      <xref linkend="libgnome-keyring"/>
+    </para>
 
-    <bridgehead renderas="sect4">Rarian:</bridgehead>
-    <para role="optional"><xref linkend="rarian"/></para>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libsoup"/> and
+      <xref linkend="rarian"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="avahi"/>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="libnotify"/>,
-    <xref linkend="libsoup"/>,
-    <xref linkend="openldap"/></para>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="openldap"/> and
+      <xref linkend="openssh"/> (for ssh-keygen)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -89,5 +93,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -103,12 +107,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"/> -->
 
     <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/gtk-doc-rebuild.xml"/>
+    href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -118,14 +119,13 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>seahorse, seahorse-ssh-askpass</seg>
-        <seg>none</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/lib/seahorse,
-        share/{gnome/help/seahorse/*,gtk-doc/html/{libcryptui,libseahorse},
-        omf/seahorse,pixmaps/seahorse/{22x22,48x48,scalable},seahorse/ui}}</seg>
+        <seg>seahorse</seg>
+        <seg>
+          /usr/lib/seahorse, /usr/share/gnome/help/seahorse,
+          /usr/share/omf/seahorse and /usr/share/seahorse
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -147,27 +147,4 @@
       </varlistentry>
 
-      <!-- no longer present
-      <varlistentry id="seahorse-daemon">
-        <term><command>seahorse-daemon</command></term>
-        <listitem>
-          <para>is a <application>seahorse</application> pass phrase caching
-          agent.</para>
-          <indexterm zone="seahorse seahorse-daemon">
-            <primary sortas="b-seahorse-daemon">seahorse-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcryptui">
-        <term><filename class='libraryfile'>libcryptui.{so,a}</filename></term>
-        <listitem>
-          <para>is the the UI library for <application>DBUS</application>
-          functions exported by <application>Seahorse</application>.</para>
-          <indexterm zone="seahorse libcryptui">
-            <primary sortas="c-libcryptui">libcryptui.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
     </variablelist>
 
Index: gnome/add/totem.xml
===================================================================
--- gnome/add/totem.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/add/totem.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY totem-download-http "&gnome-download-http;/totem/&gnome-version;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/&gnome-version;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-md5sum        "6a7911b45f908fd8237ba1217d0fded3">
-  <!ENTITY totem-size          "3.0 MB">
-  <!ENTITY totem-buildsize     "98 MB">
-  <!ENTITY totem-time          "2.9 SBU">
+  <!ENTITY totem-download-http "&gnome-download-http;/totem/3.4/totem-&totem-version;.tar.xz">
+  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/3.4/totem-&totem-version;.tar.xz">
+  <!ENTITY totem-md5sum        "e74a2ce5399cce760fb60adcf1f5b835">
+  <!ENTITY totem-size          "3.1 MB">
+  <!ENTITY totem-buildsize     "70 MB">
+  <!ENTITY totem-time          "2.5 SBU">
 ]>
 
@@ -37,7 +37,4 @@
     DVD, VCD or digital CD.</para>
 
-    <para>Now that this package uses the <application>clutter</application> toolkit,
-    it is only useful if you have hardware accelerated video.</para>
-
     &lfs70_checked;
 
@@ -67,11 +64,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gst-plugins-good"/>,
-    <xref linkend="libunique"/>,
-    <xref linkend="shared-mime-info"/>,
-    <xref linkend="totem-pl-parser"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gnome-icon-theme"/>,
+      <xref linkend="gst-plugins-good"/>,
+      <xref linkend="iso-codes"/>,
+      <xref linkend="libpeas"/>,
+      <xref linkend="shared-mime-info"/> and
+      <xref linkend="totem-pl-parser"/>
+    </para>
 
     <para>Ensure you built <application>GStreamer Good Plugins</application>
@@ -79,27 +79,23 @@
     <command>configure</command> script will fail.</para>
 
-    <!-- commenting, I can find no references to PyGTK or pygtk in the package, except
-    for old ChangeLog entries.
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pygtk"/> (Required for various plugins)</para>-->
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="nautilus"/>,
+      <xref linkend="pygobject3"/>,
+      <xref linkend="rarian"/> and
+      <xref linkend="vala"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://www.bluez.org/">BlueZ</ulink>,
-    <ulink url="http://gmyth.sourceforge.net">GMyth</ulink>,
-    <ulink url="http://gmyth.sourceforge.net">GMyth-upnp</ulink>,
-    <ulink url="http://www.home.unix-ag.org/simon/gromit/">Gromit</ulink>
-    (required for the telestrator mode),
-    <ulink url="http://live.gnome.org/libepc/">libepc</ulink>,
-    <ulink url="http://www.galago-project.org/">libgalago</ulink>,
-    <ulink url="http://live.gnome.org/libgdata/">libgdata</ulink>,
-    <ulink url="http://www.lirc.org">LIRC</ulink>,
-    <xref linkend="nautilus"/>,
-    <xref linkend="pygobject2"/>,
-    <ulink url="http://pypi.python.org/pypi/pylint"/> (required, with its dependencies,
-    to run the testsuite),
-    <ulink url="http://live.gnome.org/Tracker/">Tracker</ulink>,
-    <ulink url="http://live.gnome.org/Vala/">Vala</ulink>, and
-    <xref linkend="firefox"/> or <xref linkend="xulrunner"/>
-    (to build the browser plug-in)</para>
+    <para role="optional">
+      <ulink url="http://live.gnome.org/Grilo/">Grilo</ulink>,
+      <xref linkend="gtk-doc"/>,
+      <ulink url="http://live.gnome.org/libepc/">libepc</ulink>,
+      <ulink url="http://www.lirc.org">LIRC</ulink>,
+      <ulink url="http://pypi.python.org/pypi/pylint"/>pylint</ulink> and
+      <xref linkend="firefox"/> or <xref linkend="xulrunner"/>
+      (to build the browser plug-ins)
+    </para>
 
     <para>Note: <xref linkend="libdvdcss"/> is a run-time requirement if you
@@ -117,6 +113,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/totem &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/totem \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -133,20 +130,18 @@
     <title>Command Explanations</title>
 
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
+
+    <para><parameter>--libexecdir=/usr/lib/totem</parameter>: This
+    parameter is used so that the plugin viewer is installed in
+    the preferred location of <filename
+    class='directory'>/usr/lib/totem</filename> instead of <filename
+    class='directory'>/usr/libexec</filename>.</para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/totem</parameter>: This
-    parameter is used so that the movie player browser plugin is installed in
-    the preferred location of <filename
-    class='directory'>$GNOME_PREFIX/lib/totem</filename> instead of <filename
-    class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <!-- This is broken now so disabling the comment
-    <para><option>-enable-vanity</option>: Using this parameter will build the
-    webcam utility (still in development).</para>
-    -->
+    href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -170,21 +165,19 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>totem, totem-audio-preview,
-        totem-video-thumbnailer, and totem-plugin-viewer</seg>
-        <seg>libtotem.{so,a}, libtotem-properties-page.{so,a}, libbrasero-disc-recorder.{so,a},
-        libgromit.{so,a}, libmedia_player_keys.{so,a}, libontop.{so,a},
-        libmovie-properties.{so,a}, libscreensaver.{so,a}, libscreenshot.{so,a},
-        libskipto.{so,a}, libthumbnail.{so,a}, libtotem-cone-plugin.{so,a},
-        libtotem-gmp-plugin.{so,a}, libtotem-mully-plugin.{so,a}, and
-        libtotem-narrowspace-plugin.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/totem/{plugins/{brasero-disc-recorder,
-        coherence_upnp,dbus,gromit,iplayer,jamendo,media-player-keys,ontop,
-        opensubtitles,properties,pythonconsole,screensaver,screenshot,skipto,
-        thumbnail,totem},totem},share/{gnome/help/totem/*,gtk-doc/html/totem,
-        omf/totem,totem}}</seg>
+        <seg>
+          totem, totem-audio-preview and totem-video-thumbnailer
+        </seg>
+        <seg>
+          libtotem.so
+        </seg>
+        <seg>
+          /usr/include/totem, /usr/lib/totem, /usr/share/gnome/help/totem,
+          /usr/share/gtk-doc/html/totem, /usr/share/omf/totem and
+          /usr/share/totem
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -219,4 +212,15 @@
         </listitem>
       </varlistentry>
+
+      <varlistentry id="libtotem">
+        <term><filename class='libraryfile'>libtotem.so</filename></term>
+        <listitem>
+          <para>contains the Totem API functions.</para>
+          <indexterm zone="totem libtotem">
+            <primary sortas="c-libtotem">libtotem.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: gnome/core/empathy.xml
===================================================================
--- gnome/core/empathy.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/core/empathy.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -84,6 +84,7 @@
       <xref linkend="geocode-glib"/>,
       <xref linkend="libchamplain"/>,
-      <xref linkend="nautilus-sendto"/> and
-      <xref linkend="NetworkManager"/>
+      <xref linkend="nautilus-sendto"/>,
+      <xref linkend="NetworkManager"/> and
+      <xref linkend="rarian"/>
     </para>
 
@@ -93,5 +94,4 @@
       <xref linkend="enchant"/>,
       <xref linkend="iso-codes"/>,
-      <xref linkend="rarian"/>,
       <ulink url="http://www.valgrind.org/">Valgrind</ulink> and
       <xref linkend="udev"/>
Index: gnome/core/gnome-bluetooth.xml
===================================================================
--- gnome/core/gnome-bluetooth.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/core/gnome-bluetooth.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -73,12 +73,12 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="nautilus-sendto"/>
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="nautilus-sendto"/> and
+      <xref linkend="rarian"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="rarian"/>
+      <xref linkend="gtk-doc"/>
     </para>
 
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/core/gnome-panel.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -75,12 +75,12 @@
       <xref linkend="evolution-data-server"/>,
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="NetworkManager"/> and
-      <xref linkend="telepathy-glib"/>
+      <xref linkend="NetworkManager"/>,
+      <xref linkend="telepathy-glib"/> and
+      <xref linkend="rarian"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="rarian"/>
+      <xref linkend="gtk-doc"/>
     </para>
 
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/core/gnome-terminal.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -69,6 +69,6 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="rarian"/>
     </para>
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/core/gnome-user-docs.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -68,6 +68,6 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="rarian"/>
     </para>
Index: gnome/core/mousetweaks.xml
===================================================================
--- gnome/core/mousetweaks.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/core/mousetweaks.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -69,6 +69,6 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="rarian"/>
     </para>
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ gnome/core/yelp.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -66,8 +66,12 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="rarian"/>
+      <xref linkend="gtk-doc"/>
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 17bcb8148ac5f0ae080e2b6054dc8f38a44972fd)
+++ introduction/welcome/changelog.xml	(revision ef6d24975f5c9700fe7bba0bfb4e98a811fb5fda)
@@ -64,4 +64,7 @@
         </listitem>
         <listitem>
+          <para>[krejzi] - Ghex 3.4.0.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - Glade 3.12.0.</para>
         </listitem>
@@ -77,4 +80,13 @@
         <listitem>
           <para>[krejzi] - nautilus-sendto 3.0.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Nemiver 0.9.2.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Seahorse 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Totem 3.4.1.</para>
         </listitem>
       </itemizedlist>
