Index: general.ent
===================================================================
--- general.ent	(revision e660b7ccef34fdc581f0410d842371ca6774c89f)
+++ general.ent	(revision 3a175b22b77a2bc04181ce8bc9034047947d1879)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
Index: general/sysutils/gvfs.xml
===================================================================
--- general/sysutils/gvfs.xml	(revision 3a175b22b77a2bc04181ce8bc9034047947d1879)
+++ general/sysutils/gvfs.xml	(revision 3a175b22b77a2bc04181ce8bc9034047947d1879)
@@ -0,0 +1,426 @@
+<?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 gvfs-download-http "&gnome-download-http;/gvfs/1.6/gvfs-&gvfs-version;.tar.bz2">
+  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.6/gvfs-&gvfs-version;.tar.bz2">
+  <!ENTITY gvfs-md5sum        "6ed1d943d1c1b8b15a6b180a6cd51043">
+  <!ENTITY gvfs-size          "1.3 MB">
+  <!ENTITY gvfs-buildsize     "47 MB">
+  <!ENTITY gvfs-time          "0.6 SBU">
+]>
+
+<sect1 id="gvfs" xreflabel="gvfs-&gvfs-version;">
+  <?dbhtml filename="gvfs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gvfs-&gvfs-version;</title>
+
+  <indexterm zone="gvfs">
+    <primary sortas="a-gvfs">gvfs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to gvfs</title>
+
+    <para>The <application>gvfs</application> package is a userspace virtual
+    filesystem designed to work with the I/O abstractions of GLib's GIO
+    library.</para>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gvfs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gvfs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gvfs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gvfs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gvfs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gvfs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">gvfs Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="dbus"/>,
+    <xref linkend="glib2"/>, and
+    <xref linkend="intltool"/></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="GConf"/>,
+    <xref linkend="gnome-disk-utility"/>,
+    <xref linkend="hal"/>,
+    <ulink url="http://code.google.com/p/libarchive/">libarchive</ulink>,
+    <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 condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gvfs"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of gvfs</title>
+
+    <para>Install <application>gvfs</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/gvfs  &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</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>
+
+    <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>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gvfs-cat, gvfs-copy, 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, gvfs-gdu-volume-monitor, gvfsd, gvfsd-burn, gvfsd-computer,
+        gvfsd-dnssd, gvfsd-ftp, gvfsd-localtest, gvfsd-metadata, gvfsd-network,
+        gvfsd-sftp, and gvfsd-trash</seg>
+        <seg>libgiogconf.so, libgioremote-volume-monitor.so, libgvfsdbus.so,
+        libgvfscommon-dnssd.so, and libgvfscommon.so</seg>
+        <seg>/usr/{include/gvfs-client/gvfs,lib/gvfs,share/gvfs/{mounts,
+        remote-volume-monitors}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gvfs-cat">
+        <term><command>gvfs-cat</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-cat">
+            <primary sortas="b-gvfs-cat">gvfs-cat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-copy">
+        <term><command>gvfs-copy</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-copy">
+            <primary sortas="b-gvfs-copy">gvfs-copy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-info">
+        <term><command>gvfs-info</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-info">
+            <primary sortas="b-gvfs-info">gvfs-info</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-less">
+        <term><command>gvfs-less</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-less">
+            <primary sortas="b-gvfs-less">gvfs-less</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-ls">
+        <term><command>gvfs-ls</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-ls">
+            <primary sortas="b-gvfs-ls">gvfs-ls</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-mkdir">
+        <term><command>gvfs-mkdir</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-mkdir">
+            <primary sortas="b-gvfs-mkdir">gvfs-mkdir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-monitor-dir">
+        <term><command>gvfs-monitor-dir</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-monitor-dir">
+            <primary sortas="b-gvfs-monitor-dir">gvfs-monitor-dir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-monitor-file">
+        <term><command>gvfs-monitor-file</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-monitor-file">
+            <primary sortas="b-gvfs-monitor-file">gvfs-monitor-file</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-mount">
+        <term><command>gvfs-mount</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-mount">
+            <primary sortas="b-gvfs-mount">gvfs-mount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-move">
+        <term><command>gvfs-move</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-move">
+            <primary sortas="b-gvfs-move">gvfs-move</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-open">
+        <term><command>gvfs-open</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-open">
+            <primary sortas="b-gvfs-open">gvfs-open</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-rename">
+        <term><command>gvfs-rename</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-rename">
+            <primary sortas="b-gvfs-rename">gvfs-rename</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-rm">
+        <term><command>gvfs-rm</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-rm">
+            <primary sortas="b-gvfs-rm">gvfs-rm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-save">
+        <term><command>gvfs-save</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-save">
+            <primary sortas="b-gvfs-save">gvfs-save</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-trash">
+        <term><command>gvfs-trash</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-trash">
+            <primary sortas="b-gvfs-trash">gvfs-trash</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gvfs-tree">
+        <term><command>gvfs-tree</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="gvfs gvfs-tree">
+            <primary sortas="b-gvfs-tree">gvfs-tree</primary>
+          </indexterm>
+        </listitem>
+      </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-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-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="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="libgiogconf">
+        <term><filename class='libraryfile'>libgiogconf.so</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="gvfs libgiogconf">
+            <primary sortas="c-libgiogconf">libgiogconf.so</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>
+          </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>
+
+</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision e660b7ccef34fdc581f0410d842371ca6774c89f)
+++ general/sysutils/sysutils.xml	(revision 3a175b22b77a2bc04181ce8bc9034047947d1879)
@@ -22,5 +22,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unzip.xml"/>
@@ -39,4 +38,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="DeviceKit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upower.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sg3_utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Device-mapper.xml"/>
@@ -44,4 +44,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks.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"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzma-utils.xml"/> -->
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/> -->
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision e660b7ccef34fdc581f0410d842371ca6774c89f)
+++ gnome/core/core.xml	(revision 3a175b22b77a2bc04181ce8bc9034047947d1879)
@@ -53,5 +53,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgnome-keyring.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-engines.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-themes.xml"/>
@@ -78,3 +77,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
 
+  <!-- Moved to general/sysutils (System Utilities)
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
+  -->
+
 </chapter>
Index: ome/core/gvfs.xml
===================================================================
--- gnome/core/gvfs.xml	(revision e660b7ccef34fdc581f0410d842371ca6774c89f)
+++ 	(revision )
@@ -1,435 +1,0 @@
-<?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 gvfs-download-http "&gnome-download-http;/gvfs/1.6/gvfs-&gvfs-version;.tar.bz2">
-  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.6/gvfs-&gvfs-version;.tar.bz2">
-  <!ENTITY gvfs-md5sum        "6ed1d943d1c1b8b15a6b180a6cd51043">
-  <!ENTITY gvfs-size          "1.3 MB">
-  <!ENTITY gvfs-buildsize     "47 MB">
-  <!ENTITY gvfs-time          "0.6 SBU">
-]>
-
-<sect1 id="gvfs" xreflabel="gvfs-&gvfs-version;">
-  <?dbhtml filename="gvfs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gvfs-&gvfs-version;</title>
-
-  <indexterm zone="gvfs">
-    <primary sortas="a-gvfs">gvfs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gvfs</title>
-
-    <para>The <application>gvfs</application> package is a userspace virtual
-    filesystem designed to work with the i/o abstractions of gio (a library
-    availible in glib >= 2.15.1).</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gvfs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gvfs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gvfs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gvfs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gvfs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gvfs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gvfs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus"/>,
-    <xref linkend="glib2"/>, and
-    <xref linkend="intltool"/></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="GConf"/>,
-    <xref linkend="gnome-disk-utility"/>,
-    <xref linkend="hal"/>,
-    <ulink url="http://code.google.com/p/libarchive/">libarchive</ulink>,
-    <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 condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gvfs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gvfs</title>
-
-    <para>Install <application>gvfs</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=/etc \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gvfs  &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</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/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <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">$GNOME_PREFIX/etc</filename>.</para>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gvfs</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gvfs</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gvfs-cat, gvfs-copy, 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, gvfs-gdu-volume-monitor, gvfsd, gvfsd-burn, gvfsd-computer,
-        gvfsd-dnssd, gvfsd-ftp, gvfsd-localtest, gvfsd-metadata, gvfsd-network,
-        gvfsd-sftp, and gvfsd-trash</seg>
-        <seg>libgiogconf.so, libgioremote-volume-monitor.so, libgvfsdbus.so,
-        libgvfscommon-dnssd.so, and libgvfscommon.so</seg>
-        <seg>/usr/{include/gvfs-client/gvfs,lib/gvfs,share/gvfs/{mounts,
-        remote-volume-monitors}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gvfs-cat">
-        <term><command>gvfs-cat</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-cat">
-            <primary sortas="b-gvfs-cat">gvfs-cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-copy">
-        <term><command>gvfs-copy</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-copy">
-            <primary sortas="b-gvfs-copy">gvfs-copy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-info">
-        <term><command>gvfs-info</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-info">
-            <primary sortas="b-gvfs-info">gvfs-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-less">
-        <term><command>gvfs-less</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-less">
-            <primary sortas="b-gvfs-less">gvfs-less</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-ls">
-        <term><command>gvfs-ls</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-ls">
-            <primary sortas="b-gvfs-ls">gvfs-ls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-mkdir">
-        <term><command>gvfs-mkdir</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-mkdir">
-            <primary sortas="b-gvfs-mkdir">gvfs-mkdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-monitor-dir">
-        <term><command>gvfs-monitor-dir</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-monitor-dir">
-            <primary sortas="b-gvfs-monitor-dir">gvfs-monitor-dir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-monitor-file">
-        <term><command>gvfs-monitor-file</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-monitor-file">
-            <primary sortas="b-gvfs-monitor-file">gvfs-monitor-file</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-mount">
-        <term><command>gvfs-mount</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-mount">
-            <primary sortas="b-gvfs-mount">gvfs-mount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-move">
-        <term><command>gvfs-move</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-move">
-            <primary sortas="b-gvfs-move">gvfs-move</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-open">
-        <term><command>gvfs-open</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-open">
-            <primary sortas="b-gvfs-open">gvfs-open</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-rename">
-        <term><command>gvfs-rename</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-rename">
-            <primary sortas="b-gvfs-rename">gvfs-rename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-rm">
-        <term><command>gvfs-rm</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-rm">
-            <primary sortas="b-gvfs-rm">gvfs-rm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-save">
-        <term><command>gvfs-save</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-save">
-            <primary sortas="b-gvfs-save">gvfs-save</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-trash">
-        <term><command>gvfs-trash</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-trash">
-            <primary sortas="b-gvfs-trash">gvfs-trash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvfs-tree">
-        <term><command>gvfs-tree</command></term>
-        <listitem>
-          <para>does this .....</para>
-          <indexterm zone="gvfs gvfs-tree">
-            <primary sortas="b-gvfs-tree">gvfs-tree</primary>
-          </indexterm>
-        </listitem>
-      </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-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-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="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="libgiogconf">
-        <term><filename class='libraryfile'>libgiogconf.so</filename></term>
-        <listitem>
-          <para>contains functions that .....</para>
-          <indexterm zone="gvfs libgiogconf">
-            <primary sortas="c-libgiogconf">libgiogconf.so</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>
-          </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>
-
-</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e660b7ccef34fdc581f0410d842371ca6774c89f)
+++ introduction/welcome/changelog.xml	(revision 3a175b22b77a2bc04181ce8bc9034047947d1879)
@@ -41,4 +41,14 @@
 
 -->
+
+    <listitem>
+      <para>January 12th, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Moved the gvfs instructions from Gnome Core to System
+          Utilities.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
