Index: gnome/core/control-center.xml
===================================================================
--- gnome/core/control-center.xml	(revision 94c557f2d813c2958be6b3e54131d1e54aed47cb)
+++ 	(revision )
@@ -1,185 +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 control-center-download-http "&gnome-download-http;/control-center/&gnome-old-version;/control-center-&control-center-version;.tar.bz2">
-  <!ENTITY control-center-download-ftp  "&gnome-download-ftp;/control-center/&gnome-old-version;/control-center-&control-center-version;.tar.bz2">
-  <!ENTITY control-center-md5sum        "bae0fd0f9e32f374bd7236d98788b13f">
-  <!ENTITY control-center-size          "2.1 MB">
-  <!ENTITY control-center-buildsize     "71 MB">
-  <!ENTITY control-center-time          "2 SBU">
-]>
-
-<sect1 id="control-center" xreflabel="Control Center-&control-center-version;">
-  <?dbhtml filename="control-center.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Control Center-&control-center-version;</title>
-
-  <indexterm zone="control-center">
-    <primary sortas="a-Control-Center">Control Center</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Control Center</title>
-
-    <para>The <application>Control Center</application> package contains the
-    <application>GNOME</application> settings managers.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&control-center-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&control-center-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &control-center-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &control-center-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &control-center-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &control-center-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Control Center Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gst-plugins-base"/>,
-    <xref linkend="libgnomekbd"/>,
-    <xref linkend="metacity"/>, and
-    <xref linkend="nautilus"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="hal"/>,
-    <xref linkend="shared-mime-info"/>,
-    <xref linkend="evolution-data-server"/>, and
-    <xref linkend="alsa"/></para>
-
-    <para>Though they are only run-time dependencies and
-    <application>Control Center</application> will compile just fine without
-    them installed, there are two screen saver packages that can be installed
-    which will provide a robust collection of screen savers and screen
-    locking capability. <xref linkend="gnome-screensaver"/> is looked for
-    first, with a fallback to <xref linkend="xscreensaver"/> if
-    necessary.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/control-center"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Control Center</title>
-
-    <para>Install <application>Control Center</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/control-center &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/2003/XInclude"
-    href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/control-center</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/control-center</filename>
-    instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><option>--enable-aboutme</option>: Enables building the
-    <command>gnome-about-me</command> capplet. <application>Evolution Data
-    Server</application> must be installed to use this parameter.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Control Center</title>
-
-    <sect3 id="control-center-config">
-      <title>Configuration Information</title>
-
-      <para>If <application>HAL</application> was linked into the build and
-      GNOME is being installed in any location other than
-      <filename class='directory'>/usr</filename>, you should create a local
-      <application>D-Bus</application> session configuration file so that the
-      installed <filename>org.gnome.SettingsDaemon.service</filename>
-      file can be discovered by <application>D-Bus</application>. You should
-      reference the information on the <application>D-Bus</application> page
-      for instructions on how to create a
-      <xref linkend="dbus-session-config"/>. You may disregard this if you
-      already created the local <application>D-Bus</application> session
-      configuration file during the <application>GNOME VFS</application>
-      installation.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-about-me,gnome-accessibility-keyboard-properties,
-        gnome-at-properties, gnome-background-properties, gnome-control-center,
-        gnome-default-applications-properties, gnome-display-properties,
-        gnome-font-properties, gnome-font-viewer, gnome-keybinding-properties,
-        gnome-keyboard-properties, gnome-mouse-properties,
-        gnome-network-preferences, gnome-sound-properties,
-        gnome-theme-manager, gnome-theme-thumbnailer,
-        gnome-thumbnail-font, gnome-typing-monitor, gnome-ui-properties,
-        gnome-window-properties, and themus-theme-applier</seg>
-        <seg>libgnome-window-settings.{so,a},
-        <application>GNOME VFS</application> and window manager settings library
-        modules and <application>Nautilus</application> library module
-        extensions</seg>
-        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
-        include/gnome-window-settings-2.0,
-        lib/{control-center, nautilus, window-manager-settings},
-        share/{{,gnome/help/,omf/}control-center-2.0,
-        gnome/{default-applications,cursor-fonts}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision 94c557f2d813c2958be6b3e54131d1e54aed47cb)
+++ gnome/core/core.xml	(revision c4c04d69bf5d122d719cbd2d787c94819f9f2910)
@@ -67,5 +67,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nautilus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-settings-daemon.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="gnome-control-center.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-icon-theme.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-applets.xml"/>
Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision 94c557f2d813c2958be6b3e54131d1e54aed47cb)
+++ gnome/core/gnome-applets.xml	(revision c4c04d69bf5d122d719cbd2d787c94819f9f2910)
@@ -71,5 +71,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libgtop"/>,
-    <xref linkend="control-center"/>,
+    <xref linkend="gnome-control-center"/>,
     <xref linkend="gst-plugins-base"/>,
     <xref linkend="hal"/>,
Index: gnome/core/gnome-control-center.xml
===================================================================
--- gnome/core/gnome-control-center.xml	(revision c4c04d69bf5d122d719cbd2d787c94819f9f2910)
+++ gnome/core/gnome-control-center.xml	(revision c4c04d69bf5d122d719cbd2d787c94819f9f2910)
@@ -0,0 +1,179 @@
+<?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-control-center-download-http "&gnome-download-http;/gnome-control-center/&gnome-version;/gnome-control-center-&gnome-control-center-version;.tar.bz2">
+  <!ENTITY gnome-control-center-download-ftp  "&gnome-download-ftp;/gnome-control-center/&gnome-version;/gnome-control-center-&gnome-control-center-version;.tar.bz2">
+  <!ENTITY gnome-control-center-md5sum        "eed8feccc37712e34d88bd3b20e46962">
+  <!ENTITY gnome-control-center-size          "2.2 MB">
+  <!ENTITY gnome-control-center-buildsize     "55 MB">
+  <!ENTITY gnome-control-center-time          "1 SBU">
+]>
+
+<sect1 id="gnome-control-center" xreflabel="GNOME Control Center-&gnome-control-center-version;">
+  <?dbhtml filename="gnome-control-center.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GNOME Control Center-&gnome-control-center-version;</title>
+
+  <indexterm zone="gnome-control-center">
+    <primary sortas="a-GNOME-Control-Center">GNOME Control Center</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Control Center</title>
+
+    <para>The <application>GNOME Control Center</application> package contains the
+    <application>GNOME</application> settings managers.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-control-center-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-control-center-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-control-center-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-control-center-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-control-center-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-control-center-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Control Center Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gnome-settings-daemon"/>
+    <xref linkend="gnome-panel"/>, and
+    <xref linkend="metacity"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="hal"/>,
+    <xref linkend="shared-mime-info"/>,
+    <xref linkend="evolution-data-server"/>, and
+    <ulink url="http://hal.freedesktop.org/releases/">polkit-gnome</ulink></para>
+
+    <para>Though they are only run-time dependencies and
+    <application>GNOME Control Center</application> will compile just fine without
+    them installed, there are two screen saver packages that can be installed
+    which will provide a robust collection of screen savers and screen
+    locking capability. <xref linkend="gnome-screensaver"/> is looked for
+    first, with a fallback to <xref linkend="xscreensaver"/> if
+    necessary.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-control-center"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Control Center</title>
+
+    <para>Install <application>GNOME Control Center</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
+            --localstatedir=/var/lib \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-control-center &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/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/gnome-control-center</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
+    <filename class="directory">$GNOME_PREFIX/lib/gnome-control-center</filename>
+    instead of
+    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+    <para><option>--disable-hal</option>: Build without hal support.</para>
+
+    <para><option>--enable-aboutme</option>: Enables building the
+    <command>gnome-about-me</command> capplet. <application>Evolution Data
+    Server</application> must be installed to use this parameter.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring GNOME Control Center</title>
+
+    <sect3 id="gnome-control-center-config">
+      <title>Configuration Information</title>
+
+      <para>If <application>HAL</application> was linked into the build and
+      GNOME is being installed in any location other than
+      <filename class='directory'>/usr</filename>, you should create a local
+      <application>D-Bus</application> session configuration file so that the
+      installed <filename>org.gnome.SettingsDaemon.service</filename>
+      file can be discovered by <application>D-Bus</application>. You should
+      reference the information on the <application>D-Bus</application> page
+      for instructions on how to create a
+      <xref linkend="dbus-session-config"/>. You may disregard this if you
+      already created the local <application>D-Bus</application> session
+      configuration file during the <application>GNOME VFS</application>
+      installation.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gnome-appearance-properties, gnome-at-mobility,
+        gnome-at-properties, gnome-at-visual, gnome-control-center,
+        gnome-default-applications-properties, gnome-display-properties,
+        gnome-font-viewer, gnome-keybinding-properties,
+        gnome-keyboard-properties, gnome-mouse-properties,
+        gnome-network-properties, gnome-thumbnail-font, gnome-typing-monitor,
+        gnome-window-properties, and gnome-about-me</seg>
+        <seg>libgnome-window-settings.{so,a} and libmetacity.{so,a}</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-window-settings-2.0,
+        lib/window-manager-settings,share/{omf/control-centeri,mime/,
+        gnome/{cursor-fonts,help/control-center/},gnome-control-center/}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision 94c557f2d813c2958be6b3e54131d1e54aed47cb)
+++ gnome/core/gnome-session.xml	(revision c4c04d69bf5d122d719cbd2d787c94819f9f2910)
@@ -59,5 +59,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="gnome-desktop"/> and
-    <xref linkend="control-center"/></para>
+    <xref linkend="gnome-control-center"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
