Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision 8a42a1963b81f008933d60a4685fcb282c59428f)
+++ gnome/core/core.xml	(revision d2241d7de90c73cae894b329b9f3f2da82c2ab07)
@@ -52,7 +52,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="eel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="control-center.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="yelp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="control-center.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome2-user-docs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-user-docs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="config.xml"/>
 
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision d2241d7de90c73cae894b329b9f3f2da82c2ab07)
+++ gnome/core/gnome-user-docs.xml	(revision d2241d7de90c73cae894b329b9f3f2da82c2ab07)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gnome-user-docs-download-http "&gnome-download-http;/gnome-user-docs/&gnome-version;/gnome-user-docs-&gnome-user-docs-version;.tar.bz2">
+  <!ENTITY gnome-user-docs-download-ftp  "&gnome-download-ftp;/gnome-user-docs/&gnome-version;/gnome-user-docs-&gnome-user-docs-version;.tar.bz2">
+  <!ENTITY gnome-user-docs-md5sum        "4f5a7114ccf9e4e31137da50b7333570">
+  <!ENTITY gnome-user-docs-size          "2.0 MB">
+  <!ENTITY gnome-user-docs-buildsize     "13.4 MB">
+  <!ENTITY gnome-user-docs-time          "1.3 SBU">
+]>
+
+<sect1 id="gnome-user-docs"
+       xreflabel="GNOME User Docs-&gnome-user-docs-version;">
+  <?dbhtml filename="gnome-user-docs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GNOME User Docs-&gnome-user-docs-version;</title>
+
+  <indexterm zone="gnome-user-docs">
+    <primary sortas="a-GNOME-User-Docs">GNOME User Docs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME User Docs</title>
+
+    <para>The <application>GNOME User Docs</application> package contains
+    documentation for <application>GNOME</application>.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-user-docs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-user-docs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-user-docs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-user-docs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-user-docs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-user-docs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME User Docs Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gnome-doc-utils"/> and
+    <xref linkend="which"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-user-docs"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME User Docs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../without-gnome.xml"/>
+
+    <para>Install <application>GNOME User Docs</application>
+    by running the following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --localstatedir=/var/lib &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>--localstatedir=/var/lib</parameter>: This switch
+    puts <application>ScrollKeeper</application> files in
+    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
+    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>$GNOME_PREFIX/share/{gnome/help/{gnome-access-guide,system-admin-guide,user-guide},
+        omf/{gnome-user-docs,user-guide}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry>
+        <term>OMF files</term>
+        <listitem>
+          <para>contain user documentation. These include introductions
+          and help on the core packages.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/core/gnome2-user-docs.xml
===================================================================
--- gnome/core/gnome2-user-docs.xml	(revision 8a42a1963b81f008933d60a4685fcb282c59428f)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome2-user-docs-download-http "&gnome-download-http;/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
-  <!ENTITY gnome2-user-docs-download-ftp  "&gnome-download-ftp;/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
-  <!ENTITY gnome2-user-docs-md5sum        "90bdd21ea3e3e794f641dd805216f275">
-  <!ENTITY gnome2-user-docs-size          "1.0 MB">
-  <!ENTITY gnome2-user-docs-buildsize     "6 MB">
-  <!ENTITY gnome2-user-docs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gnome2-user-docs" xreflabel="GNOME2 User Docs-&gnome2-user-docs-version;">
-  <?dbhtml filename="gnome2-user-docs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome2-user-docs-&gnome2-user-docs-version;.tar</keyword>
-      <keyword role="ftpdir">gnome2-user-docs</keyword>
-    </keywordset>
-  </sect1info>
-
-  <title>GNOME2 User Docs-&gnome2-user-docs-version;</title>
-
-  <indexterm zone="gnome2-user-docs">
-    <primary sortas="a-GNOME2-User-Docs">GNOME2 User Docs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME2 User Docs</title>
-
-    <para>The <application>GNOME2 User Docs</application> package contains
-    end user documents for <application>GNOME</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome2-user-docs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome2-user-docs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome2-user-docs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome2-user-docs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome2-user-docs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome2-user-docs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME2 User Docs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="scrollkeeper"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="docbook-utils"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome2-user-docs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME2 User Docs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../without-gnome.xml"/>
-
-    <para>Install <application>GNOME2 User Docs</application>
-    by running the following commands:</para>
-
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --localstatedir=/var/lib &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 &amp;&amp;
-chmod -v 644 `pkg-config \
---variable=prefix ORBit-2.0`/share/gnome/help/\
-{gnome-access-guide,system-admin-guide,user-guide}/C/*.xml</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/{gnome/help/{gnome-access-guide,system-admin-guide,user-guide},
-        omf/{gnome2-user-docs,user-guide}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term>OMF files</term>
-        <listitem>
-          <para>contain user documentation. These include introductions
-          and help on the core packages.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
