Index: gnome-systemd/desktop/caribou.xml
===================================================================
--- gnome-systemd/desktop/caribou.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/caribou.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -24,5 +24,5 @@
 
   <indexterm zone="caribou">
-    <primary sortas="a-caribou">caribou</primary>
+    <primary sortas="a-Caribou">Caribou</primary>
   </indexterm>
 
@@ -78,5 +78,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="libgee08"/>,
-      <xref linkend="libxklavier"/> and
+      <xref linkend="libxklavier"/>, and
       <xref linkend="pygobject3"/>
     </para>
@@ -87,4 +87,10 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk2"/>
+      <ulink url="&gnome-download-http;/valadoc/">valadoc</ulink>
+    </para>
+
     <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
     <para role="optional">
@@ -92,7 +98,7 @@
       required as a compile-time dependency for other packages. If
       you intend to use its keyboard you will require
-      <xref linkend="pyatspi2"/>,
-      <xref linkend="dbus-python"/> and
-      <xref linkend="dconf"/> at runtime.
+      <xref linkend="dbus-python"/>,
+      <xref linkend="dconf"/> and
+      <xref linkend="pyatspi2"/> at runtime.
     </para>
 
@@ -132,7 +138,10 @@
 
     <para>
-      <option>--disable-gtk2-module</option>: Because <application>GNOME</application>
-      now uses <application>GTK+-3</application>, the module has no use on a
-      <application>GNOME</application> desktop.
+      <parameter>--disable-gtk2-module</parameter>: Because
+      <application>GNOME</application> now uses
+      <application>GTK+-3</application>, the module has no use
+      on a <application>GNOME</application> desktop. Remove
+      the switch if you still want to build the
+      <application>GTK+-2</application> module.
     </para>
 
@@ -147,5 +156,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -159,5 +168,4 @@
         <seg>
           /usr/include/libcaribou,
-          /usr/lib/caribou,
           /usr/lib/python&python2-majorver;/site-packages/caribou,
           /usr/share/antler and
Index: gnome-systemd/desktop/dconf.xml
===================================================================
--- gnome-systemd/desktop/dconf.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/dconf.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -103,6 +103,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
@@ -140,6 +139,5 @@
         </seg>
         <seg>
-          libdconf-dbus-1.so, libdconf.so and
-          /usr/lib/gio/modules/libdconfsettings.so
+          libdconf-dbus-1.so and libdconf.so
         </seg>
         <seg>
Index: gnome-systemd/desktop/gnome-backgrounds.xml
===================================================================
--- gnome-systemd/desktop/gnome-backgrounds.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/gnome-backgrounds.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -76,6 +76,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">GNOME Backgrounds Dependencies</bridgehead>
-
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/gnome-backgrounds"/>
Index: gnome-systemd/desktop/gnome-bluetooth.xml
===================================================================
--- gnome-systemd/desktop/gnome-bluetooth.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/gnome-bluetooth.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -78,16 +78,14 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libnotify"/>
+      <xref linkend="gtk3"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/>, and
-      <xref linkend="nautilus-sendto"/>
+      <xref linkend="gobject-introspection"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="geoclue"/>, and
       <xref linkend="gtk-doc"/>
     </para>
@@ -95,6 +93,6 @@
     <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
     <para role="optional">
-      <xref linkend="bluez"/>, and
-      <xref linkend="systemd"/>
+      <xref linkend="bluez"/> and
+      <xref linkend="systemd"/> (for Logind)
     </para>
 
@@ -108,9 +106,9 @@
 
     <para>
-      Install <application>GNOME Bluetooth</application> by running the following
-      commands:
+      Install <application>GNOME Bluetooth</application> by running the
+      following  commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -125,35 +123,4 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      For <application>GNOME Bluetooth</application> to work
-      as expected, users need to be allowed to write to
-      <filename>/dev/rfkill</filename>. Create a
-      <application>Udev</application> rule that will allow
-      normal users to write to <filename>/dev/rfkill</filename>
-      with the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <para>
-      First create a new group:
-    </para>
-
-<screen role="root"><userinput>groupadd -r rfkill</userinput></screen>
-
-    <para>
-      Create the udev rule:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /lib/udev/rules.d/61-rfkill.rules &lt;&lt; "EOF"
-<literal># Get access to /dev/rfkill for users
-KERNEL=="rfkill", GROUP="rfkill", MODE="0664"</literal>
-EOF</userinput></screen>
-
-    <para>
-      Add a user to the new group:
-    </para>
-
-<screen role="root"><userinput>usermod -a -G rfkill <replaceable>&lt;username&gt;</replaceable></userinput></screen>
- 
   </sect2>
 
@@ -171,10 +138,10 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          bluetooth-applet, bluetooth-sendto and bluetooth-wizard
+          bluetooth-sendto
         </seg>
         <seg>
@@ -183,5 +150,4 @@
         <seg>
           /usr/include/gnome-bluetooth,
-          /usr/lib/gnome-bluetooth,
           /usr/share/gnome-bluetooth,
           /usr/share/gtk-doc/html/gnome-bluetooth and
@@ -196,17 +162,4 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="bluetooth-applet">
-        <term><command>bluetooth-applet</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME</application> applet for prompting the
-            user for a Bluetooth passkey (PIN).
-          </para>
-          <indexterm zone="gnome-bluetooth bluetooth-applet">
-            <primary sortas="b-bluetooth-applet">bluetooth-applet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="bluetooth-sendto">
         <term><command>bluetooth-sendto</command></term>
@@ -218,17 +171,4 @@
           <indexterm zone="gnome-bluetooth bluetooth-sendto">
             <primary sortas="b-bluetooth-sendto">bluetooth-sendto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bluetooth-wizard">
-        <term><command>bluetooth-wizard</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> wizard for setting up
-            devices with the Linux Bluetooth stack.
-          </para>
-          <indexterm zone="gnome-bluetooth bluetooth-wizard">
-            <primary sortas="b-bluetooth-wizard">bluetooth-wizard</primary>
           </indexterm>
         </listitem>
Index: gnome-systemd/desktop/gnome-icon-theme.xml
===================================================================
--- gnome-systemd/desktop/gnome-icon-theme.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/gnome-icon-theme.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -5,12 +5,8 @@
   %general-entities;
 
-<!--  <!ENTITY gnome-icon-theme-download-http
-   "&gnome-download-http;/gnome-icon-theme/&gnome-minor;/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">
+  <!ENTITY gnome-icon-theme-download-http
+           "&gnome-download-http;/gnome-icon-theme/&gnome-minor;/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">
   <!ENTITY gnome-icon-theme-download-ftp
-   "&gnome-download-ftp;/gnome-icon-theme/&gnome-minor;/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">-->
-  <!ENTITY gnome-icon-theme-download-http
-   "&gnome-download-http;/gnome-icon-theme/3.12/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">
-  <!ENTITY gnome-icon-theme-download-ftp
-   "&gnome-download-ftp;/gnome-icon-theme/3.12/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">
+           "&gnome-download-ftp;/gnome-icon-theme/&gnome-minor;/gnome-icon-theme-&gnome-icon-theme-version;.tar.xz">
   <!ENTITY gnome-icon-theme-md5sum        "f14bed7f804e843189ffa7021141addd">
   <!ENTITY gnome-icon-theme-size          "17 MB">
@@ -83,7 +79,6 @@
       <xref linkend="gtk3"/> or
       <xref linkend="gtk2"/>,
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="icon-naming-utils"/>, and
-      <xref linkend="perl-xml-simple"/>
+      <xref linkend="hicolor-icon-theme"/>, and
+      <xref linkend="icon-naming-utils"/>
     </para>
 
@@ -122,5 +117,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
Index: gnome-systemd/desktop/gnome-keyring.xml
===================================================================
--- gnome-systemd/desktop/gnome-keyring.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/gnome-keyring.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -83,6 +83,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="linux-pam"/> and
-      <xref linkend="libxslt"/>
+      <xref linkend="libxslt"/> and
+      <xref linkend="linux-pam"/>
     </para>
 
@@ -143,13 +143,12 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          gnome-keyring (symlink), gnome-keyring-3, and gnome-keyring-daemon
+          gnome-keyring, gnome-keyring-3, and gnome-keyring-daemon
         </seg>
         <seg>
-          gnome-keyring-pkcs11.so, pam_gnome_keyring.so, and
-          several under /usr/lib/gnome-keyring/devel
+          gnome-keyring-pkcs11.so and pam_gnome_keyring.so
         </seg>
         <seg>
Index: gnome-systemd/desktop/gnome-themes-standard.xml
===================================================================
--- gnome-systemd/desktop/gnome-themes-standard.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/gnome-themes-standard.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -5,12 +5,8 @@
   %general-entities;
 
-<!--  <!ENTITY gnome-themes-standard-download-http
-   "&gnome-download-http;/gnome-themes-standard/&gnome-minor;/gnome-themes-standard-&gnome-themes-standard-version;.tar.xz">
+  <!ENTITY gnome-themes-standard-download-http
+           "&gnome-download-http;/gnome-themes-standard/&gnome-minor;/gnome-themes-standard-&gnome-themes-standard-version;.tar.xz">
   <!ENTITY gnome-themes-standard-download-ftp
-   "&gnome-download-ftp;/gnome-themes-standard/&gnome-minor;/gnome-themes-standard-&gnome-themes-standard-version;.tar.xz">-->
-  <!ENTITY gnome-themes-standard-download-http
-   "&gnome-download-http;/gnome-themes-standard/3.12/gnome-themes-standard-&gnome-themes-standard-version;.tar.xz">
-  <!ENTITY gnome-themes-standard-download-ftp
-   "&gnome-download-ftp;/gnome-themes-standard/3.12/gnome-themes-standard-&gnome-themes-standard-version;.tar.xz">
+           "&gnome-download-ftp;/gnome-themes-standard/&gnome-minor;/gnome-themes-standard-&gnome-themes-standard-version;.tar.xz">
   <!ENTITY gnome-themes-standard-md5sum        "5036f65f08bbe305ff82c9ab97b2aa3f">
   <!ENTITY gnome-themes-standard-size          "5.7 MB">
@@ -95,6 +91,6 @@
 
     <para>
-      Install <application>GNOME Themes Standard</application> by running the following
-      commands:
+      Install <application>GNOME Themes Standard</application> by running the
+      following commands:
     </para>
 
@@ -134,5 +130,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/desktop/gvfs.xml
===================================================================
--- gnome-systemd/desktop/gvfs.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/gvfs.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.21/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.21/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-md5sum        "e4e3635d1ec9cb1ccabb37ed9920a4b1">
+  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.20/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.20/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-md5sum        "da2a542ea68b5294e41c0e23216ffdf9">
   <!ENTITY gvfs-size          "1.5 MB">
-  <!ENTITY gvfs-buildsize     "58 MB (additional 1 MB for the tests)">
-  <!ENTITY gvfs-time          "0.5 SBU (additional less than 0.1 SBU for the tests)">
+  <!ENTITY gvfs-buildsize     "58 MB">
+  <!ENTITY gvfs-time          "0.5 SBU">
 ]>
 
@@ -84,5 +84,5 @@
       <xref linkend="libsecret"/>,
       <xref linkend="libsoup"/>,
-      <xref linkend="systemd"/> (for GUdev), and
+      <xref linkend="systemd"/> (for GUdev and Logind), and
       <xref linkend="udisks2"/>
     </para>
@@ -137,5 +137,5 @@
     <para>
       To test the results, issue: <command>make -k check</command>. Some tests
-      may fail, normally for a missing optional dependency.
+      may fail because of a missing optional dependency.
     </para>
 
@@ -148,4 +148,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gsettings-destdir.xml"/>
+
   </sect2>
 
@@ -170,24 +171,17 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          gvfs-cat, gvfs-copy, gvfs-goa-volume-monitor, gvfs-info,
-          gvfs-less, gvfs-ls, gvfs-mime, gvfs-mkdir, gvfs-monitor-dir,
-          gvfs-monitor-file, gvfs-mount, gvfs-move, gvfs-open,
-          gvfs-rename, gvfs-rm, gvfs-save, gvfs-set-attribute,
-          gvfs-trash, gvfs-tree, gvfs-udisks2-volume-monitor, gvfsd,
-          gvfsd-afp, gvfsd-afp-browse, gvfsd-archive, gvfsd-burn,
-          gvfsd-computer, gvfsd-dav, gvfsd-dnssd, gvfsd-ftp,
-          gvfsd-fuse, gvfsd-http, gvfsd-localtest, gvfsd-metadata,
-          gvfsd-network, gvfsd-recent, gvfsd-sftp, gvfsd-smb,
-          gvfsd-smb-browse,  and gvfsd-trash
+          gvfs-cat, gvfs-copy, gvfs-info, gvfs-less,
+          gvfs-ls, gvfs-mime, gvfs-mkdir, gvfs-monitor-dir,
+          gvfs-monitor-file, gvfs-mount, gvfs-move,
+          gvfs-open, gvfs-rename, gvfs-rm, gvfs-save,
+          gvfs-set-attribute, gvfs-trash, and gvfs-tree
         </seg>
         <seg>
-          libgvfscommon.so,
-          libgvfsdaemon.so, and
-          two under /usr/lib/gio/modules/
+          libgvfscommon.so and libgvfsdaemon.so
         </seg>
         <seg>
Index: gnome-systemd/desktop/nautilus.xml
===================================================================
--- gnome-systemd/desktop/nautilus.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/nautilus.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -84,6 +84,6 @@
     <para role="recommended">
       <xref linkend="exempi"/>,
-      <xref linkend="libexif"/> and
-      <xref linkend="gobject-introspection"/>
+      <xref linkend="gobject-introspection"/>, and
+      <xref linkend="libexif"/>
     </para>
 
@@ -91,10 +91,10 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <ulink url="http://projects.gnome.org/tracker/">Tracker</ulink>
+      <ulink url="&gnome-download-http;/tracker/">Tracker</ulink>
     </para>
 
     <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
     <para role="recommended">
-      <xref linkend="gnome-icon-theme-symbolic"/>, and
+      <xref linkend="gnome-icon-theme-symbolic"/> and
       <xref linkend="gvfs"/> (For hotplugging and device mounting to work)
     </para>
@@ -120,5 +120,5 @@
 
     <para>
-      This package needs to be installed before its testsuite can be run.
+      This package does not have a working testsuite.
     </para>
 
@@ -128,9 +128,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-<!--
-    <para>
-      To test the results, issue: <command>make check</command>. The tests
-      need to be run in a graphical environment.
-    </para>-->
 
   </sect2>
@@ -140,6 +135,6 @@
 
     <para>
-      <parameter>--disable-packagekit</parameter>: This switch disables use
-      of PackageKit which isn't suitable for BLFS.
+      <parameter>--disable-packagekit</parameter>: This switch disables
+      use of PackageKit which isn't suitable for BLFS.
     </para>
 
@@ -170,17 +165,15 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          nautilus, 
-          nautilus-autorun-software, 
-          nautilus-connect-server, and
-          nautilus-convert-metadata
+          nautilus,
+          nautilus-autorun-software, and
+          nautilus-connect-server
         </seg>
         <seg>
-          libnautilus-extension.so, and
-          /usr/lib/nautilus/extensions-3.0/libnautilus-sendto.so
+          libnautilus-extension.so
         </seg>
         <seg>
Index: gnome-systemd/desktop/yelp.xml
===================================================================
--- gnome-systemd/desktop/yelp.xml	(revision 7263570ef93a126a5903b370816343ab9f65bbb4)
+++ gnome-systemd/desktop/yelp.xml	(revision e050b6a08aeb55c4f64561070ade558be21a650a)
@@ -137,11 +137,11 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          gnome-help (symlink) and yelp
+          gnome-help and yelp
         </seg>
         <seg>
