Index: general.ent
===================================================================
--- general.ent	(revision fa4ff29fc771e0f829da67ab4a2d3fd5746a83c0)
+++ general.ent	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
@@ -335,6 +335,7 @@
 <!ENTITY parted-version               "3.0">
 <!ENTITY udisks-version               "1.0.1">
+<!ENTITY udisks2-version              "1.93.0">
 <!ENTITY eject-version                "2.1.5">
-<!ENTITY gvfs-version                 "1.10.1">
+<!ENTITY gvfs-version                 "1.12.0">
 <!ENTITY unrar-version                "4.1.1">
 <!ENTITY libarchive-version           "2.8.5">
@@ -716,5 +717,5 @@
 <!ENTITY dconf-version                "0.10.0">
 <!ENTITY evolution-data-server-version "3.2.2">
-<!ENTITY glib-networking-version      "2.30.1">
+<!ENTITY glib-networking-version      "2.32.0">
 <!ENTITY gnome-bluetooth-version      "3.2.1">
 <!ENTITY gnome-control-center-version "3.2.2">
@@ -730,5 +731,5 @@
 <!ENTITY gnome-shell-version          "3.2.1">
 <!ENTITY gnome-themes-standard-version "3.2.1">
-<!ENTITY gsettings-desktop-schemas-version "3.2.0">
+<!ENTITY gsettings-desktop-schemas-version "3.4.0">
 <!ENTITY mousetweaks-version          "3.2.1">
 <!ENTITY mutter-version               "3.2.1">
Index: general/sysutils/gvfs.xml
===================================================================
--- general/sysutils/gvfs.xml	(revision fa4ff29fc771e0f829da67ab4a2d3fd5746a83c0)
+++ general/sysutils/gvfs.xml	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.10/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.10/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-md5sum        "0c968704be003d2f6eab29388c41664e">
+  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.12/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.12/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-md5sum        "0dd301b6d80b5ffa89e9a4a981abe297">
   <!ENTITY gvfs-size          "1.3 MB">
-  <!ENTITY gvfs-buildsize     "67 MB">
-  <!ENTITY gvfs-time          "0.6 SBU">
+  <!ENTITY gvfs-buildsize     "79 MB">
+  <!ENTITY gvfs-time          "0.7 SBU">
 ]>
 
@@ -34,5 +34,5 @@
     library.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61,23 +61,36 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus"/>,
-    <xref linkend="intltool"/>, and
-    <xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="dbus"/>,
+      <xref linkend="intltool"/> and
+      <xref linkend="pkgconfig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended if building GNOME</bridgehead>
+    <para role="recommended">
+      <xref linkend="libgnome-keyring"/>,
+      <xref linkend="libsoup"/> and
+      <xref linkend="udisks2"/>
+      (Useful if you want to mount disks via Nautilus).
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="avahi"/>,
-    <ulink url="http://www.bluez.org/">BlueZ</ulink>,
-    <xref linkend="dbus-glib"/>,
-    <xref linkend="expat"/>,
-    <ulink url="http://fuse.sourceforge.net/">FUSE</ulink>,
-    <xref linkend="gnome-disk-utility"/>,
-    <ulink url="http://www.freedesktop.org/wiki/Software/hal">Hal</ulink>,
-    <xref linkend="libarchive"/>,
-    <ulink url="http://directory.fsf.org/project/libcdio/">libcdio</ulink>,
-    <xref linkend="libgnome-keyring"/>,
-    <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
-    <xref linkend="libsoup"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="samba3"/></para>
+    <para role="optional">
+      <xref linkend="avahi"/> (For DNS/SD Backend),
+      <ulink url="http://www.bluez.org/">BlueZ</ulink>
+      (For ObexFTP Backend),
+      <ulink url="http://fuse.sourceforge.net/">FUSE</ulink>
+      (For gvfs-fuse-daemon),
+      <xref linkend="libarchive"/>,
+      <ulink url="http://www.videolan.org/developers/libbluray.html">
+      libbluray</ulink> (For accessing BluRay disks),
+      <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>
+      (For accessing CD's),
+      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>
+      (For accessing GPhoto devices),
+      <ulink url="http://www.libimobiledevice.org/">libimobiledevice</ulink>
+      (For mounting iPhone, iPad and other Apple devices) and
+      <xref linkend="samba3"/> (For mounting Samba shares).
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -94,5 +107,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
-            --libexecdir=/usr/lib/gvfs  &amp;&amp;
+            --libexecdir=/usr/lib/gvfs &amp;&amp;
 make</userinput></screen>
 
@@ -102,19 +115,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This parameter causes the
-    sysconf files to be installed in the preferred location of
-    <filename class="directory">/etc</filename> instead of
-    <filename class="directory">/usr/etc</filename>.</para>
-
-    <para><parameter>--libexecdir=/usr/lib/gvfs</parameter>: This parameter
-    causes the libexec files to be installed in the preferred location of
-    <filename class="directory">/usr/lib/gvfs</filename> instead of
-    <filename class="directory">/usr/libexec</filename>.</para>
 
   </sect2>
@@ -129,19 +127,22 @@
 
       <seglistitem>
-        <seg>gvfs-cat, gvfs-copy, gvfs-gdu-volume-monitor, gvfs-info, gvfs-less,
-        gvfs-ls, 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, gvfsd, gvfsd-burn,
-        gvfsd-computer, gvfsd-dav, gvfsd-dnssd, gvfsd-ftp, gvfsd-http,
-        gvfsd-localtest, gvfsd-metadata, gvfsd-network, gvfsd-sftp, and
-        gvfsd-trash</seg>
-        <seg>libgioremote-volume-monitor.so, libgvfscommon-dnssd.so,
-        libgvfscommon.so, and libgvfsdbus.so</seg>
-        <seg>/usr/{include/gvfs-client/gvfs,lib/gvfs,share/gvfs/{mounts,
-        remote-volume-monitors}}</seg>
+        <seg>
+          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, gvfs-tree 
+          and several executables in /usr/lib/gvfs
+        </seg>
+
+        <seg>
+          libgvfscommon.so and libgvfscommon-dnssd.so
+        </seg>
+
+        <seg>
+          /usr/include/gvfs-client, /usr/lib/gvfs and /usr/share/gvfs
+        </seg>
       </seglistitem>
     </segmentedlist>
 
-<!--
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -152,5 +153,6 @@
         <term><command>gvfs-cat</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>prints a file to standard output using the virtual 
+          file system to access the file via a URI.</para>
           <indexterm zone="gvfs gvfs-cat">
             <primary sortas="b-gvfs-cat">gvfs-cat</primary>
@@ -162,5 +164,6 @@
         <term><command>gvfs-copy</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>copies a file from one URI location to another using 
+          the virtual file system.</para>
           <indexterm zone="gvfs gvfs-copy">
             <primary sortas="b-gvfs-copy">gvfs-copy</primary>
@@ -169,18 +172,9 @@
       </varlistentry>
 
-      <varlistentry id="gvfs-gdu-volume-monitor">
-        <term><command>gvfs-gdu-volume-monitor</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-gdu-volume-monitor">
-            <primary sortas="b-gvfs-gdu-volume-monitor">gvfs-gdu-volume-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gvfs-info">
         <term><command>gvfs-info</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>prints information about files and directories using 
+          the virtual file system.</para>
           <indexterm zone="gvfs gvfs-info">
             <primary sortas="b-gvfs-info">gvfs-info</primary>
@@ -192,5 +186,7 @@
         <term><command>gvfs-less</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>executes <command>less</command> using the VFS as 
+          input preprocesor, so less can access any resource accessible 
+          by any of the gvfs backends.</para>
           <indexterm zone="gvfs gvfs-less">
             <primary sortas="b-gvfs-less">gvfs-less</primary>
@@ -202,5 +198,6 @@
         <term><command>gvfs-ls</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>lists the content of directories using the virtual file 
+          system.</para>
           <indexterm zone="gvfs gvfs-ls">
             <primary sortas="b-gvfs-ls">gvfs-ls</primary>
@@ -212,5 +209,6 @@
         <term><command>gvfs-mkdir</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>makes a directory specified by an URI using 
+          the virtual file system.</para>
           <indexterm zone="gvfs gvfs-mkdir">
             <primary sortas="b-gvfs-mkdir">gvfs-mkdir</primary>
@@ -222,5 +220,6 @@
         <term><command>gvfs-monitor-dir</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>monitors the change content of a directory using 
+          the virtual file system.</para>
           <indexterm zone="gvfs gvfs-monitor-dir">
             <primary sortas="b-gvfs-monitor-dir">gvfs-monitor-dir</primary>
@@ -232,5 +231,6 @@
         <term><command>gvfs-monitor-file</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>monitors the change of a file using the virtual file 
+          system.</para>
           <indexterm zone="gvfs gvfs-monitor-file">
             <primary sortas="b-gvfs-monitor-file">gvfs-monitor-file</primary>
@@ -242,5 +242,6 @@
         <term><command>gvfs-mount</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>mounts, unmounts and lists file systems using the 
+          virtual file system.</para>
           <indexterm zone="gvfs gvfs-mount">
             <primary sortas="b-gvfs-mount">gvfs-mount</primary>
@@ -252,5 +253,6 @@
         <term><command>gvfs-move</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>moves a file from one URI location to another using 
+          the virtual file system.</para>
           <indexterm zone="gvfs gvfs-move">
             <primary sortas="b-gvfs-move">gvfs-move</primary>
@@ -262,5 +264,5 @@
         <term><command>gvfs-open</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>opens an URI using the appropiate application.</para>
           <indexterm zone="gvfs gvfs-open">
             <primary sortas="b-gvfs-open">gvfs-open</primary>
@@ -272,5 +274,6 @@
         <term><command>gvfs-rename</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>changes the name of a file or directory using the 
+          virtual file system.</para>
           <indexterm zone="gvfs gvfs-rename">
             <primary sortas="b-gvfs-rename">gvfs-rename</primary>
@@ -282,5 +285,6 @@
         <term><command>gvfs-rm</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>removes a directory entry using the virtual file 
+          system via a URI.</para>
           <indexterm zone="gvfs gvfs-rm">
             <primary sortas="b-gvfs-rm">gvfs-rm</primary>
@@ -292,5 +296,6 @@
         <term><command>gvfs-save</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>saves information to a file using the virtual 
+          file system.</para>
           <indexterm zone="gvfs gvfs-save">
             <primary sortas="b-gvfs-save">gvfs-save</primary>
@@ -299,18 +304,9 @@
       </varlistentry>
 
-      <varlistentry id="gvfs-set-attribute">
-        <term><command>gvfs-set-attribute</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-set-attribute">
-            <primary sortas="b-gvfs-set-attribute">gvfs-set-attribute</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gvfs-trash">
         <term><command>gvfs-trash</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>moves a directory entry to the trash using the 
+          virtual file system.</para>
           <indexterm zone="gvfs gvfs-trash">
             <primary sortas="b-gvfs-trash">gvfs-trash</primary>
@@ -322,5 +318,6 @@
         <term><command>gvfs-tree</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>lists contents of directories in a tree-like format 
+          using the virtual file system.</para>
           <indexterm zone="gvfs gvfs-tree">
             <primary sortas="b-gvfs-tree">gvfs-tree</primary>
@@ -329,130 +326,10 @@
       </varlistentry>
 
-      <varlistentry id="gvfsd">
-        <term><command>gvfsd</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd">
-            <primary sortas="b-gvfsd">gvfsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-burn">
-        <term><command>gvfsd-burn</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-burn">
-            <primary sortas="b-gvfsd-burn">gvfsd-burn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-computer">
-        <term><command>gvfsd-computer</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-computer">
-            <primary sortas="b-gvfsd-computer">gvfsd-computer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-dav">
-        <term><command>gvfsd-dav</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-dav">
-            <primary sortas="b-gvfsd-dav">gvfsd-dav</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-dnssd">
-        <term><command>gvfsd-dnssd</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-dnssd">
-            <primary sortas="b-gvfsd-dnssd">gvfsd-dnssd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-ftp">
-        <term><command>gvfsd-ftp</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-ftp">
-            <primary sortas="b-gvfsd-ftp">gvfsd-ftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-http">
-        <term><command>gvfsd-http</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-http">
-            <primary sortas="b-gvfsd-http">gvfsd-http</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-localtest">
-        <term><command>gvfsd-localtest</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-localtest">
-            <primary sortas="b-gvfsd-localtest">gvfsd-localtest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-metadata">
-        <term><command>gvfsd-metadata</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-metadata">
-            <primary sortas="b-gvfsd-metadata">gvfsd-metadata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-network">
-        <term><command>gvfsd-network</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-network">
-            <primary sortas="b-gvfsd-network">gvfsd-network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-sftp">
-        <term><command>gvfsd-sftp</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-sftp">
-            <primary sortas="b-gvfsd-sftp">gvfsd-sftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfsd-trash">
-        <term><command>gvfsd-trash</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfsd-trash">
-            <primary sortas="b-gvfsd-trash">gvfsd-trash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgioremote-volume-monitor">
-        <term><filename class='libraryfile'>libgioremote-volume-monitor.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="gvfs libgioremote-volume-monitor">
-            <primary sortas="c-libgioremote-volume-monitor">libgioremote-volume-monitor.so</primary>
+      <varlistentry id="libgvfscommon">
+        <term><filename class='libraryfile'>libgvfscommon.so</filename></term>
+        <listitem>
+          <para>contains common API functions used in GVFS programs.</para>
+          <indexterm zone="gvfs libgvfscommon">
+            <primary sortas="c-libgvfscommon">libgvfscommon.so</primary>
           </indexterm>
         </listitem>
@@ -462,5 +339,5 @@
         <term><filename class='libraryfile'>libgvfscommon-dnssd.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains API functions used in GVFS DNS/SD backend.</para>
           <indexterm zone="gvfs libgvfscommon-dnssd">
             <primary sortas="c-libgvfscommon-dnssd">libgvfscommon-dnssd.so</primary>
@@ -469,26 +346,5 @@
       </varlistentry>
 
-      <varlistentry id="libgvfscommon">
-        <term><filename class='libraryfile'>libgvfscommon.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="gvfs libgvfscommon">
-            <primary sortas="c-libgvfscommon">libgvfscommon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvfsdbus">
-        <term><filename class='libraryfile'>libgvfsdbus.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="gvfs libgvfsdbus">
-            <primary sortas="c-libgvfsdbus">libgvfsdbus.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
--->
 
   </sect2>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision fa4ff29fc771e0f829da67ab4a2d3fd5746a83c0)
+++ general/sysutils/sysutils.xml	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
@@ -44,4 +44,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parted.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eject.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
+++ general/sysutils/udisks2.xml	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY udisks2-download-http "http://udisks.freedesktop.org/releases/udisks-&udisks2-version;.tar.bz2">
+  <!ENTITY udisks2-download-ftp  " ">
+  <!ENTITY udisks2-md5sum        "250db7570f3d18797ef2ad308c94ff0a">
+  <!ENTITY udisks2-size          "576 KB">
+  <!ENTITY udisks2-buildsize     "26 MB">
+  <!ENTITY udisks2-time          "0.3 SBU">
+]>
+
+<sect1 id="udisks2" xreflabel="udisks2-&udisks2-version;">
+  <?dbhtml filename="udisks2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>UDisks2-&udisks2-version;</title>
+
+  <indexterm zone="udisks2">
+    <primary sortas="a-udisks2">UDisks2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to UDisks2</title>
+
+    <para>
+      The <application>UDisks2</application> package provides a daemon, 
+      tools and libraries to access and manipulate disks and storage 
+      devices.
+    </para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&udisks2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&udisks2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &udisks2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &udisks2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &udisks2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &udisks2-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">UDisks2 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libatasmart"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="polkit"/> and
+      <xref linkend="udev"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/udisks2"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of UDisks2</title>
+
+    <para>
+      Install <application>UDisks2</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>    
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          udisksctl, udisksd and umount.udisks2
+        </seg>
+        <seg>
+          libudisks2.so
+        </seg>
+        <seg>
+          /usr/include/udisks2, /usr/lib/udisks2,
+          /usr/share/gtk-doc/html/udisks2 and
+          /var/lib/udisks2
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="udisksctl">
+        <term><command>udisksctl</command></term>
+        <listitem>
+          <para>
+            is a command-line program used to interact with the udisksd daemon.
+          </para>
+          <indexterm zone="udisks2 udisksctl">
+            <primary sortas="b-udisksctl">udisksctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udisksd">
+        <term><command>udisksd</command></term>
+        <listitem>
+          <para>
+            is the UDisks2 daemon itself.
+          </para>
+          <indexterm zone="udisks2 udisksd">
+            <primary sortas="b-udisksd">udisksd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libudisks2">
+        <term><filename class="libraryfile">libudisks2.so</filename></term>
+        <listitem>
+          <para>
+            contains UDisks2 API functions.
+          </para>
+          <indexterm zone="udisks2 libudisks2">
+            <primary sortas="c-libudisks2">libudisks2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: gnome/core/gsettings-desktop-schemas.xml
===================================================================
--- gnome/core/gsettings-desktop-schemas.xml	(revision fa4ff29fc771e0f829da67ab4a2d3fd5746a83c0)
+++ gnome/core/gsettings-desktop-schemas.xml	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY gsettings-desktop-schemas-download-http "&gnome-download-http;/gsettings-desktop-schemas/&gnome-version;/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
-  <!ENTITY gsettings-desktop-schemas-download-ftp "&gnome-download-ftp;/gsettings-desktop-schemas/&gnome-version;/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
-  <!ENTITY gsettings-desktop-schemas-md5sum        "ca7c625aaa2d6fd2e37c5d08b9debafa">
-  <!ENTITY gsettings-desktop-schemas-size          "152 KB">
-  <!ENTITY gsettings-desktop-schemas-buildsize     "2.3 MB">
+  <!ENTITY gsettings-desktop-schemas-download-http "&gnome-download-http;/gsettings-desktop-schemas/3.4/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
+  <!ENTITY gsettings-desktop-schemas-download-ftp  "&gnome-download-ftp;/gsettings-desktop-schemas/3.4/gsettings-desktop-schemas-&gsettings-desktop-schemas-version;.tar.xz">
+  <!ENTITY gsettings-desktop-schemas-md5sum        "779e0fd33bb633b532f707458552a0d3">
+  <!ENTITY gsettings-desktop-schemas-size          "178 KB">
+  <!ENTITY gsettings-desktop-schemas-buildsize     "3.0 MB">
   <!ENTITY gsettings-desktop-schemas-time          "less than 0.1 SBU">
 ]>
@@ -32,7 +32,7 @@
     <para>The <application>gsettings-desktop-schemas</application> package
     contains a collection of GSettings schemas for settings shared by various
-    components of a desktop.</para>
+    components of a Gnome desktop.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -61,10 +61,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/> and
-    <xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="intltool"/> and
+      <xref linkend="pkgconfig"/>
+    </para>
 
-    <!-- Not sure if the following are deps. -->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnome-themes-standard"/></para>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -79,5 +82,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -87,12 +90,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
 
   </sect2>
@@ -109,6 +104,7 @@
         <seg>None</seg>
         <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gsettings-desktop-schemas,
-        share/GConf/gsettings}, /usr/share/glib-2.0/schemas</seg>
+        <seg>
+          /usr/include/gsettings-desktop-schemas
+       </seg>
       </seglistitem>
     </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision fa4ff29fc771e0f829da67ab4a2d3fd5746a83c0)
+++ introduction/welcome/changelog.xml	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
@@ -70,4 +70,16 @@
           <para>[krejzi] - removed heimdal.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - added udisks2 1.93.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - gvfs 1.12.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - gsettings-desktop-schemas 3.4.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - glib-networking 2.32.0.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: networking/netlibs/glib-networking.xml
===================================================================
--- networking/netlibs/glib-networking.xml	(revision fa4ff29fc771e0f829da67ab4a2d3fd5746a83c0)
+++ networking/netlibs/glib-networking.xml	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
@@ -5,9 +5,11 @@
   %general-entities;
 
-  <!ENTITY glib-networking-download-http "&gnome-download-http;/glib-networking/2.30/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-download-ftp "&gnome-download-ftp;/glib-networking/2.30/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-md5sum        "a93b7344daf6292ea66f7a6ec21f361d">
-  <!ENTITY glib-networking-size          "291 KB">
-  <!ENTITY glib-networking-buildsize     "7.4 MB">
+  <!ENTITY glib-networking-download-http
+           "&gnome-download-http;/glib-networking/2.32/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-download-ftp  
+           "&gnome-download-ftp;/glib-networking/2.32/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-md5sum        "b8e90f5f5eeaa52ba5837525ace38ab1">
+  <!ENTITY glib-networking-size          "320 KB">
+  <!ENTITY glib-networking-buildsize     "8.6 MB">
   <!ENTITY glib-networking-time          "0.2 SBU">
 ]>
@@ -60,12 +62,15 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnutls"/>,
-    <xref linkend="gsettings-desktop-schemas"/>,
-    <xref linkend="intltool"/>, and
-    <xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="gnutls"/> and
+      <xref linkend="gsettings-desktop-schemas"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libgcrypt"/> and
-    <xref linkend="libproxy"/></para>
+    <para role="optional">
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="libproxy"/> and
+      <xref linkend="p11-kit"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -80,7 +85,8 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/glib-networking \
-            --with-ca-certificates=/etc/ssl/ca-bundle.crt &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/glib-networking \
+            --with-ca-certificates=/etc/ssl/ca-bundle.crt \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -100,12 +106,6 @@
     located.</para>
 
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/glib-networking</parameter> :
-    if <application>libproxy</application> was installed, this will ensure
-    <command>glib-pacrunner</command> is installed in an appropriate location,
-    instead of in <filename class="directory">$GNOME_PREFIX/libexec</filename>.
-    </para>
-
-    <para><option>--disable-static</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>
@@ -120,57 +120,16 @@
 
       <seglistitem>
-        <seg>glib-pacrunner</seg>
-        <seg>libgiognomeproxy.{so,a}, libgiognutls.{so,a}, and
-        libgiolibproxy.{so,a}</seg>
-        <seg>None</seg>
+        <seg>
+          glib-pacrunner
+        </seg>
+        <seg>
+          libgiognomeproxy.so, libgiognutls.so and
+          libgiolibproxy.so
+        </seg>
+        <seg>
+          /usr/lib/glib-networking
+        </seg>
       </seglistitem>
     </segmentedlist>
-
-    <!--<variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glib-pacrunner">
-        <term><command>glib-pacrunner</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="glib-networking glib-pacrunner">
-            <primary sortas="b-glib-pacrunner">glib-pacrunner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgiognomeproxy">
-        <term><filename class='libraryfile'>libgiognomeproxy.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="glib-networking libgiognomeproxy">
-            <primary sortas="c-libgiognomeproxy">libgiognomeproxy.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgiognutls">
-        <term><filename class='libraryfile'>libgiognutls.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="glib-networking libgiognutls">
-            <primary sortas="c-libgiognutls">libgiognutls.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgiolibproxy">
-        <term><filename class='libraryfile'>libgiolibproxy.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="glib-networking libgiolibproxy">
-            <primary sortas="c-libgiolibproxy">libgiolibproxy.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>-->
 
   </sect2>
Index: networking/netlibs/libsoup.xml
===================================================================
--- networking/netlibs/libsoup.xml	(revision fa4ff29fc771e0f829da67ab4a2d3fd5746a83c0)
+++ networking/netlibs/libsoup.xml	(revision f8efa5b14c6c21538fa443dd0a3520a5424287f9)
@@ -83,6 +83,9 @@
 
     <bridgehead renderas="sect4">Recommended (Required if building GNOME)</bridgehead>
-    <para role="recommended"><xref linkend="gobject-introspection"/>,
-    <xref linkend="libgnome-keyring"/> and <xref linkend="sqlite"/></para>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="libgnome-keyring"/> and 
+      <xref linkend="sqlite"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -131,5 +134,5 @@
       <command>configure</command> looking for GNOME specific 
       depepdencies. Use this switch if you have not installed
-      <xref linkend="gnome-keyring"/>.
+      <xref linkend="libgnome-keyring"/>.
     </para>
 
