partly reversing changes from #398902: new Control Center is held back.

2007-03-11  Joachim Noreiko  <jnoreiko@yahoo.com>

  * goscustdesk.xml: partly reversing changes from #398902: new Control Center
      is held back. Keeping subcategories.

svn path=/trunk/; revision=675

2 files changed, 12 insertions, 8 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index b1961e7..baf9a85 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-11  Joachim Noreiko  <jnoreiko@yahoo.com>
+
+  * goscustdesk.xml: partly reversing changes from #398902: new Control Center
+      is held back. Keeping subcategories.
+      
 2007-03-09  Joachim Noreiko  <jnoreiko@yahoo.com>
 
 	* gospanel.xml: reverted updated ids -- see #415887 for reasons.
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index e36d1ac..1484848 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -18,16 +18,15 @@
   <anchor id="goscustdesk-10"/><!-- Customizing Your Panels -->
 
   <highlights>
-    <para>This chapter describes how to use the Control Center preference tools to
+    <para>This chapter describes how to use the preference tools to
 customize the GNOME Desktop.</para>
   </highlights>
   <!-- move the following to its own section, "Using Pref Tools"? -->
-  <para>The <application>Control Center</application> allows you to change the settings for your computer. The settings are organized into small applications called <firstterm>preference tools</firstterm>.</para>
-  <para>Each tool covers a particular aspect of your computer. For example, with the <application>Mouse</application> preference tool you can set your mouse to left-handed or right-handed use, or change the speed of the pointer on the screen. With the <application>Windows</application> preference tool you can set behaviour common to all windows such as the way in which you select them with the mouse.</para>
-  <para>To open a preference tool, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Control Center</guimenuitem></menuchoice> in the top panel menubar. Click the tool that you require from Control Center.</para>
+  <para>A preference tool is a small application that allows you to change settings in the GNOME Desktop. Each preference tool covers a particular aspect of your computer. For example, with the <application>Mouse</application> preference tool you can set your mouse to left-handed or right-handed use, or change the speed of the pointer on the screen. With the <application>Windows</application> preference tool you can set behaviour common to all windows such as the way in which you select them with the mouse.</para>
+  <para>To open a preference tool, choose <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> in the top panel. Choose the tool that you require from the submenu.</para>
   <para>With a few exceptions, the changes you make to settings in a preference tool take effect immediately, without needing to close the preference tool. You can keep the preference tool window open while you try the changes, and make further changes if you wish.</para>
-  <para>Some applications or system components may add their own preference tools to the Control Center.</para>
-  <note><para>Some preference tools let you modify essential parts of your system, and therefore require administrative access. When you open the preference tool, a dialog box will prompt you for your password.</para></note>
+  <para>Some applications or system components may add their own preference tools to the menu.</para>
+  <note><para>Some preference tools let you modify essential parts of your system, and therefore require administrative access. When you open the preference tool, a dialog box will prompt you for your password. These are in the <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu></menuchoice> submenu. This menu also contains more complex utility applications for managing and updating your system.</para></note>
 
 
 <sect1 id="prefs-personal">
@@ -2630,11 +2629,11 @@ action.</para>
   <!-- ============= Printing ========================= -->
   <sect2 id="prefs-printers">
   
-    <title>Setting up a Printer</title>
+    <title>Printing Preferences</title>
     <!-- preserve for backwards compatibility: 2.16 -->    
     <anchor id="printer-setup"/>   
           
-    <para>To set up a printer to use with GNOME, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Control Center</guimenuitem></menuchoice> in the top panel menubar. Click the tool that you require from Control Center. The <guilabel>Printers</guilabel> window opens.</para>
+    <para>To set up a new printer, choose <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Printing</guimenuitem></menuchoice> in the top panel menubar. The <guilabel>Printers</guilabel> window opens.</para>
     
     <para>Choose <menuchoice><guimenu>Printer</guimenu><guimenuitem>Add Printer</guimenuitem></menuchoice>. The <application>Add a Printer</application> assistant opens. This guides you through the process of setting up the printer.</para>