Index: general.ent
===================================================================
--- general.ent	(revision d5c4225be07167bf4eea7e4f1ae076486fd7683c)
+++ general.ent	(revision 7ef3d46711dbcb71995138fd73a09970485f70ab)
@@ -714,4 +714,5 @@
 <!-- Extras -->
 <!ENTITY gnome-backgrounds-version    "3.2.0">
+<!ENTITY gnome-user-share-version     "3.0.1">
 <!ENTITY gnome-user-docs-version      "3.2.2">
 
@@ -772,5 +773,4 @@
 <!ENTITY gnome-screensaver-version    "3.2.0">
 <!ENTITY gnome-system-tools-version   "2.30.2">
-<!ENTITY gnome-user-share-version     "2.30.0">
 <!ENTITY gnome-utils-version          "2.30.0">
 <!ENTITY gucharmap-version            "2.30.2">
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision d5c4225be07167bf4eea7e4f1ae076486fd7683c)
+++ gnome/add/add.xml	(revision 7ef3d46711dbcb71995138fd73a09970485f70ab)
@@ -50,5 +50,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-power-manager.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-system-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-user-share.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
Index: ome/add/gnome-user-share.xml
===================================================================
--- gnome/add/gnome-user-share.xml	(revision d5c4225be07167bf4eea7e4f1ae076486fd7683c)
+++ 	(revision )
@@ -1,155 +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 gnome-user-share-download-http "&gnome-download-http;/gnome-user-share/&gnome-version;/gnome-user-share-&gnome-user-share-version;.tar.bz2">
-  <!ENTITY gnome-user-share-download-ftp  "&gnome-download-ftp;/gnome-user-share/&gnome-version;/gnome-user-share-&gnome-user-share-version;.tar.bz2">
-  <!ENTITY gnome-user-share-md5sum        "a736a1bebc1782d3d6e7a7239158f189">
-  <!ENTITY gnome-user-share-size          "922 KB">
-  <!ENTITY gnome-user-share-buildsize     "8 MB">
-  <!ENTITY gnome-user-share-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-user-share" xreflabel="gnome-user-share-&gnome-user-share-version;">
-  <?dbhtml filename="gnome-user-share.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gnome-user-share-&gnome-user-share-version;</title>
-
-  <indexterm zone="gnome-user-share">
-    <primary sortas="a-gnome-user-share">gnome-user-share</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gnome-user-share</title>
-
-    <para>The <application>gnome-user-share</application> package allows easy
-    user-level file sharing via WebDAV or ObexFTP. The shared files are
-    announced on the network by <application>Avahi</application>.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-user-share-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-user-share-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-user-share-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-user-share-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-user-share-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-user-share-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gnome-user-share Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-bluetooth"/> and
-    <xref linkend="libcanberra"/></para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required"><xref linkend="mod_dnssd"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="rarian"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-user-share"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gnome-user-share</title>
-
-    <para>Install <application>gnome-user-share</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnome-user-share  \
-            --with-modules-path=/usr/lib/apache \
-            --disable-scrollkeeper &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</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>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-user-share</parameter>: This parameter is used so that
-    the <application>gnome-user-share</application> internal support programs
-    are installed in the preferred location of <filename
-    class='directory'>$GNOME_PREFIX/lib/gnome-user-share</filename> instead of
-    <filename class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><parameter>--disable-scrollkeeper</parameter>: Do not make updates to
-    the <application>scrollkeeper</application> database. Remove it if you have
-    <application>rarian</application> installed.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-file-share-properties and gnome-user-share</seg>
-        <seg>libnautilus-share-extension.so</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/gnome-user-share,
-        share/{gnome-user-share,gnome/help/gnome-user-share/*,
-        omf/gnome-user-share}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-file-share-properties">
-        <term><command>gnome-file-share-properties</command></term>
-        <listitem>
-          <para>is a tool to manage shares.</para>
-          <indexterm zone="gnome-user-share gnome-file-share-properties">
-            <primary sortas="b-gnome-file-share-properties">gnome-file-share-properties</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision d5c4225be07167bf4eea7e4f1ae076486fd7683c)
+++ gnome/core/core.xml	(revision 7ef3d46711dbcb71995138fd73a09970485f70ab)
@@ -87,6 +87,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-backgrounds.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-user-share.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vino.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-user-share.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vino.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-user-docs.xml"/>
 
Index: gnome/core/gnome-user-share.xml
===================================================================
--- gnome/core/gnome-user-share.xml	(revision 7ef3d46711dbcb71995138fd73a09970485f70ab)
+++ gnome/core/gnome-user-share.xml	(revision 7ef3d46711dbcb71995138fd73a09970485f70ab)
@@ -0,0 +1,154 @@
+<?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 gnome-user-share-download-http "&gnome-download-http;/gnome-user-share/3.0/gnome-user-share-&gnome-user-share-version;.tar.xz">
+  <!ENTITY gnome-user-share-download-ftp  "&gnome-download-ftp;/gnome-user-share/3.0/gnome-user-share-&gnome-user-share-version;.tar.xz">
+  <!ENTITY gnome-user-share-md5sum        "1c236fd3486f9c9c070a3141b5f5fbb9">
+  <!ENTITY gnome-user-share-size          "978 KB">
+  <!ENTITY gnome-user-share-buildsize     "?? MB">
+  <!ENTITY gnome-user-share-time          "?? SBU">
+]>
+
+<sect1 id="gnome-user-share" xreflabel="gnome-user-share-&gnome-user-share-version;">
+  <?dbhtml filename="gnome-user-share.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-user-share-&gnome-user-share-version;</title>
+
+  <indexterm zone="gnome-user-share">
+    <primary sortas="a-gnome-user-share">gnome-user-share</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to gnome-user-share</title>
+
+    <para>The <application>gnome-user-share</application> package allows easy
+    user-level file sharing via WebDAV or ObexFTP. The shared files are
+    announced on the network by <application>Avahi</application>.</para>
+
+    <!-- &lfs65_checked; not for this version! -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-user-share-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-user-share-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-user-share-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-user-share-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-user-share-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-user-share-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">gnome-user-share Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gnome-bluetooth"/> and
+    <xref linkend="libcanberra"/></para>
+
+    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
+    <para role="required"><xref linkend="mod_dnssd"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="rarian"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-user-share"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of gnome-user-share</title>
+
+    <para>Install <application>gnome-user-share</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=$GNOME_SYSCONFDIR \
+            --libexecdir=$GNOME_PREFIX/lib/gnome-user-share  \
+            --with-modules-path=/usr/lib/apache \
+            --disable-scrollkeeper &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</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>--libexecdir=$GNOME_PREFIX/lib/gnome-user-share</parameter>:
+    This parameter is used so that the
+    <application>gnome-user-share</application> internal support programs are
+    installed in the preferred location of <filename
+    class='directory'>$GNOME_PREFIX/lib/gnome-user-share</filename> instead of
+    <filename class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
+
+    <para><parameter>--disable-scrollkeeper</parameter>: Do not make updates to
+    the <application>scrollkeeper</application> database. Remove it if you have
+    <application>rarian</application> installed.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gnome-file-share-properties and gnome-user-share</seg>
+        <seg>libnautilus-share-extension.so</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{lib/gnome-user-share,
+        share/{gnome-user-share,gnome/help/gnome-user-share/*,
+        omf/gnome-user-share}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-file-share-properties">
+        <term><command>gnome-file-share-properties</command></term>
+        <listitem>
+          <para>is a tool to manage shares.</para>
+          <indexterm zone="gnome-user-share gnome-file-share-properties">
+            <primary sortas="b-gnome-file-share-properties">gnome-file-share-properties</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d5c4225be07167bf4eea7e4f1ae076486fd7683c)
+++ introduction/welcome/changelog.xml	(revision 7ef3d46711dbcb71995138fd73a09970485f70ab)
@@ -57,4 +57,7 @@
           <para>[ken] - merge gnome-user-docs-3.2.2 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge gnome-user-share-3.0.1 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
