- Numerous edits per the mini-review today

* goscustdesk.xml:
* plaingnomestartpreftools.xml:
- Numerous edits per the mini-review today

3 files changed, 35 insertions, 29 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 2e1ef8c..7c905b2 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-20  Shaun McCance  <shaunm@gnome.org>
+
+	* goscustdesk.xml:
+	* plaingnomestartpreftools.xml:
+	- Numerous edits per the mini-review today
+
 2004-03-18  Brian Casey <brian.casey@sun.com>
 
     * Further updates to User Guide for GNOME 2.6.
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index e24a5b0..31530d3 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -142,9 +142,8 @@ that you can modify.</para>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-              <para>Choose an image to display on the desktop. To
-choose an image, click on the <guibutton>Select picture</guibutton> button. An image selector dialog is displayed.
-Use the dialog to choose an image. When you choose an image, click <guibutton>OK</guibutton>. </para>
+              <para>Choose an image from the list.  Alternately, you can select
+<guibutton>Add Wallpaper</guibutton> to choose any image on your computer.</para>
             </entry>
           </row>
           <row>
@@ -185,8 +184,9 @@ meets the screen edges, and maintains the relative dimensions of the image.</par
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0">
               <para/>
-              <para>Click on <guilabel>Add Wallpaper</guilabel> to display the <guilabel>Add Wallpapers</guilabel> dialog. Choose the wallpaper that you want to appear as the background,
-then click <guibutton>OK</guibutton>.</para>
+              <para>Click on <guilabel>Add Wallpaper</guilabel> 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>
           </row>
           <row>
@@ -197,7 +197,8 @@ then click <guibutton>OK</guibutton>.</para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0">
               <para>Choose the <guibutton>Desktop Wallpaper</guibutton> that you want to remove,
-then click <guilabel>Remove</guilabel>.</para>
+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>
           </row>
           <row>
@@ -372,7 +373,8 @@ Management</application> preference tool to set your <application>Nautilus</appl
 file manager preferences. You can also set your file manager preferences in
 the <guilabel>File Management</guilabel>  preferences
 dialog, which you can open from the file manager application. For information
-on the preferences in the <guilabel>File Management</guilabel> preferences dialog and <application>File Management</application>  preference tool, see <citetitle>Nautilus File Manager</citetitle>.</para>
+on the preferences in the <guilabel>File Management</guilabel> preferences dialog and <application>File Management</application>  preference tool, see
+<xref linkend="gosnautilus-1"/>.</para>
   </sect1>
 <!--
 <sect1 id="goscustdesk-79">
@@ -717,6 +719,7 @@ dialog:</para>
                     <para>Enter the protocol for the service.</para>
                   </entry>
                 </row>
+<!--
                 <row>
                   <entry colname="colspec0">
                     <para>
@@ -727,6 +730,7 @@ dialog:</para>
                     <para>Information to be supplied in a future release.</para>
                   </entry>
                 </row>
+-->
                 <row>
                   <entry valign="top">
                     <para>
@@ -1599,7 +1603,7 @@ preference tool in the following functional areas:</para>
     <sect2 id="goscustdesk-40">
       <title>Keyboard Preferences</title>
       <para>Use the <guilabel>Keyboard</guilabel> tabbed section to set general
-keyboard preferences. To start the <application>Keyboard</application><emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
+keyboard preferences. To start the <application>Keyboard</application> <emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
 click on the <guibutton>Accessibility</guibutton> button.</para>
       <para><xref linkend="goscustperiph-TBL-3"/> lists the keyboard preferences
 that you can modify.</para>
@@ -1696,7 +1700,7 @@ test area to test the effect of your settings.</para>
     <sect2 id="goscustdesk-86">
       <title>Typing Break Preferences</title>
       <para>Use the <guilabel>Typing Break</guilabel> tabbed section to set typing
-break preferences. To start the <application>Keyboard</application><emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
+break preferences. To start the <application>Keyboard</application> <emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
 click on the <guibutton>Accessibility</guibutton> button.</para>
       <para><xref linkend="goscustdesk-TBL-87"/> lists the typing break preferences
  that you can modify.</para>
@@ -1771,7 +1775,7 @@ layout. Select your keyboard model from the drop-down list. Use the navigational
 buttons to add or remove a selected layout from the list of available layouts. </para>
       <para>You can choose different layouts to suit different locales. For more
 information on keyboard layouts, see the <citetitle>Keyboard Layout Switcher</citetitle> manual.</para>
-      <para>To start the <application>Keyboard</application><emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
+      <para>To start the <application>Keyboard</application> <emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
 click on the <guibutton>Accessibility</guibutton> button.</para>
     </sect2>
     <sect2 id="goscustdesk-101">
@@ -1781,7 +1785,7 @@ keyboard layout options. Select an option from the list of available layout
 options and click <guibutton>Add</guibutton> to select an option. Use <guibutton>Remove</guibutton> to remove a selected option. </para>
       <para>For more information on the layout options, see the <citetitle>Keyboard
 Layout Switcher</citetitle> manual.</para>
-      <para>To start the <application>Keyboard</application><emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
+      <para>To start the <application>Keyboard</application> <emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
 click on the <guibutton>Accessibility</guibutton> button.</para>
     </sect2>
   </sect1>
@@ -2179,7 +2183,7 @@ Applications</application> preference tool to specify the applications that
 you want the GNOME Desktop to use when the GNOME Desktop starts an application
 for you. For example, you can specify <application>Xterm</application> as
 your preferred terminal application. When you open the <guimenu>Desktop</guimenu>
-menu then choose <guimenuitem>New Terminal</guimenuitem>, <application>Xterm</application> starts.</para>
+menu then choose <guimenuitem>Open Terminal</guimenuitem>, <application>Xterm</application> starts.</para>
     <para>You can customize the preferences for the <application>Preferred Applications</application> preference tool in the following functional areas.</para>
     <itemizedlist>
       <listitem>
@@ -2719,12 +2723,12 @@ button.  The <guilabel>Add a new session</guilabel> dialog is displayed. Use
 this dialog to specify a name for your session.</para>
                   </listitem>
                   <listitem>
-                    <para>To change the name of a session, select the session in the <guilabel>Choose Current Session</guilabel> table. Click on the <guibutton>Edit</guibutton>
+                    <para>To change the name of a session, select the session in the <guilabel>Sessions</guilabel> table. Click on the <guibutton>Edit</guibutton>
 button. The <guilabel>Edit session name</guilabel> dialog is displayed. Type
 a new name for your session.</para>
                   </listitem>
                   <listitem>
-                    <para>To delete a session, select the session in the <guilabel>Choose Current Session</guilabel> table. Click on the <guibutton>Delete</guibutton>
+                    <para>To delete a session, select the session in the <guilabel>Sessions</guilabel> table. Click on the <guibutton>Delete</guibutton>
 button.</para>
                   </listitem>
                 </itemizedlist>
@@ -2799,8 +2803,7 @@ select the application in the table, then choose one of the following styles:</p
                     <para>
                       <guilabel>Normal</guilabel>
                     </para>
-                    <para>Starts automatically when you start a GNOME session. Use the <command>kill</command> command to terminate applications with this restart style during
-a session.</para>
+                    <para>Starts automatically when you start a GNOME session.</para>
                   </listitem>
                   <listitem>
                     <para>
@@ -2808,9 +2811,7 @@ a session.</para>
                     </para>
                     <para>Restarts automatically whenever you close or terminate the application.
 Choose this style for an application if the application must run continuously
-during your  session. To terminate an application with this restart style,
-select the application in the table, then click on the <guibutton>Remove</guibutton>
-button.</para>
+during your  session.</para>
                   </listitem>
                   <listitem>
                     <para>
@@ -2997,7 +2998,7 @@ to select the action, then click on the shortcut for the action. Press the
 keys that you want to associate with the action.</para>
               <para>To disable the
 shortcut keys for an action, click on the action to select the action, then
-click on the shortcut for the action. Press <keycap>Back Space</keycap>.</para>
+click on the shortcut for the action. Press the <keycap>Backspace</keycap> key.</para>
             </entry>
           </row>
         </tbody>
@@ -3301,7 +3302,7 @@ 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</application> preference tool.</para>
+the <guilabel>Controls</guilabel> tabbed section in the <application>Theme Details</application>.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -3309,8 +3310,7 @@ the <guilabel>Controls</guilabel> tabbed section in the <application>Theme</appl
         <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</application> preference
-tool.</para>
+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>
@@ -3318,7 +3318,7 @@ tool.</para>
         <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</application> preference tool.</para>
+the icon setting from the <guilabel>Icons</guilabel> tabbed section in the <application>Theme Details</application>.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -3337,7 +3337,7 @@ of controls options, window frame options, and icon options.</para>
           <para>Select a theme in the list of themes.</para>
         </listitem>
         <listitem>
-          <para>Click on the <guibutton>Details</guibutton> button. A <guilabel>Theme Details</guilabel> dialog is displayed.</para>
+          <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
diff --git a/gnome2-user-guide/C/plaingnomestartpreftools.xml b/gnome2-user-guide/C/plaingnomestartpreftools.xml
index 6cc68ed..ced5b43 100644
--- a/gnome2-user-guide/C/plaingnomestartpreftools.xml
+++ b/gnome2-user-guide/C/plaingnomestartpreftools.xml
@@ -94,8 +94,8 @@ Path</para>
           <row>
             <entry colname="colspec0" valign="top">
               <para>
-                <application>File Types
-and Programs</application>
+                <application>File types
+and programs</application>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
@@ -104,8 +104,8 @@ and Programs</application>
                   <guimenu>Applications</guimenu>
                   <guisubmenu>Desktop Preferences</guisubmenu>
                   <guisubmenu>Advanced</guisubmenu>
-                  <guimenuitem>File Types
-and Programs</guimenuitem>
+                  <guimenuitem>File types
+and programs</guimenuitem>
                 </menuchoice>
               </para>
             </entry>