- Updates to appearance capplet docs, patch from mclasen plus

* C/goscustdesk.xml:
- Updates to appearance capplet docs, patch from mclasen plus id-compatiblity fixes, #571140

svn path=/trunk/; revision=1107

2 files changed, 284 insertions, 310 deletions

diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 914be5f..cdb5589 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -745,7 +745,249 @@ commands to run (<option>-x</option> for <application>gnome-terminal</applicatio
 <sect1 id="prefs-look-and-feel">
 	<title>Look and Feel</title>
 
-  <sect2 id="prefs-desktopbackground">
+  <sect2 id="prefs-appearance">
+    <title>Appearance Preferences</title>
+    <para>The <application>Appearance</application> preference tool lets
+    you configure various aspects of how your desktop looks:</para>
+    <itemizedlist>
+      <listitem>
+        <para>Theme,</para>
+      </listitem>
+      <listitem>
+        <para>Desktop Background,</para>
+      </listitem>
+      <listitem>
+        <para>Fonts,</para>
+      </listitem>
+      <listitem>
+        <para>User Interface.</para>
+      </listitem>
+     </itemizedlist> 
+  <sect3 id="prefs-theme">
+    <title>Theme Preferences</title>
+
+    <anchor id="goscustdesk-12"/>
+    <anchor id="goscustdesk-54"/>
+    <anchor id="goscustdesk-82"/>
+    
+    <indexterm>
+      <primary>themes</primary>
+      <secondary>setting controls options</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>themes</primary>
+      <secondary>setting window
+frame options</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>themes</primary>
+      <secondary>setting icons options</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>windows</primary>
+      <secondary>setting frame theme options</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>preference tools</primary>
+      <secondary>Theme</secondary>
+    </indexterm>
+    <para>A theme is a group of coordinated settings that specifies
+the visual appearance of a part of the GNOME Desktop. You can choose themes
+to change the appearance of the GNOME Desktop. Use the <application>Theme</application> tabbed section to select a theme. You can choose from a list
+of available themes. The list of available themes includes several themes
+for users with accessibility requirements. </para>
+    <para>A theme contains settings that affect different parts of the GNOME Desktop,
+as follows:</para>
+    <variablelist>
+      <varlistentry>
+        <term>Controls</term>
+        <listitem>
+          <para><indexterm><primary>GTK+
+themes</primary><see>themes, controls options</see></indexterm><indexterm><primary>themes</primary><secondary>controls options</secondary><tertiary>introduction</tertiary></indexterm>The controls setting for a theme determines
+the visual appearance of windows, panels, and applets. The controls setting
+also determines the visual appearance of the GNOME-compliant interface items
+that appear on windows, panels, and applets, such as menus, icons, and buttons.
+Some of the controls setting options that are available are designed for special
+accessibility needs. You can choose an option for the controls setting from
+the <guilabel>Controls</guilabel> tabbed section in the <guilabel>Customize Theme</guilabel> window.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Colors</term>
+        <listitem>
+           <para><indexterm><primary>themes</primary><secondary>color options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>color themes</primary><see>themes, color options</see></indexterm>The color setting for
+a theme determines the color of various user interface elements. You can choose several pairs of colors fromt he <guilabel>Colors</guilabel> tabbed section in the <guilabel>Customize Theme</guilabel> window.</para>
+           <note><para>It is important to choose pairs of colors that have a good contrast with each other,
+           otherwise text may become hard to read.</para></note>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Window frame</term>
+        <listitem>
+          <para><indexterm><primary>themes</primary><secondary>window frame options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>Metacity themes</primary><see>themes, window frame options</see></indexterm>The window frame setting for
+a theme determines the appearance of the frames around windows only. You can
+choose an option for the window frame setting from the <guilabel>Window Border</guilabel> tabbed section in the <guilabel>Customize Theme</guilabel> window.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Icons</term>
+        <listitem>
+          <para><indexterm><primary>themes</primary><secondary>icons options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>icon themes</primary><see>themes, icons options</see></indexterm>The icon setting for a theme determines the appearance of
+the icons on panels and the desktop background. You can choose an option for
+the icon setting from the <guilabel>Icons</guilabel> tabbed section in the <guilabel>Customize Theme</guilabel> window.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Pointer</term>
+        <listitem>
+          <para><indexterm><primary>themes</primary><secondary>pointer options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>pointer themes</primary><see>themes, pointer options</see></indexterm>The pointer setting for a theme determines the appearance of
+and sice of the mouse pointer. You can choose an options for the pointer setting fromthe <guilabel>Pointer</guilabel> tabbed section in the the <guilabel>Customize Theme</guilabel> window.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <sect4 id="goscustdesk-61">
+      <title>To Create a Custom Theme</title>
+      <para>The themes that are listed in the <guilabel>Theme</guilabel>
+tabbed section are different combinations of controls options, window frame options,
+and icon options. You can create a custom theme that uses different combinations
+of controls options, window frame options, and icon options.</para>
+      <para>To create a custom theme, perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Start the <application>Appearance</application> preference tool.
+          Open the <guilabel>Theme</guilabel> tabbed section.</para>
+        </listitem>
+        <listitem>
+          <para>Select a theme in the list of themes.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guibutton>Customize</guibutton> button. A <guilabel>Customize Theme</guilabel> dialog is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Select the controls option that you want to use in the custom
+theme from the list in the <guilabel>Controls</guilabel> tabbed section. The
+list of available controls options includes several options for users with
+accessibility requirements.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guilabel>Window Border</guilabel> tab to display
+the <guilabel>Window Border</guilabel> tabbed section. Select the window frame
+option that you want to use in the custom theme from the list of available
+options. The list of available window frame options includes several options
+for users with accessibility requirements.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guilabel>Icons</guilabel> tab to display the <guilabel>Icons</guilabel> tabbed section. Select the icons option that you want to
+use in the custom theme from the list of available options. The list of available
+icons options includes several options for users with accessibility requirements.</para>
+        </listitem>
+        <listitem>
+          <para>Click <guibutton>Close</guibutton> to close the <guilabel>Customize Theme</guilabel> dialog.</para>
+        </listitem>
+        <listitem>
+          <para>On the <application>Appearance</application> preferences tool,
+click on the <guibutton>Save As</guibutton> button. A <guilabel>Save Theme
+As</guilabel> dialog is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Type a name and a short description for the custom theme in
+the dialog, then click <guibutton>Save</guibutton>. The custom theme now appears
+in your list of available themes.</para>
+        </listitem>
+      </orderedlist>
+    </sect4>
+    <sect4 id="goscustdesk-62">
+      <title>To Install a New Theme</title>
+      <para>You can add a theme to the list of available themes. The new theme must
+be an archive file that is tarred and zipped. That is, the new theme must
+be a <filename>.tar.gz</filename> file.</para>
+      <para>To install a new theme, perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Start the <application>Appearance</application> preference tool.
+           Open the <guilabel>Theme</guilabel> tabbed section.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guibutton>Install</guibutton> button.
+A file chooser dialog is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Enter the location of the theme archive file in the location
+entry. Alternatively, select the theme archive file in the file list. When you have selected the file, click <guibutton>Open</guibutton>.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guibutton>Install</guibutton> button to install
+the new theme. </para>
+        </listitem>
+      </orderedlist>
+    </sect4>
+    <anchor id="goscustdesk-80"/>
+<!--How does this work nowadays ?
+    <sect4 id="goscustdesk-80">
+      <title>To Install a New Theme Option</title>
+      <para>You can install new controls options, window frame options, or icons
+options. You can find many controls options on the Internet.</para>
+      <para>To install a new controls option, window frame option, or icons option,
+perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Start the <application>Appearance</application> preference tool.
+          Open the <guilabel>Theme</guilabel> tabbed section.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guibutton>Customize</guibutton> button.
+An <guilabel>Customize Theme</guilabel> dialog is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the tab for the type of theme that you want to install.
+For example, to install an icons option, click on the <guilabel>Icons</guilabel>
+tab.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guibutton>Install Theme</guibutton> button.
+A <guilabel>Theme Installation</guilabel> dialog is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Enter the location of the option archive file in the drop-down
+combination box. Alternatively, to browse for the file, click on the <guibutton>Browse</guibutton> button. When you have selected the file, click <guibutton>OK</guibutton>.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guibutton>Install</guibutton> button to install
+the new option. </para>
+        </listitem>
+      </orderedlist>
+    </sect4>
+-->
+    <sect4 id="goscustdesk-81">
+      <title>To Delete a Theme Option</title>
+      <para>You can delete controls options, window frame options, or icons options.</para>
+      <para>To delete a controls option, window frame option, or icons option, perform
+the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Start the <application>Appearance</application> preference tool.
+          Open the <guilabel>Theme</guilabel> tabbed section.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guibutton>Customize</guibutton> button.
+A <guilabel>Customize Theme</guilabel> dialog is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the tab for the type of option that you want to delete. </para>
+        </listitem>
+        <listitem>
+          <para>Select the theme option you want to delete.</para>
+        </listitem>
+        <listitem>
+          <para>Use the <guibutton>Delete</guibutton> button to delete the
+          selected option. Note that you can not delete system-wide theme
+          options.</para>
+        </listitem>
+      </orderedlist>
+    </sect4>
+  </sect3>
+
+  <sect3 id="prefs-desktopbackground">
     <title>Desktop Background Preferences</title>
     <!-- preserve id for backwards compatibility: 2.12 -->
     <anchor id="goscustdesk-7"/>       
@@ -766,7 +1008,7 @@ commands to run (<option>-x</option> for <application>gnome-terminal</applicatio
       <secondary>customizing desktop background</secondary>
     </indexterm>
     <para>The <link linkend="overview-desktop">desktop</link> background is the image or color that is applied to your
-desktop. You can open <application>Desktop Background Preferences</application> by right-clicking on the desktop and choosing <guimenuitem>Change Desktop Background</guimenuitem>, as well as from the <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> menu.</para>
+desktop. You can open <guilabel>Background</guilabel> tabbed section in the <application>Appearance</application> preference tool by right-clicking on the desktop and choosing <guimenuitem>Change Desktop Background</guimenuitem>, as well as from the <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> menu.</para>
     <para>You can customize the desktop background in the following ways:</para>
     <itemizedlist>
       <listitem>
@@ -804,12 +1046,12 @@ that you can modify.</para>
           <row>
             <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
               <para>
-                <guibutton>Desktop Wallpaper</guibutton>
+                <guibutton>Desktop Background</guibutton>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-              <para>Choose an image from the list.  Alternately, you can select
-<guibutton>Add Wallpaper</guibutton> to choose any image on your computer.</para>
+              <para>Choose an image from the list.  Alternately, you can use the
+<guibutton>Add</guibutton> button to choose any image on your computer.</para>
             </entry>
           </row>
           <row>
@@ -848,12 +1090,12 @@ often as necessary and print the images next to another so as they entirely cove
           <row>
             <entry colname="colspec0" colsep="0" rowsep="0">
               <para>
-                <guilabel>Add Wallpaper</guilabel>
+                <guilabel>Add</guilabel>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0">
               <para/>
-              <para>Click on <guilabel>Add Wallpaper</guilabel> to browse for
+              <para>Click on the <guibutton>Add</guibutton> to browse for
 an image on your computer.  A standard file selector will be presented.  Choose
 the image you want and click <guibutton>Open</guibutton>.</para>
             </entry>
@@ -865,7 +1107,7 @@ the image you want and click <guibutton>Open</guibutton>.</para>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0">
-              <para>Choose the <guibutton>Desktop Wallpaper</guibutton> that you want to remove,
+              <para>Choose the image that you want to remove,
 then click <guilabel>Remove</guilabel>.  This removes the image from the list of available wallpapers; however, it does not delete the image from your computer.
 </para>
             </entry>
@@ -873,12 +1115,12 @@ then click <guilabel>Remove</guilabel>.  This removes the image from the list of
           <row>
             <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
               <para>
-                <guilabel>Desktop Colors</guilabel>
+                <guilabel>Colors</guilabel>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
               <para>To specify a color scheme, use  the options
-in the <guilabel>Background Style</guilabel> drop-down list, and the color
+in the <guilabel>Style</guilabel> drop-down list, and the color
 selector buttons.</para>
               <para>You can specify a color scheme in one of the
 following ways:</para>
@@ -911,12 +1153,14 @@ color that you want to appear at the bottom edge.</para>
         </tbody>
       </tgroup>
     </table>
-  </sect2>
+  </sect3>
 
-  <sect2 id="prefs-font">
+  <sect3 id="prefs-font">
     <title>Font Preferences</title>
     <!-- preserve id for backwards compatibility: 2.12 -->
-    <anchor id="goscustdesk-38"/>     
+    <anchor id="goscustdesk-38"/>
+    <anchor id="goscustdesk-83"/>
+    <anchor id="goscustdesk-94"/>
     <indexterm>
       <primary>preference tools</primary>
       <secondary>Font</secondary>
@@ -941,12 +1185,11 @@ color that you want to appear at the bottom edge.</para>
       <primary>fonts</primary>
       <secondary>rendering</secondary>
     </indexterm>
-    <para>Use the <application>Font</application> preference tool
+    <para>Use the <guilabel>Fonts</guilabel> tabbed section in the <application>Appearance</application> preference tool
 to choose which fonts are used in different parts of the desktop, and the way in which fonts are displayed on the screen.</para>
 
-    <sect3 id="prefs-font-choose">
+    <sect4 id="prefs-font-choose">
       <title>Choosing Fonts</title>
-      
       <para>The font selector button shows the name of the font and its point size. The name is also shown in bold, italic, or regular type.</para>
       <para>To change the font, click the font selector button. The font picker dialog opens. Select the font family, style, and point size from the lists. The preview area shows your current choice. Click <guibutton>OK</guibutton> to accept the change and update the desktop.</para>
       <para>You can choose fonts for the following parts of the desktop:</para>
@@ -984,15 +1227,15 @@ to choose which fonts are used in different parts of the desktop, and the way in
       	  </listitem>
       	</varlistentry>
       	</variablelist>
-  	</sect3>
+  	</sect4>
 	
-  	<sect3 id="prefs-font-rendering">
+  	<sect4 id="prefs-font-rendering">
       <title>Font Rendering</title>
       <para>You can set the following options relating to how fonts are displayed on the screen:</para>
 	
     	<variablelist>
      	<varlistentry>
-    	  <term><guilabel>Font Rendering</guilabel></term>
+    	  <term><guilabel>Rendering</guilabel></term>
     	  <listitem>
     	    <para>To specify how to render fonts on your screen,
     select one of the following options:</para>
@@ -1050,17 +1293,11 @@ to choose which fonts are used in different parts of the desktop, and the way in
                   </itemizedlist>
     	  </listitem>
     	</varlistentry>
-     	<varlistentry>
-    	  <term><guibutton>Go to font folder</guibutton></term>
-    	  <listitem>
-    	    <para>Click on this button to open the <guilabel>Fonts</guilabel>
-    folder.</para>
-    	  </listitem>
-    	</varlistentry>
     </variablelist>
    
-    </sect3>
-    <sect3 id="goscustdesk-83">
+    </sect4>
+<!-- go to fonts folder no longer exists
+    <sect4 id="goscustdesk-83">
       <title>Previewing a Font</title>
       <indexterm>
         <primary>fonts</primary>
@@ -1069,7 +1306,7 @@ to choose which fonts are used in different parts of the desktop, and the way in
       <para>A preview of a font shows the characters of a font at different sizes, as well as copyright and technical information. To preview a font, perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>Open the <application>Font</application> preference tool by choosing <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Font</guimenuitem></menuchoice> in the top panel.</para>
+          <para>Open the <application>Appearance</application> preference tool by choosing <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Font</guimenuitem></menuchoice> in the top panel.</para>
         </listitem>
         <listitem><para>Click on <guibutton>Details</guibutton>.</para></listitem>
         <listitem><para>Click on <guibutton>Go to font folder</guibutton>. The <guilabel>Fonts</guilabel> folder opens.</para></listitem>
@@ -1077,8 +1314,11 @@ to choose which fonts are used in different parts of the desktop, and the way in
           <para>Open a font to display a preview.</para>
         </listitem>
       </orderedlist>
-    </sect3>
-    <sect3 id="goscustdesk-94">
+    </sect4>
+-->
+
+<!-- go to fonts folder no longer exists
+    <sect4 id="goscustdesk-94">
       <title>Adding a TrueType Font</title>
       <para>To add a TrueType font to your system, perform the following steps:</para>
       <orderedlist>
@@ -1098,11 +1338,12 @@ you want to add.</para>
       <warning><para>The new font will not appear in the <guilabel>Fonts</guilabel> folder until you next log in. You will need to relaunch applications for them to have access to the new font. These are known bugs in Gnome.</para></warning>
       
       <tip><para>You can also open the <guilabel>Fonts</guilabel> folder by typing the following URI into <application>Nautilus</application> file manager's <link linkend="nautilus-open-location">Open Location dialog</link>: <command>fonts:///</command>.</para></tip>
-    </sect3>
-  </sect2>
+    </sect4>
+-->
+  </sect3>
 
-  <sect2 id="prefs-menustoolbars">
-    <title>Menus &amp; Toolbars Preferences</title>
+  <sect3 id="prefs-menustoolbars">
+    <title>Interface Preferences</title>
     <!-- preserve id for backwards compatibility: 2.12 -->
     <anchor id="goscustuserinter-2"/>    
     <indexterm>
@@ -1117,7 +1358,7 @@ you want to add.</para>
       <secondary>in applications,
 customizing appearance</secondary>
     </indexterm>
-    <para>You can use the <application>Menus &amp; Toolbars</application> preference tool to customize the appearance
+    <para>You can use the <guilabel>Interface</guilabel> tabbed section in the <application>Appearance</application> preference tool to customize the appearance
 of menus, menubars, and toolbars for applications that are part of GNOME.</para>
     <para>As you make changes to the settings, the preview display in the window updates. This allows you to see the changes if no application windows are currently open.</para>
     <variablelist>
@@ -1129,7 +1370,7 @@ of menus, menubars, and toolbars for applications that are part of GNOME.</para>
     	  </listitem>
     	</varlistentry>
     	<varlistentry>
-    	  <term><guilabel>Editable menu accelerators</guilabel></term>
+    	  <term><guilabel>Editable menu shortcut keys</guilabel></term>
 	      <listitem><para>Selecting this option allows you to define new keyboard shortcuts for menu items.</para>
 	      <para>To change an application shortcut key, open the menu, and with the mouse pointer on the menu item you wish to change, press the new combination of keys. To remove a shortcut key, press <keycap>Backspace</keycap> or <keycap>Delete</keycap>.</para>
 	      <warning>
@@ -1140,15 +1381,6 @@ of menus, menubars, and toolbars for applications that are part of GNOME.</para>
 	      </listitem>
       </varlistentry>
      	<varlistentry>
-    	  <term><guilabel>Detachable toolbars</guilabel></term>
-    	  <listitem>
-    	    <para>Selecting this option allows you to move toolbars
-    from application windows to any location on the screen. A handle is displayed on the left side of the toolbars in your applications.
-    To move a toolbar, click-and-hold on the handle, then drag the toolbar to
-    the new location.</para>
-    	  </listitem>
-    	</varlistentry>
-     	<varlistentry>
     	  <term><guilabel>Toolbar button labels</guilabel></term>
     	  <listitem>
     	    <para>Choose one of the following options to specify
@@ -1175,219 +1407,7 @@ of menus, menubars, and toolbars for applications that are part of GNOME.</para>
     	  </listitem>
     	</varlistentry>
     </variablelist>
-  </sect2>
-
-  <sect2 id="prefs-theme">
-    <title>Theme Preferences</title>
-
-    <!-- preserve for backwards compatibility: 2.12 -->
-    <anchor id="goscustdesk-12"/>    
-    
-    <indexterm>
-      <primary>themes</primary>
-      <secondary>setting controls options</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>themes</primary>
-      <secondary>setting window
-frame options</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>themes</primary>
-      <secondary>setting icons options</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>windows</primary>
-      <secondary>setting frame theme options</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>preference tools</primary>
-      <secondary>Theme</secondary>
-    </indexterm>
-    <para>A theme is a group of coordinated settings that specifies
-the visual appearance of a part of the GNOME Desktop. You can choose themes
-to change the appearance of the GNOME Desktop. Use the <application>Theme</application> preference tool to select a theme. You can choose from a list
-of available themes. The list of available themes includes several themes
-for users with accessibility requirements. </para>
-    <para>A theme contains settings that affect different parts of the GNOME Desktop,
-as follows:</para>
-    <variablelist>
-      <varlistentry>
-        <term>Controls</term>
-        <listitem>
-          <para><indexterm><primary>GTK+
-themes</primary><see>themes, controls options</see></indexterm><indexterm><primary>themes</primary><secondary>controls options</secondary><tertiary>introduction</tertiary></indexterm>The controls setting for a theme determines
-the visual appearance of windows, panels, and applets. The controls setting
-also determines the visual appearance of the GNOME-compliant interface items
-that appear on windows, panels, and applets, such as menus, icons, and buttons.
-Some of the controls setting options that are available are designed for special
-accessibility needs. You can choose an option for the controls setting from
-the <guilabel>Controls</guilabel> tabbed section in the <application>Theme Details</application>.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Window frame</term>
-        <listitem>
-          <para><indexterm><primary>themes</primary><secondary>window frame options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>Metacity themes</primary><see>themes, window frame options</see></indexterm>The window frame setting for
-a theme determines the appearance of the frames around windows only. You can
-choose an option for the window frame setting from the <guilabel>Window Border</guilabel> tabbed section in the <application>Theme Details</application>.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Icon</term>
-        <listitem>
-          <para><indexterm><primary>themes</primary><secondary>icons options</secondary><tertiary>introduction</tertiary></indexterm><indexterm><primary>icon themes</primary><see>themes, icons options</see></indexterm>The icon setting for a theme determines the appearance of
-the icons on panels and the desktop background. You can choose an option for
-the icon setting from the <guilabel>Icons</guilabel> tabbed section in the <application>Theme Details</application>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    <sect3 id="goscustdesk-61">
-      <title>To Create a Custom Theme</title>
-      <para>The themes that are listed in the <application>Theme</application> preferences
-tool are different combinations of controls options, window frame options,
-and icon options. You can create a custom theme that uses different combinations
-of controls options, window frame options, and icon options.</para>
-      <para>To create a custom theme, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Start the <application>Theme</application> preference tool.</para>
-        </listitem>
-        <listitem>
-          <para>Select a theme in the list of themes.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guibutton>Theme Details</guibutton> button. A <guilabel>Theme Details</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Select the controls option that you want to use in the custom
-theme from the list in the <guilabel>Controls</guilabel> tabbed section. The
-list of available controls options includes several options for users with
-accessibility requirements.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guilabel>Window Border</guilabel> tab to display
-the <guilabel>Window Border</guilabel> tabbed section. Select the window frame
-option that you want to use in the custom theme from the list of available
-options. The list of available window frame options includes several options
-for users with accessibility requirements.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guilabel>Icons</guilabel> tab to display the <guilabel>Icons</guilabel> tabbed section. Select the icons option that you want to
-use in the custom theme from the list of available options. The list of available
-icons options includes several options for users with accessibility requirements.</para>
-        </listitem>
-        <listitem>
-          <para>Click <guibutton>Close</guibutton> to close the <guilabel>Theme Details</guilabel> dialog.</para>
-        </listitem>
-        <listitem>
-          <para>On the <application>Theme</application> preferences tool,
-click on the <guibutton>Save theme</guibutton> button. A <guilabel>Save theme
-to disk</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Type a name and a short description for the custom theme in
-the dialog, then click <guibutton>Save</guibutton>. The custom theme now appears
-in your list of available themes.</para>
-        </listitem>
-      </orderedlist>
-    </sect3>
-    <sect3 id="goscustdesk-62">
-      <title>To Install a New Theme</title>
-      <para>You can add a theme to the list of available themes. The new theme must
-be an archive file that is tarred and zipped. That is, the new theme must
-be a <filename>.tar.gz</filename> file.</para>
-      <para>To install a new theme, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Start the <application>Theme</application> preference tool.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guibutton>Install Theme</guibutton> button.
-A <guilabel>Theme Installation</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Enter the location of the theme archive file in the drop-down
-combination box. Alternatively, to browse for the file, click on the <guibutton>Browse</guibutton> button. When you have selected the file, click <guibutton>OK</guibutton>.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guibutton>Install</guibutton> button to install
-the new theme. </para>
-        </listitem>
-      </orderedlist>
-    </sect3>
-    <sect3 id="goscustdesk-80">
-      <title>To Install a New Theme Option</title>
-      <para>You can install new controls options, window frame options, or icons
-options. You can find many controls options on the Internet.</para>
-      <para>To install a new controls option, window frame option, or icons option,
-perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Start the <application>Theme</application> preference tool.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guibutton>Theme Details</guibutton> button.
-An <guilabel>Theme Details</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the tab for the type of theme that you want to install.
-For example, to install an icons option, click on the <guilabel>Icons</guilabel>
-tab.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guibutton>Install Theme</guibutton> button.
-A <guilabel>Theme Installation</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Enter the location of the option archive file in the drop-down
-combination box. Alternatively, to browse for the file, click on the <guibutton>Browse</guibutton> button. When you have selected the file, click <guibutton>OK</guibutton>.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guibutton>Install</guibutton> button to install
-the new option. </para>
-        </listitem>
-      </orderedlist>
-    </sect3>
-    <sect3 id="goscustdesk-81">
-      <title>To Delete a Theme Option</title>
-      <para>You can delete controls options, window frame options, or icons options.</para>
-      <para>To delete a controls option, window frame option, or icons option, perform
-the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Start the <application>Theme</application> preference tool.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guibutton>Theme Details</guibutton> button.
-A <guilabel>Theme Details</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the tab for the type of option that you want to delete. </para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guibutton>Go To Theme Folder</guibutton> button.
-A file manager window opens on the default option folder.</para>
-        </listitem>
-        <listitem>
-          <para>Use the file manager window to delete the option.</para>
-        </listitem>
-      </orderedlist>
-    </sect3>
-    <sect3 id="goscustdesk-82">
-      <title>Previewing Themes</title>
-      <para>As well as the Theme preference tool, you can also use the file manager to change themes. To change
-themes, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Use the file manager to access the <command>themes:///</command>
-URI. The themes are displayed as icons.</para>
-        </listitem>
-        <listitem>
-          <para>Double-click on a theme to change the theme.</para>
-        </listitem>
-      </orderedlist>
-    </sect3>
+  </sect3>
   </sect2>
 
   <sect2 id="prefs-windows">
@@ -2297,57 +2317,6 @@ specified here, the action is not interpreted as a double-click. </para>
         </tgroup>
       </table>
     </sect3>
-    <sect3 id="goscustdesk-54">
-      <title>Pointer Preferences</title>
-      <para>Use the <guilabel>Pointers</guilabel> tabbed section to set
-      your mouse pointer preferences.
-      </para>
-      <para><xref linkend="goscustdesk-TBL-45"/> lists the mouse pointer preferences
-that you can modify:</para>
-      <table frame="topbot" id="goscustdesk-TBL-45">
-        <title>Mouse Pointer Preferences</title>
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="50*"/>
-          <colspec colname="colspec1" colwidth="50*"/>
-          <thead>
-            <row rowsep="1">
-              <entry>
-                <para>Dialog Element</para>
-              </entry>
-              <entry>
-                <para>Description</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry valign="top">
-                <para>
-                  <guilabel>Pointer Theme</guilabel>
-                </para>
-              </entry>
-              <entry valign="top">
-                <para>Select the mouse pointer theme that you require
-from the list box. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <guilabel>Highlight the
-pointer when you press Ctrl</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Select this option to enable a mouse pointer animation
-when you press and release <keycap>Ctrl</keycap>. This feature can assist
-you to locate the mouse pointer.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect3>
     <sect3 id="goscustdesk-53">
       <title>Motion Preferences</title>
       <para>Use the <guilabel>Motion</guilabel> tabbed section to set your preferences
diff --git a/gnome2-user-guide/ChangeLog b/gnome2-user-guide/ChangeLog
index 5143f24..fcbe3a8 100644
--- a/gnome2-user-guide/ChangeLog
+++ b/gnome2-user-guide/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-21  Shaun McCance  <shaunm@gnome.org>
+
+	* C/goscustdesk.xml:
+	- Updates to appearance capplet docs, patch from mclasen plus id-compatiblity fixes, #571140
+
 2009-02-21  Mario Blättermann <mariobl@svn.gnome.org>
 
 	* de/de.po: Updated German translation.