Index: gnome/core/brasero.xml
===================================================================
--- gnome/core/brasero.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/brasero.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -67,7 +67,6 @@
       <xref linkend="gnome-doc-utils"/>,
       <xref linkend="gst-plugins-base"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libnotify"/> and
-      <xref linkend="which"/>
+      <xref linkend="libcanberra"/> and
+      <xref linkend="libnotify"/>
     </para>
 
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/core.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -30,5 +30,5 @@
   </caution>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/> -->
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-platform.xml"/>
@@ -120,5 +120,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdm.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/> -->
 
 </chapter>
Index: gnome/core/empathy.xml
===================================================================
--- gnome/core/empathy.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/empathy.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -72,10 +72,10 @@
       <xref linkend="gnome-doc-utils"/>,
       <xref linkend="gnome-online-accounts"/>,
+      <xref linkend="itstool"/>,
       <xref linkend="libcanberra"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="telepathy-farstream"/>,
-      <xref linkend="telepathy-logger"/>,
-      <xref linkend="telepathy-mission-control"/> and
-      <xref linkend="which"/>
+      <xref linkend="telepathy-logger"/> and
+      <xref linkend="telepathy-mission-control"/>
     </para>
 
Index: gnome/core/evince.xml
===================================================================
--- gnome/core/evince.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/evince.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -66,7 +66,6 @@
       <xref linkend="gnome-doc-utils"/>,
       <xref linkend="gnome-icon-theme"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="which"/>
+      <xref linkend="gsettings-desktop-schemas"/> and
+      <xref linkend="gtk3"/>
     </para>
 
Index: gnome/core/gcalctool.xml
===================================================================
--- gnome/core/gcalctool.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/gcalctool.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gcalctool-download-http "&gnome-download-http;/gcalctool/6.2/gcalctool-&gcalctool-version;.tar.xz">
-  <!ENTITY gcalctool-download-ftp  "&gnome-download-ftp;/gcalctool/6.2/gcalctool-&gcalctool-version;.tar.xz">
-  <!ENTITY gcalctool-md5sum        "2ec304f118735f6268d38741394a3b9e">
-  <!ENTITY gcalctool-size          "977 KB">
+  <!ENTITY gcalctool-download-http "&gnome-download-http;/gcalctool/6.4/gcalctool-&gcalctool-version;.tar.xz">
+  <!ENTITY gcalctool-download-ftp  "&gnome-download-ftp;/gcalctool/6.4/gcalctool-&gcalctool-version;.tar.xz">
+  <!ENTITY gcalctool-md5sum        "ea604540f86e2c6a52579b68e7d047e9">
+  <!ENTITY gcalctool-size          "988 KB">
   <!ENTITY gcalctool-buildsize     "31 MB">
-  <!ENTITY gcalctool-time          "0.8 SBU">
+  <!ENTITY gcalctool-time          "0.6 SBU">
 ]>
 
@@ -62,11 +62,14 @@
 
     <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"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="itstool"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="rarian"/></para>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -81,5 +84,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -92,5 +95,5 @@
   </sect2>
 
-  <sect2 role="commands">
+<!--  <sect2 role="commands">
     <title>Command Explanations</title>
 
@@ -98,5 +101,5 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
@@ -105,12 +108,13 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gcalccmd and gcalctool</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{gcalctool,
-        gnome/help/gcalctool/*}</seg>
+        <seg>
+          gcalccmd and gcalctool
+        </seg>
+        <seg>
+          /usr/share/help/*/gcalctool and /usr/share/gcalctool
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -124,6 +128,6 @@
         <term><command>gcalctool</command></term>
         <listitem>
-          <para>is a desktop calculator for
-          <application>GNOME</application>.</para>
+          <para>is the official calculator of the
+          <application>GNOME</application> desktop.</para>
           <indexterm zone="gcalctool gcalctool-prog">
             <primary sortas="b-gcalctool">gcalctool</primary>
Index: gnome/core/gnome-contacts.xml
===================================================================
--- gnome/core/gnome-contacts.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/gnome-contacts.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY gnome-contacts-download-http "&gnome-download-http;/gnome-contacts/3.2/gnome-contacts-&gnome-contacts-version;.tar.xz">
-  <!ENTITY gnome-contacts-download-ftp  "&gnome-download-ftp;/gnome-contacts/3.2/gnome-contacts-&gnome-contacts-version;.tar.xz">
-  <!ENTITY gnome-contacts-md5sum        "b7974ffcdd106fe9c42a074c465d0ef0">
-  <!ENTITY gnome-contacts-size          "465 KB">
-  <!ENTITY gnome-contacts-buildsize     "14 MB">
-  <!ENTITY gnome-contacts-time          "0.2 SBU">
+  <!ENTITY gnome-contacts-download-http 
+           "&gnome-download-http;/gnome-contacts/3.4/gnome-contacts-&gnome-contacts-version;.tar.xz">
+  <!ENTITY gnome-contacts-download-ftp  
+           "&gnome-download-ftp;/gnome-contacts/3.4/gnome-contacts-&gnome-contacts-version;.tar.xz">
+  <!ENTITY gnome-contacts-md5sum        "1d3133ae36e8a7938e24423b90a0222b">
+  <!ENTITY gnome-contacts-size          "580 KB">
+  <!ENTITY gnome-contacts-buildsize     "18 MB">
+  <!ENTITY gnome-contacts-time          "0.4 SBU">
 ]>
 
@@ -37,5 +39,5 @@
     automatically link them together into the same contact.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -64,12 +66,16 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="folks"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="libnotify"/>,
-    <xref linkend="pkgconfig"/>, and
-    <xref linkend="vala"/></para>
+    <para role="required">
+      <xref linkend="evolution-data-server"/>,
+      <xref linkend="folks"/> (built with e-d-s support),
+      <xref linkend="gnome-desktop"/>,
+      <xref linkend="gnome-online-accounts"/> and
+      <xref linkend="vala"/>
+    </para>
 
     <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="required"><xref linkend="telepathy-mission-control"/></para>
+    <para role="required">
+      <xref linkend="telepathy-mission-control"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -84,5 +90,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -101,11 +107,9 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>gnome-contacts</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/gnome-contacts</seg>
+        <seg>
+          gnome-contacts
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -117,9 +121,9 @@
 
       <varlistentry id="gnome-contacts-prog">
-        <term><command>gnome-contacts-prog</command></term>
+        <term><command>gnome-contacts</command></term>
         <listitem>
           <para>is a program for accessing and storing information about contacts.</para>
           <indexterm zone="gnome-contacts gnome-contacts-prog">
-            <primary sortas="b-gnome-contacts-prog">gnome-contacts-prog</primary>
+            <primary sortas="b-gnome-contacts">gnome-contacts</primary>
           </indexterm>
         </listitem>
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/gnome-desktop.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -66,7 +66,6 @@
       <xref linkend="DocBook"/>,
       <xref linkend="gnome-doc-utils"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="which"/>
+      <xref linkend="gsettings-desktop-schemas"/> and
+      <xref linkend="gtk3"/>
     </para>
 
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/gnome-doc-utils.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -67,6 +67,9 @@
     <para role="required">
       <xref linkend="intltool"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="python2"/> (Required to be installed prior to <xref linkend="libxml2"/>)
+      <xref linkend="libxslt"/>,
+      <xref linkend="python2"/> (Required to be installed prior to <xref linkend="libxml2"/>) and
+      <xref linkend="which"/> 
+      <!-- (Every package that uses gnome-doc-utils requires 
+      which but no configure script references it) -->
     </para>
 
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/gnome-session.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -131,6 +131,6 @@
       <application>GNOME</application> desktop, you will need to invoke
       <command>gnome-session</command> <emphasis>instead of</emphasis> invoking
-      a window-manager directly.  All of the packages in the 'Core' section of
-      this chapter need to be installed first, and some of the 'Utilities' - 
+      a window-manager directly.  All of the packages in the 'Desktop' section of
+      this chapter need to be installed first, and some of the 'Applications' - 
       particularly <application>GNOME Terminal</application>
       (<application>xterm</application> does not  install a '.desktop' file and
Index: gnome/core/gnome-system-monitor.xml
===================================================================
--- gnome/core/gnome-system-monitor.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/gnome-system-monitor.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY gnome-system-monitor-download-http "&gnome-download-http;/gnome-system-monitor/&gnome-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-download-ftp  "&gnome-download-ftp;/gnome-system-monitor/&gnome-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
-  <!ENTITY gnome-system-monitor-md5sum        "2683987b8fb5ad46e0e11b56f20333dd">
-  <!ENTITY gnome-system-monitor-size          "2.4 MB">
+  <!ENTITY gnome-system-monitor-download-http 
+           "&gnome-download-http;/gnome-system-monitor/3.4/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-download-ftp  
+           "&gnome-download-ftp;/gnome-system-monitor/3.4/gnome-system-monitor-&gnome-system-monitor-version;.tar.xz">
+  <!ENTITY gnome-system-monitor-md5sum        "a7cabd0d4302a02db0ce85ea81bd3421">
+  <!ENTITY gnome-system-monitor-size          "2.5 MB">
   <!ENTITY gnome-system-monitor-buildsize     "33 MB">
-  <!ENTITY gnome-system-monitor-time          "0.5 SBU">
+  <!ENTITY gnome-system-monitor-time          "0.6 SBU">
 ]>
 
@@ -64,21 +66,17 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gnome-icon-theme"/>,
-    <xref linkend="gtkmm3"/>,
-    <xref linkend="libgtop"/>,
-    <xref linkend="librsvg"/>,
-    <xref linkend="libwnck"/>, and
-    <xref linkend="which"/></para>
+    <para role="required">
+      <xref linkend="gnome-doc-utils"/>,
+      <xref linkend="gnome-icon-theme"/>,
+      <xref linkend="gtkmm3"/>,
+      <xref linkend="libgtop"/>,
+      <xref linkend="librsvg"/> and
+      <xref linkend="libwnck"/>
+    </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="rarian"/></para>
-
-    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="optional"><ulink
-    url="http://www.nongnu.org/gksu/">libgksu2</ulink> or
-    <ulink
-    url="http://members.chello.nl/~h.lai/libgnomesu/">libgnomesu</ulink> (Required for killing or renicing processes not owned by user)</para>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -93,5 +91,5 @@
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -102,17 +100,7 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-<!-- This should not be necessary any longer, but leaving it as a comment
-
-<note><para><command>make install</command> will need path access to
-<filename class="directory">$GNOME_PREFIX/bin</filename>. If you use the
-root account for installation of the package and your preinstallation changes
-were made only to a user's account, you will need to adjust root's path prior
-to running <command>make install</command>.</para></note>
-
- -->
-
   </sect2>
 
-  <sect2 role="commands">
+<!--  <sect2 role="commands">
     <title>Command Explanations</title>
 
@@ -120,5 +108,5 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
@@ -127,12 +115,15 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gnome-system-monitor</seg>
-        <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/gnome-system-monitor/*,
-        omf/gnome-system-monitor,pixmaps/gnome-system-monitor}</seg>
+        <seg>
+          gnome-system-monitor
+        </seg>
+        <seg>
+          /usr/share/gnome/help/gnome-system-monitor,
+          /usr/share/omf/gnome-system-monitor and 
+          /usr/share/pixmaps/gnome-system-monitor
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/gnome-user-docs.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -64,7 +64,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gnome-doc-utils"/>,
-      <xref linkend="itstool"/> and
-      <xref linkend="which"/>
+      <xref linkend="gnome-doc-utils"/> and
+      <xref linkend="itstool"/>
     </para>
 
Index: gnome/core/gucharmap.xml
===================================================================
--- gnome/core/gucharmap.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/gucharmap.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -5,10 +5,12 @@
   %general-entities;
 
-  <!ENTITY gucharmap-download-http "&gnome-download-http;/gucharmap/&gnome-version;/gucharmap-&gucharmap-version;.tar.xz">
-  <!ENTITY gucharmap-download-ftp  "&gnome-download-ftp;/gucharmap/&gnome-version;/gucharmap-&gucharmap-version;.tar.xz">
-  <!ENTITY gucharmap-md5sum        "f2cda38f8bc65acf0e9eac1e9805d8ae">
-  <!ENTITY gucharmap-size          "2.6 MB">
-  <!ENTITY gucharmap-buildsize     "38 MB">
-  <!ENTITY gucharmap-time          "0.3 SBU">
+  <!ENTITY gucharmap-download-http 
+           "&gnome-download-http;/gucharmap/3.4/gucharmap-&gucharmap-version;.tar.xz">
+  <!ENTITY gucharmap-download-ftp  
+           "&gnome-download-ftp;/gucharmap/3.4/gucharmap-&gucharmap-version;.tar.xz">
+  <!ENTITY gucharmap-md5sum        "f9bd5ccea77af9cc62872f6f38bfd782">
+  <!ENTITY gucharmap-size          "2.0 MB">
+  <!ENTITY gucharmap-buildsize     "40 MB">
+  <!ENTITY gucharmap-time          "0.4 SBU">
 ]>
 
@@ -63,14 +65,19 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/>,
-    <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="recommended">
+      <xref linkend="rarian"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="GConf"/>,
-    <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtk-doc"/>,
-    <xref linkend="pygtk"/>, and
-    <xref linkend="rarian"/></para>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -82,12 +89,8 @@
     <title>Installation of Gucharmap</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/without-gnome.xml"/>
-
     <para>Install <application>Gucharmap</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -103,15 +106,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"/>
-
-    <para><option>--disable-gconf</option>: Use this parameter if you do not
-    have <application>GConf</application> installed.</para>
-
-    <para><option>--enable-python-bindings</option>: Use this parameter if you
-    wish to enable python bindings.</para>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/> -->
 
     <para><option>--enable-introspection</option>: Use this parameter if you
@@ -132,8 +126,15 @@
 
       <seglistitem>
-        <seg>gucharmap</seg>
-        <seg>libgucharmap.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gucharmap-2/gucharmap,
-        share/{gnome/help/gucharmap/*,omf/gucharmap}}</seg>
+        <seg>
+          gucharmap
+        </seg>
+        <seg>
+          libgucharmap_2_90.so
+        </seg>
+        <seg>
+          /usr/include/gucharmap-2.90, /usr/share/gnome/help/gucharmap,
+          /usr/share/gtk-doc/html/gucharmap-2.90 and
+          /usr/share/omf/gucharmap
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -154,11 +155,11 @@
       </varlistentry>
 
-      <varlistentry id="libgucharmap">
-        <term><filename class='libraryfile'>libgucharmap.so</filename></term>
+      <varlistentry id="libgucharmap_2_90">
+        <term><filename class='libraryfile'>libgucharmap_2_90.so</filename></term>
         <listitem>
           <para>contains the <application>gucharmap</application> API
           functions.</para>
-          <indexterm zone="gucharmap libgucharmap">
-            <primary sortas="c-libgucharmap">libgucharmap.so</primary>
+          <indexterm zone="gucharmap libgucharmap_2_90">
+            <primary sortas="c-libgucharmap_2_90">libgucharmap_2_90.so</primary>
           </indexterm>
         </listitem>
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/nautilus.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -78,4 +78,9 @@
       <xref linkend="tracker"/> and
       <ulink url="http://valgrind.org/">Valgrind</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
+    <para role="recommended">
+      <xref linkend="gvfs"/> (For hotplugging and device mounting to work)
     </para>
 
Index: gnome/core/zenity.xml
===================================================================
--- gnome/core/zenity.xml	(revision f154dac1c9afc173d2f5f8d082c2094db8778d40)
+++ gnome/core/zenity.xml	(revision 0e15d3a3be4dcbc9cf3bf1e6ba47da23bb09149e)
@@ -64,7 +64,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gnome-doc-utils"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="which"/>
+      <xref linkend="gnome-doc-utils"/> and
+      <xref linkend="gtk3"/>
     </para>
 
