2.0.1 updates.

author: Eugene O'Connor <eoconnor@src.gnome.org> 2002-08-02 17:25:04 +0000
committer: Eugene O'Connor <eoconnor@src.gnome.org> 2002-08-02 17:25:04 +0000
commit: 0845de90db8371f79fd415dc7f0f1a03b83329a3 (patch)
tree: 391b81cd6c6067d72fc4fd7b4bf5e1057787f3b5
parent: 203c753eb772dd3c5e9e97f1b1b1c2608b1b1a14 (diff)
download: gnome-user-docs-0845de90db8371f79fd415dc7f0f1a03b83329a3.tar.gz
gnome-user-docs-0845de90db8371f79fd415dc7f0f1a03b83329a3.tar.xz
gnome-user-docs-0845de90db8371f79fd415dc7f0f1a03b83329a3.zip
37 files changed, 1751 insertions, 2413 deletions
diff --git a/gnome2-user-guide/C/figures/sample_anno_panel.xcf b/gnome2-user-guide/C/figures/sample_anno_panel.xcf
index f5d40d3..e60830d 100644
--- a/gnome2-user-guide/C/figures/sample_anno_panel.xcf
+++ b/gnome2-user-guide/C/figures/sample_anno_panel.xcf
diff --git a/gnome2-user-guide/C/glossary.xml b/gnome2-user-guide/C/glossary.xml
index 73aa85b..16e7350 100644
--- a/gnome2-user-guide/C/glossary.xml
+++ b/gnome2-user-guide/C/glossary.xml
@@ -17,6 +17,10 @@ your files, folders, and applications. You can use desktop background objects
 to provide convenient access to files, folders, and applications that you
 use frequently.</para></glossdef>
 </glossentry>
+<glossentry id="glossary-20"><glossterm>DNS name</glossterm>
+<glossdef><para>A unique alphabetic identifier for a computer on a network.
+</para></glossdef>
+</glossentry>
 <glossentry id="glossary-8"><glossterm>drawer</glossterm>
 <glossdef><para>A drawer is a sliding extension to a panel that you can open
 or close from a drawer icon. </para></glossdef>
@@ -32,6 +36,10 @@ is called a GNOME-compliant application. For example, <application>Nautilus
 files in UNIX file systems. Each file has one inode. An inode contains the
 node, type, owner, and location of a file. </para></glossdef>
 </glossentry>
+<glossentry id="glossary-21"><glossterm>IP address</glossterm>
+<glossdef><para>A unique numeric identifier for a computer on a network.</para>
+</glossdef>
+</glossentry>
 <glossentry id="glossary-3"><glossterm>launcher</glossterm>
 <glossdef><para>A launcher starts a particular application, executes a command,
 or opens a file. A launcher can reside in a panel or in a menu.</para></glossdef>
@@ -55,9 +63,9 @@ Nautilus</application> window contains a side pane and a view pane. </para>
 <glossdef><para>A dedicated software tool that controls a particular part
 of the behavior of the desktop.</para></glossdef>
 </glossentry>
-<glossentry id="glossary-5"><glossterm>shortcut key</glossterm>
-<glossdef><para>A shortcut key is a series of one or more keystrokes or mouse
-clicks that provides a quick way to perform an action. </para></glossdef>
+<glossentry id="glossary-5"><glossterm>shortcut keys</glossterm>
+<glossdef><para>Shortcut keys are keystrokes that provide a quick way to perform
+an action. </para></glossdef>
 </glossentry>
 <glossentry id="glossary-15"><glossterm>stacking order</glossterm>
 <glossdef><para>The stacking order is the order in which windows are stacked
@@ -73,6 +81,10 @@ information about the current state of what you are viewing in the window.
 commands in an application. Typically, a toolbar appears under a menubar.
 </para></glossdef>
 </glossentry>
+<glossentry id="glossary-19"><glossterm>Uniform Resource Locator</glossterm>
+<glossdef><para>A Uniform Resource Locator (URL) is the address of a particular
+location on the Web.</para></glossdef>
+</glossentry>
 <glossentry id="glossary-16"><glossterm>view</glossterm>
 <glossdef><para>A <application>Nautilus</application> component that enables
 you to display a folder in a particular way. For example, <application>Nautilus
diff --git a/gnome2-user-guide/C/gosbasic-C.omf b/gnome2-user-guide/C/gosbasic-C.omf
index 60d2d03..9d02453 100644
--- a/gnome2-user-guide/C/gosbasic-C.omf
+++ b/gnome2-user-guide/C/gosbasic-C.omf
@@ -16,10 +16,10 @@
       Basic Skills
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Basic Skills chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/gosbasic.xml b/gnome2-user-guide/C/gosbasic.xml
index 39b625f..fb5b90e 100644
--- a/gnome2-user-guide/C/gosbasic.xml
+++ b/gnome2-user-guide/C/gosbasic.xml
@@ -1,6 +1,7 @@
 
 
 
+
 <chapter id="gosbasic-1">
 <title>Basic Skills</title>
 <highlights><para>This chapter introduces you to the basic skills that you
@@ -8,7 +9,7 @@ need to work with your desktop.</para></highlights>
 <sect1 id="gosbasic-2">
 <title>Mouse Skills</title>
 <indexterm><primary>basic skills</primary><secondary>mouse skills</secondary>
-</indexterm><indexterm><primary>mouse</primary><secondary>skills</secondary>
+</indexterm><indexterm><primary>mouse</primary><secondary>basic skills</secondary>
 </indexterm><para>Even if you are very familiar with mouse devices, you should
 still familiarize yourself with the use of the mouse in the desktop. </para>
 <sect2 id="gosgetstarted-44">
@@ -72,7 +73,6 @@ Use to perform the following actions: <itemizedlist>
 actions: <itemizedlist>
 <listitem><para>Paste text. </para></listitem>
 <listitem><para>Move items.</para></listitem>
-<listitem><para>Open a menu if a menu applies. </para></listitem>
 </itemizedlist></para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para>Right mouse button</para></entry>
 <entry colname="COLSPEC1" valign="top"><para>Opens a menu for the selected
@@ -243,7 +243,7 @@ Shows not available pointer.</phrase>
 </mediaobject>
 </screenshot></entry><entry colname="COLSPEC2" valign="top"><para>
 Drag-and-drop</para></entry><entry colname="COLSPEC1" valign="top"><para>
-Not available pointer. Indicates that you can not drop the object at the current
+Not available pointer. Indicates that you cannot drop the object at the current
 location.</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><screenshot>
 <mediaobject>
@@ -326,20 +326,20 @@ a table to resize.</para></entry></row>
 </sect1>
 <sect1 id="gosbasic-51">
 <title>Keyboard Skills</title>
-<para>This section provides information on how to use the keyboard to work
-with the desktop. </para>
+<indexterm><primary>basic skills</primary><secondary>keyboard skills</secondary>
+</indexterm><indexterm><primary>keyboard</primary><secondary>basic skills
+</secondary></indexterm><para>This section provides information on how to
+use the keyboard to work with the desktop. </para>
 <para>For almost every task that you can perform with the mouse, you can use
-the keyboard to perform the same task. A <glossterm>shortcut key</glossterm>
-is a series of one or more keystrokes that provides a quick way to perform
-a task. </para>
+the keyboard to perform the same task. <glossterm>Shortcut keys</glossterm>
+are keys that provide you with a quick way to perform a task. </para>
 <para>You can use shortcut keys to work with the desktop and to work with
 interface items such as panels and windows. You can also use shortcut keys
 in applications. To customize your shortcut keys, choose <menuchoice><guimenu>
 Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu>
-<guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice>. For more information,
-see <xref linkend="goscustdesk-39"/>.</para>
-<para>You can also customize the desktop to use keyboard accessibility features.
-For more information, see <xref linkend="goscustaccess-1"/>.</para>
+<guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice>.</para>
+<para>You can also customize the desktop to use keyboard accessibility features. 
+</para>
 <para>The following sections describe the shortcut keys that you can use.
 </para>
 <sect2 id="gosbasic-62">
@@ -354,7 +354,7 @@ perform desktop tasks. The following table lists some desktop shortcut keys:
 <colspec colname="COLSPEC0" colwidth="35.67*"/><colspec colname="COLSPEC1"
 colwidth="64.33*"/>
 <thead>
-<row rowsep="1"><entry valign="top"><para>Default shortcut key</para></entry>
+<row rowsep="1"><entry valign="top"><para>Default Shortcut Keys</para></entry>
 <entry valign="top"><para>Function</para></entry></row>
 </thead>
 <tbody>
@@ -369,18 +369,23 @@ dialog.</para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycombo><keycap>Alt</keycap><keycap>Print
 Screen</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Takes a screenshot
 of the window that has focus. </para></entry></row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>right arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
 Switches to the workspace to the right of the current workspace.</para></entry>
 </row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>left arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
 Switches to the workspace to the left of the current workspace.</para></entry>
 </row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>up arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>up arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
 Switches to the workspace above the current workspace.</para></entry></row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>down arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>down arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
 Switches to the workspace below the current workspace.</para></entry></row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>d</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Minimizes
-all windows and gives focus to the desktop background.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>d</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Minimizes
+all windows, and gives focus to the desktop background.</para></entry></row>
 </tbody>
 </tgroup>
 </informaltable>
@@ -396,7 +401,7 @@ tasks. The following table lists some window shortcut keys:</para>
 <colspec colname="COLSPEC0" colwidth="35.67*"/><colspec colname="COLSPEC1"
 colwidth="64.33*"/>
 <thead>
-<row rowsep="1"><entry valign="top"><para>Default shortcut key</para></entry>
+<row rowsep="1"><entry valign="top"><para>Default Shortcut Keys</para></entry>
 <entry valign="top"><para>Function</para></entry></row>
 </thead>
 <tbody>
@@ -406,25 +411,35 @@ to select a window.</para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycombo><keycap>Alt</keycap><keycap>Esc</keycap></keycombo></para></entry>
 <entry colname="COLSPEC1"><para>Switches between windows in reverse order.
 Release the keys to select a window.</para></entry></row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Alt</keycap><keycap>spacebar</keycap></keycombo> </para></entry><entry colname="COLSPEC1"><para>Opens the <guilabel>Window Menu</guilabel>. </para></entry></row>
+<row><entry colname="COLSPEC0"><para><keycap>F10</keycap></para></entry><entry
+colname="COLSPEC1"><para>Opens the first menu on the left side of the menubar. 
+</para></entry></row>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Alt</keycap><keycap>spacebar
+</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Opens the <guilabel>
+Window Menu</guilabel>. </para></entry></row>
 <row><entry colname="COLSPEC0"><para>Arrow keys</para></entry><entry colname="COLSPEC1"><para>
 Moves the focus between items in a menu.</para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycap>Return</keycap></para></entry>
 <entry colname="COLSPEC1"><para>Chooses a menu item. </para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycap>Esc</keycap></para></entry><entry
 colname="COLSPEC1"><para>Closes an open menu.</para></entry></row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>right arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
 Switches to the workspace to the right of the current workspace.</para></entry>
 </row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>left arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
 Switches to the workspace to the left of the current workspace.</para></entry>
 </row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>up arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>up arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
 Switches to the workspace above the current workspace.</para></entry></row>
-<row><entry colname="COLSPEC0"><para></para><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>down arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
+<row><entry colname="COLSPEC0"><para></para><para><keycombo><keycap>Ctrl</keycap><keycap>
+Alt</keycap><keycap>down arrow</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>
 Switches to the workspace below the current workspace.</para></entry></row>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>d</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Minimizes
-all windows and gives focus to the desktop background.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>d</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Minimizes
+all windows, and gives focus to the desktop background.</para></entry></row>
 </tbody>
 </tgroup>
 </informaltable>
@@ -433,18 +448,19 @@ all windows and gives focus to the desktop background.</para></entry></row>
 <title>Panel Shortcut Keys</title>
 <indexterm><primary>shortcut keys</primary><secondary>panel</secondary></indexterm>
 <para>Panel shortcut keys enable you to use the keyboard to perform panel
-tasks. The following table lists some panel shortcut keys:</para>
+tasks. The following table lists panel shortcut keys:</para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0">
 
 <colspec colname="COLSPEC0" colwidth="31.36*"/><colspec colname="COLSPEC1"
 colwidth="68.64*"/>
 <thead>
-<row rowsep="1"><entry valign="top"><para>Default shortcut key</para></entry>
+<row rowsep="1"><entry valign="top"><para>Default Shortcut Keys</para></entry>
 <entry valign="top"><para>Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Tab</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Switches
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>Tab</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Switches
 the focus between the panels and the desktop background.</para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>F10</keycap></keycombo></para></entry>
 <entry colname="COLSPEC1"><para>Opens the popup menu for the selected panel.
@@ -452,15 +468,15 @@ the focus between the panels and the desktop background.</para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycap>Tab</keycap></para></entry><entry
 colname="COLSPEC1"><para>Switches the focus between objects on a panel.</para></entry>
 </row>
-<row><entry colname="COLSPEC0"><para><keycap>Return</keycap></para></entry>
+<row><entry colname="COLSPEC0"><para><keycap>Return </keycap></para></entry>
 <entry colname="COLSPEC1"><para>Chooses the selected panel object or menu
 item.</para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycombo><keycap>Shift</keycap><keycap>F10
 </keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Opens the popup menu
 for the selected panel object.</para></entry></row>
 <row><entry colname="COLSPEC0"><para>Arrow keys</para></entry><entry colname="COLSPEC1"><para>
-Moves the focus between items in a menu. Also moves the focus between interface
-items in an applet.</para></entry></row>
+Moves the focus between items in a menu. Moves the focus between interface
+items in an applet also.</para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycap>Esc</keycap></para></entry><entry
 colname="COLSPEC1"><para>Closes an open menu.</para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycap>F10</keycap></para></entry><entry
@@ -484,17 +500,21 @@ keys:</para>
 <colspec colname="COLSPEC0" colwidth="45.00*"/><colspec colname="COLSPEC1"
 colwidth="55.00*"/>
 <thead>
-<row rowsep="1"><entry valign="top"><para>Shortcut Key </para></entry><entry
+<row rowsep="1"><entry valign="top"><para>Shortcut Keys</para></entry><entry
 valign="top"><para>Command</para></entry></row>
 </thead>
 <tbody>
-<row><entry colname="COLSPEC0" valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>N</keycap></keycombo></para></entry><entry colname="COLSPEC1" valign="top"><para>New
+<row><entry colname="COLSPEC0" valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>
+N</keycap></keycombo></para></entry><entry colname="COLSPEC1" valign="top"><para>New
 </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>X</keycap></keycombo></para></entry><entry colname="COLSPEC1" valign="top"><para>Cut
+<row><entry colname="COLSPEC0" valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>
+X</keycap></keycombo></para></entry><entry colname="COLSPEC1" valign="top"><para>Cut
 </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo></para></entry><entry colname="COLSPEC1" valign="top"><para>Copy
+<row><entry colname="COLSPEC0" valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>
+C</keycap></keycombo></para></entry><entry colname="COLSPEC1" valign="top"><para>Copy
 </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo></para></entry><entry colname="COLSPEC1" valign="top"><para>Paste
+<row><entry colname="COLSPEC0" valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>
+V</keycap></keycombo></para></entry><entry colname="COLSPEC1" valign="top"><para>Paste
 </para></entry></row>
 <row><entry colname="COLSPEC0"><para><keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo></para></entry>
 <entry colname="COLSPEC1"><para>Undo</para></entry></row>
@@ -508,19 +528,21 @@ valign="top"><para>Command</para></entry></row>
 </sect2>
 <sect2 id="gosbasic-63">
 <title>Access Keys</title>
-<indexterm><primary>access keys</primary></indexterm><para>An <glossterm>
-access key</glossterm> is an underlined letter in a menu or dialog that you
-can use to perform an action. </para>
-<para>On a menubar, the access key for each menu is underlined. To open a
-menu, press <keycap>Alt</keycap>, then press the access key. In the menu,
-the access key for each menu item is underlined. To choose a menu item, press
-the access key for the menu item. The following table shows example access
-keys from the <application>Text Editor</application> application:</para>
+<indexterm><primary>access keys</primary></indexterm><para>A <glossterm>menubar
+</glossterm> is a bar at the top of a window that contains the menus for the
+application. An <glossterm>access key</glossterm> is an underlined letter
+in a menubar, menu, or dialog that you can use to perform an action. On a
+menubar, the access key for each menu is underlined. </para>
+<para>To open a menu, press <keycap>Alt</keycap>, then press the access key.
+In the menu, the access key for each menu item is underlined. To choose a
+menu item, press the access key for the menu item. The following table shows
+example access keys from the <application>Text Editor</application> application:
+</para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="41.44*"/><colspec
 colwidth="58.56*"/>
 <thead>
-<row rowsep="1"><entry valign="top"><para>Access Key</para></entry><entry
+<row rowsep="1"><entry valign="top"><para>Access Keys</para></entry><entry
 valign="top"><para>Function</para></entry></row>
 </thead>
 <tbody>
@@ -537,7 +559,7 @@ menu.</para></entry></row>
 one letter in most dialog elements is underlined. To access a particular dialog
 element, press <keycap>Alt</keycap>, then press the access key. The following
 table shows an example access key from the <guilabel>Preferences</guilabel>
-dialog in <application>Text Editor</application> application:</para>
+dialog in the <application>Text Editor</application> application:</para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="50*"/><colspec colwidth="50*"/>
 <thead>
@@ -564,14 +586,14 @@ Function</para></entry></row>
 Moves the focus from element to element in a window or dialog.</para></entry>
 </row>
 <row><entry valign="top"><para>Arrow keys</para></entry><entry valign="top"><para>
-Perform the following actions:</para><itemizedlist>
-<listitem><para>On a menubar, moves the focus from one menu to the next menu.
-In an open menu, moves the focus from one menu item  to the next menu item. 
+Use the arrow keys to perform the following actions:</para><itemizedlist>
+<listitem><para>In a menubar, move the focus from one menu to the next menu.
+In an open menu, move the focus from one menu item to the next menu item. 
 </para></listitem>
-<listitem><para>Moves the focus from one option to the next option to make
+<listitem><para>Move the focus from one option to the next option to make
 your selection, for example, within a group of radio buttons in a dialog.
 </para></listitem>
-<listitem><para>Changes the value that a spin box displays.</para></listitem>
+<listitem><para>Change the value that a spin box displays.</para></listitem>
 </itemizedlist></entry></row>
 </tbody>
 </tgroup>
@@ -635,11 +657,11 @@ valign="top"><para>Action</para></entry></row>
 <entry colname="COLSPEC2" valign="top"><para>Click on the item.</para></entry>
 </row>
 <row><entry colname="COLSPEC0" valign="top"><para>Select a group of contiguous
-items</para></entry><entry colname="COLSPEC2" valign="top"><para>Press and
-hold <keycap>Shift</keycap>. Click on the first item in the group, then click
-on the last item in the group.</para></entry></row>
+items</para></entry><entry colname="COLSPEC2" valign="top"><para>Press-and-hold <keycap>
+Shift</keycap>. Click on the first item in the group, then click on the last
+item in the group.</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para>Select multiple items</para></entry>
-<entry colname="COLSPEC2" valign="top"><para>Press and hold <keycap>Ctrl</keycap>.
+<entry colname="COLSPEC2" valign="top"><para>Press-and-hold <keycap>Ctrl</keycap>.
 Click on the items that you want to select.</para></entry></row>
 </tbody>
 </tgroup>
diff --git a/gnome2-user-guide/C/goscustaccess-C.omf b/gnome2-user-guide/C/goscustaccess-C.omf
index b4ee8b2..6535505 100644
--- a/gnome2-user-guide/C/goscustaccess-C.omf
+++ b/gnome2-user-guide/C/goscustaccess-C.omf
@@ -16,10 +16,10 @@
       Accessibility Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Using the Accessibility Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustaccess-applications-C.omf b/gnome2-user-guide/C/goscustaccess-applications-C.omf
index 3ee2d75..b1936b5 100644
--- a/gnome2-user-guide/C/goscustaccess-applications-C.omf
+++ b/gnome2-user-guide/C/goscustaccess-applications-C.omf
@@ -16,10 +16,10 @@
       Accessibility Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Applications|Desktop Preferences"/>
     <description>
       Using the Accessibility Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustaccess-preferences-C.omf b/gnome2-user-guide/C/goscustaccess-preferences-C.omf
index b57b350..0ae4bbc 100644
--- a/gnome2-user-guide/C/goscustaccess-preferences-C.omf
+++ b/gnome2-user-guide/C/goscustaccess-preferences-C.omf
@@ -16,10 +16,10 @@
       Accessibility Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Preferences"/>
     <description>
       Using the Accessibility Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustaccess.xml b/gnome2-user-guide/C/goscustaccess.xml
index a497269..91c29fd 100644
--- a/gnome2-user-guide/C/goscustaccess.xml
+++ b/gnome2-user-guide/C/goscustaccess.xml
@@ -2,8 +2,6 @@
 
 <chapter id="goscustaccess-1">
 <title>Using the Accessibility Preference Tools</title>
-<indexterm><primary>preference tools</primary><secondary>accessibility</secondary>
-</indexterm>
 <highlights><para>This chapter describes how to use the <guilabel>Accessibility
 </guilabel> preference tools to customize your desktop.</para></highlights>
 <sect1 id="goscustaccess-2">
@@ -24,59 +22,25 @@ Alternatively, double-click on the <guilabel>Start Here</guilabel> object
 on the desktop background. The <guilabel>Start Here</guilabel> location is
 displayed. Double-click on the <guilabel>Preferences</guilabel> object in
 the <application>Nautilus</application> window, then double-click on the <guilabel>
-Accessibility</guilabel> folder. The following figure shows the <guilabel>
-Accessibility</guilabel> folder:</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_accessibility_window.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows the Desktop Preferences Accessibility location in a Nautilus window. View pane contains Keyboard icon.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+Accessibility</guilabel> folder. </para></listitem>
 </itemizedlist>
 </sect1>
 <sect1 id="goscustaccess-6">
 <title>Configuring Keyboard Accessibility Options</title>
-<indexterm><primary>AccessX</primary><see>Keyboard Accessibility</see></indexterm>
-<indexterm><primary>keyboard, configuring</primary></indexterm><indexterm>
-<primary>accessibility</primary><secondary>configuring</secondary></indexterm>
-<para>Use the <application>Keyboard Accessibility</application> preference
-tool <indexterm><primary>preference tools</primary><secondary>Keyboard Accessibility
-</secondary></indexterm>to set the keyboard and miscellaneous accessibility
-preferences.</para>
-<para>The <application>Keyboard Accessibility</application> preference tool
-is also known as <application>AccessX</application>.</para>
-<para>You can customize the <application>Keyboard Accessibility</application>
-preference tool in the following tabbed sections:</para>
-<itemizedlist>
-<listitem><para>Keyboard</para></listitem>
-<listitem><para>Misc</para></listitem>
-</itemizedlist>
+<indexterm><primary>AccessX</primary><see>preference tools, Keyboard Accessibility
+</see></indexterm><indexterm><primary>keyboard</primary><secondary>configuring
+accessibility options</secondary></indexterm><indexterm><primary>accessibility
+</primary><secondary>configuring keyboard</secondary></indexterm><indexterm>
+<primary>preference tools</primary><secondary>Keyboard Accessibility</secondary>
+</indexterm><para>Use the <application>Keyboard</application> accessibility
+preference tool to set the keyboard accessibility preferences. The <application>
+Keyboard</application> accessibility preference tool is also known as <application>
+AccessX</application>.</para>
 <sect2 id="goscustaccess-4">
-<title>Keyboard Accessibility Options</title>
-<figure id="goscustaccess-FIG-6">
-<title>Default Keyboard Accessibility Options</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_accessx_keyboard_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Keyboard Accessibility preference tool, Keyboard tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustaccess-TBL-1"/> lists the settings that you can
-modify for the keyboard options.</para>
+<title>Keyboard Accessibility Options</title><para><xref linkend="goscustaccess-TBL-1"/> lists the keyboard
+accessibility settings that you can modify.</para>
 <table frame="topbot" id="goscustaccess-TBL-1">
-<title>Keyboard Accessibility Options</title>
+<title>Keyboard Accessibility Settings</title>
 <tgroup cols="2" colsep="0" rowsep="0">
 
 <colspec colname="COLSPEC0" colwidth="25.64*"/><colspec colname="COLSPEC1"
@@ -86,25 +50,20 @@ colwidth="74.36*"/>
 Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry valign="top"><para><guilabel>Enable keyboard accessibility</guilabel></para></entry>
-<entry valign="top"><para>Select this option to activate the keyboard accessibility
-preferences.</para></entry></row>
-<row><entry colname="COLSPEC0"><para><guilabel>Enable Bounce Keys</guilabel></para><indexterm>
-<primary>accessibility</primary><secondary>bounce keys</secondary></indexterm></entry>
-<entry colname="COLSPEC1"><para>Select this option to accept a key input and
-to control the key repeat characteristics of the keyboard. You can specify
-the following bounce keys settings:  </para><itemizedlist>
-<listitem><para><guilabel>Ignore keypresses within</guilabel>: Use this setting
-to specify the interval to wait after the first keypress before the automatic
-repeat of a pressed key. Setting range: 10 to 900 milliseconds. </para></listitem>
-<listitem><para><guilabel>Beep when key is rejected</guilabel>: Select this
-option for an audible indication of key rejection. </para></listitem>
-</itemizedlist></entry></row>
+<row><entry colname="COLSPEC0"><para><guilabel>Beep when enabling/disabling
+keyboard accessibility features</guilabel></para></entry><entry colname="COLSPEC1"><para>
+Select this option for an audible indication when a feature such as sticky
+keys or slow keys is activated, or deactivated.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><guilabel>Disable if unused</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>Select this option to enable you to deactivate
+the keyboard accessibility preferences. Specify the period of time that must
+pass before timeout occurs. Setting range: 10 to 500 seconds.</para></entry>
+</row>
 <row><entry colname="COLSPEC0"><para><guilabel>Enable Mouse Keys</guilabel></para><indexterm>
 <primary>accessibility</primary><secondary>mouse keys</secondary></indexterm></entry>
 <entry colname="COLSPEC1"><para>Select this option to make the numeric keypad
-on your keyboard emulate mouse actions. You can specify the following mouse
-key settings: </para><itemizedlist>
+emulate mouse actions. You can specify the following mouse key settings: 
+</para><itemizedlist>
 <listitem><para><guilabel>Maximum pointer speed</guilabel>: Use this setting
 to specify the maximum speed that the pointer moves across the screen. Setting
 range: 1 to 100 pixels per second. </para></listitem>
@@ -116,18 +75,13 @@ Use this setting to specify the period of time that must pass after a keypress
 before the pointer moves. Setting range: 10 to 5000 milliseconds. </para>
 </listitem>
 </itemizedlist></entry></row>
-<row><entry colname="COLSPEC0"><para><guilabel>Test Area</guilabel></para></entry>
-<entry colname="COLSPEC1"><para>The test area is an interactive interface
-so you can see how the keyboard settings affect the display as you type. Type
-text in the test area to test the effect of your settings.</para></entry>
-</row>
 <row><entry colname="COLSPEC0"><para><guilabel>Enable Slow Keys</guilabel></para><indexterm>
 <primary>accessibility</primary><secondary>slow keys</secondary></indexterm></entry>
-<entry colname="COLSPEC1"><para> Select this option to control the period
-of time that you must press and hold a key before acceptance. You can specify
+<entry colname="COLSPEC1"><para>Select this option to control the period of
+time that you must press-and-hold a key before acceptance. You can specify
 the following slow keys settings: </para><itemizedlist>
 <listitem><para><guilabel>Only accept keypress after</guilabel>: Use this
-setting to specify the period of time that you must press and hold a key before
+setting to specify the period of time that you must press-and-hold a key before
 acceptance. Setting range: 10 and 900 milliseconds. </para></listitem>
 <listitem><para><guilabel>Beep when key is pressed</guilabel>: Select this
 option for an audible indication of a keypress. </para></listitem>
@@ -136,6 +90,17 @@ option for an audible indication of key acceptance. </para></listitem>
 <listitem><para><guilabel>Beep when key is rejected</guilabel>: Select this
 option for an audible indication of key rejection. </para></listitem>
 </itemizedlist></entry></row>
+<row><entry colname="COLSPEC0"><para><guilabel>Enable Bounce Keys</guilabel></para><indexterm>
+<primary>accessibility</primary><secondary>bounce keys</secondary></indexterm></entry>
+<entry colname="COLSPEC1"><para>Select this option to accept a key input and
+to control the key repeat characteristics of the keyboard. You can specify
+the following bounce keys settings:  </para><itemizedlist>
+<listitem><para><guilabel>Ignore keypresses within</guilabel>: Use this setting
+to specify the interval to wait after the first keypress before the automatic
+repeat of a pressed key. Setting range: 10 to 900 milliseconds. </para></listitem>
+<listitem><para><guilabel>Beep when key is rejected</guilabel>: Select this
+option for an audible indication of key rejection. </para></listitem>
+</itemizedlist></entry></row>
 <row><entry colname="COLSPEC0"><para><guilabel>Enable Sticky Keys</guilabel></para><indexterm>
 <primary>accessibility</primary><secondary>sticky keys</secondary></indexterm></entry>
 <entry colname="COLSPEC1"><para>Select this option to perform multiple simultaneous
@@ -144,64 +109,23 @@ following sticky keys settings: </para><itemizedlist>
 <listitem><para><guilabel>Beep when modifier is pressed</guilabel>: Select
 this option for an audible indication when you press a modifier key. </para>
 </listitem>
-<listitem><para><guilabel>Turn off Sticky Keys when two pressed simultaneously</guilabel>: Select this option to specify when you press two keys simultaneously,
+<listitem><para><guilabel>Turn off Sticky Keys when two pressed simultaneously
+</guilabel>: Select this option to specify that when you press two keys simultaneously,
 you can no longer press keys in sequence to perform multiple simultaneous
 keypresses.</para></listitem>
 </itemizedlist></entry></row>
-<row><entry colname="COLSPEC0"><para><guilabel>Toggle Keys</guilabel></para><indexterm>
+<row><entry colname="COLSPEC0"><para><guilabel>Toggle and Repeat Keys</guilabel></para><indexterm>
 <primary>accessibility</primary><secondary>toggle keys</secondary></indexterm></entry>
 <entry colname="COLSPEC1"><para>Select this option for an audible indication
 of a toggle keypress. You hear one beep when a toggle key is turned on. You
 hear two beeps when a toggle key is turned off.</para></entry></row>
-</tbody>
-</tgroup>
-</table>
-<para>You can use the <application>Keyboard</application> preference tool
-to configure the repeat key preferences. For more information, see <xref linkend="goscustperiph-2"/>.
-</para>
-</sect2>
-<sect2 id="goscustaccess-5">
-<title>Miscellaneous Accessibility Options</title>
-<para>Use the <application>Keyboard Accessibility</application> preference
-tool to set your general accessibility preferences.</para>
-<para>You can change some session-level accessibility options in the <guilabel>
-Misc</guilabel> tabbed section of the <application>Keyboard Accessibility
-</application> dialog.</para>
-<figure id="goscustaccess-FIG-7">
-<title>Default Miscellaneous Settings</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_accessx_misc_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Keyboard Accessibility preference tool, Misc tabbed section. Contains: Enabling features beep checkbox, Disable if unused checkbox, Import CDE AccessX file button.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustaccess-FIG-7"/> lists the settings that you can
-modify for the miscellaneous options.</para>
-<table frame="topbot" id="goscustaccess-TBL-4">
-<title>Miscellaneous Accessibility Options</title>
-<tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC2" colwidth="50*"/>
-<colspec colname="COLSPEC3" colwidth="50*"/>
-<thead>
-<row rowsep="1"><entry valign="top"><para>Option</para></entry><entry valign="top"><para>
-Function</para></entry></row>
-</thead>
-<tbody>
-<row><entry valign="top"><para><guilabel>Beep when enabling/disabling keyboard
-accessibility features</guilabel></para></entry><entry valign="top"><para>
-Select this option for an audible indication when a feature such as sticky
-keys or slow keys is activated, or deactivated.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Disable if unused</guilabel></para></entry>
-<entry valign="top"><para>Select this option to enable you to deactivate the
-keyboard accessibility preferences. Specify the period of time that must pass
-before timeout occurs. Setting range: 10 to 500 seconds.</para></entry></row>
-<row><entry colname="COLSPEC2"><para><guilabel>Import CDE AccessX file </guilabel></para></entry>
-<entry colname="COLSPEC3"><para>Click on this button to import a CDE AccessX
+<row><entry colname="COLSPEC0"><para><guilabel>Testing Area</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>The test area is an interactive interface
+so you can see how the keyboard settings affect the display as you type. Type
+text in the test area to test the effect of your settings.</para></entry>
+</row>
+<row><entry colname="COLSPEC0"><para><guibutton>Import CDE AccessX file</guibutton></para></entry>
+<entry colname="COLSPEC1"><para>Click on this button to import a CDE AccessX
 configuration file. </para></entry></row>
 </tbody>
 </tgroup>
diff --git a/gnome2-user-guide/C/goscustdesk-C.omf b/gnome2-user-guide/C/goscustdesk-C.omf
index 6b71bdd..3d5f15b 100644
--- a/gnome2-user-guide/C/goscustdesk-C.omf
+++ b/gnome2-user-guide/C/goscustdesk-C.omf
@@ -16,10 +16,10 @@
       Basic Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Using the Basic Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustdesk-applications-C.omf b/gnome2-user-guide/C/goscustdesk-applications-C.omf
index 397566f..49f96f1 100644
--- a/gnome2-user-guide/C/goscustdesk-applications-C.omf
+++ b/gnome2-user-guide/C/goscustdesk-applications-C.omf
@@ -16,10 +16,10 @@
       Basic Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Applications|Desktop Preferences"/>
     <description>
       Using the Basic Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustdesk-preferences-C.omf b/gnome2-user-guide/C/goscustdesk-preferences-C.omf
index 10e8de1..7707d20 100644
--- a/gnome2-user-guide/C/goscustdesk-preferences-C.omf
+++ b/gnome2-user-guide/C/goscustdesk-preferences-C.omf
@@ -16,10 +16,10 @@
       Basic Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Preferences"/>
     <description>
       Using the Basic Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 8209be2..7816fa8 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -4,10 +4,13 @@
 <title>Using the Basic Preference Tools</title>
 <highlights><para>The basic preference tools enable you to customize your
 desktop background. You can use the basic preference tools to configure your
-keyboard settings and your mouse settings. You can also use the basic preference
-tools to configure shortcut keys, and to set your sound preferences. This
-chapter describes how to use the basic preference tools to customize your
-desktop.</para></highlights>
+keyboard settings and your mouse settings. You can use the basic preference
+tools to configure shortcut keys, to set your sound preferences, and to configure
+your network proxy. You can also use the basic preference tools to choose
+a theme and fonts for your desktop, and to customize your application menubars
+and toolbars. You can also customize window focus behavior.</para>
+<para>This chapter describes how to use the basic preference tools to customize
+your desktop.</para></highlights>
 <sect1 id="goscustdesk-37">
 <title>Opening a Basic Preference Tool</title>
 <para>You can open one of the basic preference tools in either of the following
@@ -25,18 +28,7 @@ Alternatively, double-click on the <guilabel>Start Here</guilabel> object
 on the desktop background. The <guilabel>Start Here</guilabel> location is
 displayed. Double-click on the <guilabel>Preferences</guilabel> object in
 the <application>Nautilus</application> window to display your preference
-tools, as shown in the following figure: </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_main_window.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Show the Desktop Preferences location in a Nautilus window. View pane contains Accessibility, Advanced, Background, Fonts icons.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
+tools.</para>
 <para>Double-click on the tool that you require. The dialog for the tool is
 displayed.</para></listitem>
 </itemizedlist>
@@ -46,11 +38,11 @@ displayed.</para></listitem>
 <indexterm><primary>desktop background</primary><secondary>customizing</secondary>
 </indexterm><indexterm><primary>desktop preference tools</primary><see>preference
 tools</see></indexterm><indexterm><primary>preference tools</primary><secondary>
-Background</secondary></indexterm><indexterm><primary>background</primary>
-<secondary>desktop background</secondary><tertiary>customizing</tertiary>
-</indexterm><para>The desktop background is the part of the desktop where
-there are no interface graphical items, such as panels and windows. The desktop
-background is always beneath the other interface items.</para>
+Background</secondary></indexterm><indexterm><primary>backgrounds</primary>
+<secondary>customizing desktop background</secondary></indexterm><para>The
+desktop background is the part of the desktop where there are no interface
+graphical items, such as panels and windows. The desktop background is always
+beneath the other interface items.</para>
 <para>You can customize the desktop background in the following ways:</para>
 <itemizedlist>
 <listitem><para>Select an image to display on the desktop background. The
@@ -64,22 +56,8 @@ is a visual effect where one color blends gradually into another color. </para>
 </itemizedlist>
 <para>You can also change the appearance of your desktop background from within
 the <application>Nautilus</application> file manager.</para>
-<figure id="goscustdesk-FIG-28">
-<title>Settings for Desktop Background</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_background_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Background preferences tool dialog. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdesk-TBL-14"/> lists the background settings that
-you can configure.</para>
+<para><xref linkend="goscustdesk-TBL-14"/> lists the background
+settings that you can configure.</para>
 <table frame="topbot" id="goscustdesk-TBL-14">
 <title>Settings for Desktop Background</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -92,10 +70,10 @@ colwidth="47.14*"/>
 </thead>
 <tbody>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Picture</guilabel></para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0"
-valign="top"><para>Choose an image to display on the desktop background. To
-choose an image, click on the <guibutton>Picture</guibutton> button. An image
-selector dialog is displayed. Choose an image from the dialog. Alternatively,
+Select picture</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
+rowsep="0" valign="top"><para>Choose an image to display on the desktop background.
+To choose an image, click on the <guibutton>Picture</guibutton> button. An
+image selector dialog is displayed. Choose an image from the dialog. Alternatively,
 to choose an image from another directory, click <guibutton>Browse</guibutton>.
 When you choose an image, click <guibutton>OK</guibutton>. </para></entry>
 </row>
@@ -117,39 +95,33 @@ the image.</para></listitem>
 </listitem>
 </itemizedlist></entry></row>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Border the picture with a</guilabel></para></entry><entry colname="COLSPEC1"
-colsep="0" rowsep="0" valign="top"><para>To specify a color scheme, use  the
-options in the <guilabel>Border the picture with a</guilabel> drop-down list
-box, and the color selector buttons.</para><para>You can specify a color scheme
-in one of the following ways:</para><itemizedlist>
-<listitem><para>Choose <guilabel>Solid</guilabel> from the <guilabel>Border
-the picture with a</guilabel> drop-down list box to specify a single color
-as the desktop background. </para>
-<para>To choose the color that you require, click on the first color selector
-button on the right side of the  drop-down list box. The <guilabel>Pick a
-Color</guilabel> dialog is displayed. Choose a color, then click <guibutton>
-OK</guibutton>.</para></listitem>
-<listitem><para>Choose <guilabel>Horizontal Gradient</guilabel> from the <guilabel>
-Border the picture with a</guilabel> drop-down list box. This option creates
-a gradient effect from one horizontal screen edge to the other horizontal
-screen edge.</para>
-<para>Click on the first color selector button on the right side of the  drop-down
-list box to display the <guilabel>Pick a Color</guilabel> dialog. Choose the
-color that you want to appear at the top horizontal edge.</para>
-<para>Click on the second color selector button on the right side of the 
-drop-down list box to display the <guilabel>Pick a Color</guilabel> dialog.
-Choose the color that you want to appear at the bottom horizontal edge.</para>
-</listitem>
-<listitem><para>Choose <guilabel>Vertical Gradient</guilabel> from the <guilabel>
-Border the picture with a</guilabel> drop-down list box. This creates a gradient
-effect from one vertical  screen edge to the other vertical screen edge.</para>
-<para>Click on the first color selector button on the right side of the  drop-down
-list box to display the <guilabel>Pick a Color</guilabel> dialog. Choose the
-color that you want to appear at the left vertical edge.</para>
-<para>Click on the second color selector button on the right side of the 
-drop-down list box to display the <guilabel>Pick a Color</guilabel> dialog.
-Choose the color that you want to appear at the right vertical edge.</para>
-</listitem>
+Background Style</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 box, and the color
+selector buttons.</para><para>You can specify a color scheme in one of the
+following ways:</para><itemizedlist>
+<listitem><para>Choose <guilabel>Solid color</guilabel> from the <guilabel>
+Background Style</guilabel> drop-down list box to specify a single color for
+the desktop background. </para>
+<para>To choose the color that you require, click on the <guibutton>Color
+</guibutton>  button. The <guilabel>Pick a Color</guilabel> dialog is displayed.
+Choose a color, then click <guibutton>OK</guibutton>.</para></listitem>
+<listitem><para>Choose <guilabel>Horizontal gradient</guilabel> from the <guilabel>
+Background Style</guilabel> drop-down list box. This option creates a gradient
+effect from the left screen edge to the right screen edge.</para>
+<para>Click on the <guibutton>Left Color</guibutton> button  to display the <guilabel>
+Pick a Color</guilabel> dialog. Choose the color that you want to appear at
+the left edge.</para>
+<para>Click on the <guibutton>Right Color</guibutton> button. Choose the color
+that you want to appear at the right edge.</para></listitem>
+<listitem><para>Choose <guilabel>Vertical gradient</guilabel> from the <guilabel>
+Background Style</guilabel> drop-down list box. This creates a gradient effect
+from the top   screen edge to the bottom screen edge.</para>
+<para>Click on the <guibutton>Top Color</guibutton> button to display the <guilabel>
+Pick a Color</guilabel> dialog. Choose the color that you want to appear at
+the top edge.</para>
+<para>Click on the <guibutton>Bottom Color</guibutton> button. Choose the
+color that you want to appear at the bottom edge.</para></listitem>
 </itemizedlist></entry></row>
 </tbody>
 </tgroup>
@@ -161,23 +133,9 @@ Choose the color that you want to appear at the right vertical edge.</para>
 </indexterm><indexterm><primary>fonts</primary><secondary>desktop</secondary>
 </indexterm><indexterm><primary>fonts</primary><secondary>file manager</secondary>
 </indexterm><para>Use the <application>Font</application> preference tool
-to specify the fonts to use on your desktop.</para>
-<figure id="goscustlookandfeel-FIG-20">
-<title>Default Settings for the Font Selector</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_font_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Font preference tool. Contains Standard Desktop Font, File Manager Font selector buttons.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdesk-TBL-26"/> lists the font settings that you
-can configure for the desktop.</para>
+to select the fonts to use on your desktop.</para>
+<para><xref linkend="goscustdesk-TBL-26"/> lists the font settings
+that you can configure for the desktop.</para>
 <table frame="topbot" id="goscustdesk-TBL-26">
 <title>Settings for Fonts</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -189,14 +147,14 @@ colwidth="46.79*"/>
 <entry colsep="0" rowsep="1" valign="top"><para>Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Standard Desktop
-Font</guilabel></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
-Click on the font selector button to select a font to use throughout your
-desktop and your applications.</para></entry></row>
+<row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Application
+font</guilabel></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
+Click on the font selector button to select a font to use in your applications.
+</para></entry></row>
 <row><entry colname="COLSPEC18" colsep="0" rowsep="0" valign="top"><para><guilabel>
-File Manager Font</guilabel></para></entry><entry colname="COLSPEC19" colsep="0"
+Desktop font</guilabel></para></entry><entry colname="COLSPEC19" colsep="0"
 rowsep="0" valign="top"><para>Click on the font selector button to select
-a font to use in your file manager only.</para></entry></row>
+a font to use on your desktop background only. ??Check</para></entry></row>
 </tbody>
 </tgroup>
 </table>
@@ -204,10 +162,10 @@ a font to use in your file manager only.</para></entry></row>
 <sect1 id="goscustperiph-2">
 <title>Configuring Keyboard Settings</title>
 <indexterm><primary>preference tools</primary><secondary>Keyboard</secondary>
-</indexterm><indexterm><primary>keyboard</primary><secondary>configuring</secondary>
-</indexterm><para>Use the <application>Keyboard</application> preference tool
-to specify the autorepeat settings for your keyboard, and to configure the
-sound events that are associated with the keyboard. </para>
+</indexterm><indexterm><primary>keyboard</primary><secondary>configuring general
+preferences</secondary></indexterm><para>Use the <application>Keyboard</application>
+preference tool to select the autorepeat settings for your keyboard, and to
+configure the sound events that are associated with the keyboard. </para>
 <para>You can customize the settings for the <application>Keyboard</application>
 preference tool in the following functional areas:</para>
 <itemizedlist>
@@ -216,24 +174,12 @@ preference tool in the following functional areas:</para>
 </itemizedlist>
 <sect2 id="goscustdesk-40">
 <title>Keyboard Settings</title>
-<para>Use the <guilabel>Keyboard</guilabel> tabbed section to specify general
-keyboard preferences.</para>
-<figure id="goscustperiph-FIG-1">
-<title>Settings for Keyboard</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_keyboard_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Keyboard preference tool, Keyboard tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustperiph-TBL-3"/> lists the keyboard settings that
-you can configure.</para>
+<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>,
+click on the <guibutton>Accessibility</guibutton> button.</para>
+<para><xref linkend="goscustperiph-TBL-3"/> lists the keyboard
+settings that you can configure.</para>
 <table frame="topbot" id="goscustperiph-TBL-3">
 <title>Settings for Keyboard</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -252,51 +198,35 @@ repeat is enabled, when you press-and-hold a key, the action associated with
 the key is performed repeatedly. For example, if you press-and-hold a character
 key, the character is typed repeatedly.</para></entry></row>
 <row><entry colname="COLSPEC18" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Delay before repeating</guilabel></para></entry><entry colname="COLSPEC19"
-colsep="0" rowsep="0" valign="top"><para>Select the delay from the time you
-press a key to the time that the action repeats.</para></entry></row>
+Delay</guilabel></para></entry><entry colname="COLSPEC19" colsep="0" rowsep="0"
+valign="top"><para>Select the delay from the time you press a key to the time
+that the action repeats.</para></entry></row>
 <row><entry colname="COLSPEC18" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Repeat speed</guilabel></para></entry><entry colname="COLSPEC19" colsep="0"
-rowsep="0" valign="top"><para>Select the speed at which the action is repeated. 
-</para></entry></row>
+Speed</guilabel></para></entry><entry colname="COLSPEC19" colsep="0" rowsep="0"
+valign="top"><para>Select the speed at which the action is repeated. </para></entry>
+</row>
 <row><entry colname="COLSPEC18" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Cursor blinks in text fields</guilabel></para></entry><entry colname="COLSPEC19"
+Blinks in text boxes and fields</guilabel></para></entry><entry colname="COLSPEC19"
 colsep="0" rowsep="0" valign="top"><para>Select this option to enable the
 cursor to blink in fields and text boxes.</para></entry></row>
 <row><entry colname="COLSPEC18" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Blink speed</guilabel></para></entry><entry colname="COLSPEC19" colsep="0"
-rowsep="0" valign="top"><para>Use the slider to specify the speed at which
-the cursor blinks in fields and text boxes.</para></entry></row>
-<row><entry colsep="0" rowsep="0" valign="top"><para><guibutton>Accessibility
-</guibutton></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
-Click on this button to start the <application>AccessX</application> preference
-tool.</para></entry></row>
+Speed</guilabel></para></entry><entry colname="COLSPEC19" colsep="0" rowsep="0"
+valign="top"><para>Use the slider to specify the speed at which the cursor
+blinks in fields and text boxes.</para></entry></row>
 </tbody>
 </tgroup>
 </table>
 </sect2>
 <sect2 id="goscustdesk-41">
 <title>Sound Settings</title>
-<indexterm><primary>keyboard sound</primary><secondary>configuring</secondary>
-</indexterm><indexterm><primary>sound</primary><secondary>configuring keyboard
-</secondary></indexterm><para>Use the <guilabel>Sound</guilabel> tabbed section
-to specify your preferences for keyboard sound.</para>
-<figure>
-<title>Settings for Keyboard Sound</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_basic_keyboardsound_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Keyboard preference tool, Sound tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdesk-TBL-1"/> lists the keyboard sound settings
-that you can configure.</para>
+<indexterm><primary>keyboard</primary><secondary>configuring sound preferences
+</secondary></indexterm><indexterm><primary>sound</primary><secondary>configuring
+keyboard preferences</secondary></indexterm><para>Use the <guilabel>Sound
+</guilabel> tabbed section to set your preferences for keyboard sound.</para>
+<para>Some applications play a bell sound to indicate a keyboard
+input error. Use the options in the <guilabel>Sound</guilabel> tabbed section
+to configure the bell sound. <xref linkend="goscustdesk-TBL-1"/> lists the
+keyboard sound settings that you can configure.</para>
 <table frame="topbot" id="goscustdesk-TBL-1">
 <title>Settings for Keyboard Sound</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -308,27 +238,13 @@ colwidth="46.79*"/>
 <entry colsep="0" rowsep="1" valign="top"><para>Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Keypress makes
-sound</guilabel></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
-Select this option to enable a click sound when you press a key.</para></entry>
-</row>
-<row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Volume</guilabel></para></entry>
-<entry colsep="0" rowsep="0" valign="top"><para>Use the slider to specify
-the volume at which to play the key click sound.</para></entry></row>
+<row><entry colname="COLSPEC18" colsep="0" rowsep="0"><para><guilabel>Off
+</guilabel></para></entry><entry colname="COLSPEC19" colsep="0" rowsep="0"><para>
+Select this option to disable the keyboard bell.</para></entry></row>
 <row><entry colname="COLSPEC18" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Keyboard Bell</guilabel></para></entry><entry colname="COLSPEC19" colsep="0"
-rowsep="0" valign="top"><para>Some applications play a bell sound to indicate
-a keyboard input error. Use the options in the <guilabel>Keyboard Bell</guilabel>
-group to configure the bell sound.</para><itemizedlist>
-<listitem><para><guilabel>Keyboard bell off</guilabel>: Select this option
-to disable the keyboard bell.</para></listitem>
-<listitem><para><guilabel>Keyboard bell enabled</guilabel>: Select this option
-to enable the keyboard bell.</para></listitem>
-<listitem><para><guilabel>Custom keyboard bell</guilabel>: Select this option
-to enable a keyboard bell. Select the custom bell from the drop-down combination
-box. Alternatively, click on the <guibutton>Browse</guibutton> button to find
-a keyboard bell in another location. </para></listitem>
-</itemizedlist></entry></row>
+Beep</guilabel></para></entry><entry colname="COLSPEC19" colsep="0" rowsep="0"
+valign="top"><para>Select this option to enable the keyboard bell.</para></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
@@ -339,26 +255,12 @@ a keyboard bell in another location. </para></listitem>
 <indexterm><primary>preference tools</primary><secondary>Keyboard Shortcuts
 </secondary></indexterm><indexterm><primary>shortcut keys</primary><secondary>
 configuring</secondary></indexterm><para>Shortcut keys enable you to use the
-keyboard to perform tasks in the desktop and in applications.</para>
+keyboard to perform tasks, </para>
 <para>Use the <application>Keyboard Shortcuts</application> preference tool
 to display the default shortcut keys. You can customize the default shortcut
 keys to your requirements.</para>
-<figure id="goscustdesk-FIG-6">
-<title>Default Shortcut Keys</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_basic_keyboardshortcuts.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Keyboard Shortcuts preference tool. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdesk-TBL-5"/> lists the shortcut key settings that
-you can customize.</para>
+<para><xref linkend="goscustdesk-TBL-5"/> lists the shortcut key
+settings that you can customize.</para>
 <table frame="topbot" id="goscustdesk-TBL-5">
 <title>Default Settings for Shortcut Keys</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="36.11*"/>
@@ -368,23 +270,72 @@ you can customize.</para>
 Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry colname="COLSPEC0"><para><guilabel>Keyboard Navigation scheme
-for use in applications</guilabel></para></entry><entry colname="COLSPEC1"><para>
- Select one of the following settings:</para><itemizedlist>
+<row><entry colname="COLSPEC0"><para><guilabel>Text editing shortcuts</guilabel></para></entry>
+<entry colname="COLSPEC1"><para> Select one of the following settings:</para><itemizedlist>
 <listitem><para><guilabel>Default</guilabel>: Use this setting for standard
 shortcut keys.</para></listitem>
-<listitem><para><guilabel>Emacs</guilabel>: Use this setting for Emacs shortcut
-keys.</para></listitem>
+<listitem><para><guilabel>Emacs</guilabel>: Use this setting for <application>
+Emacs</application> shortcut keys.</para></listitem>
+</itemizedlist></entry></row>
+<row><entry colname="COLSPEC0"><para><guilabel>Desktop shortcuts</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>This table lists actions and the shortcut
+keys that are associated with each action. </para><para>To change the shortcut
+keys for an action, double-click on the action. Press the keys that you want
+to associate with the action.</para><para>To disable the shortcut keys for
+an action, double-click on the action, then press <keycap>Back Space</keycap>.
+</para></entry></row>
+</tbody>
+</tgroup>
+</table>
+</sect1>
+<sect1 id="goscustuserinter-2">
+<title>Customizing Menus and Toolbars</title>
+<indexterm><primary>toolbars, customizing appearance</primary></indexterm>
+<indexterm><primary>preference tools</primary><secondary>Menus &amp; Toolbars
+</secondary></indexterm><indexterm><primary>menus</primary><secondary>in applications,
+customizing appearance</secondary></indexterm><para>You can use the <application>
+Menus &amp; Toolbars</application> preference tool to customize the appearance
+of menus, menubars, and toolbars for GNOME-compliant applications.</para>
+<para><xref linkend="goscustuserinter-TBL-8"/> lists the menu and
+toolbar settings that you can customize for GNOME-compliant applications.
+</para>
+<table frame="topbot" id="goscustuserinter-TBL-8">
+<title>Settings for Customizing Applications</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+
+<colspec colname="COLSPEC0" colwidth="18.86*"/><colspec colname="COLSPEC1"
+colwidth="47.14*"/>
+<thead>
+<row><entry colsep="0" rowsep="1" valign="top"><para>Option</para></entry>
+<entry colsep="0" rowsep="1" valign="top"><para>Function</para></entry></row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
+Button Labels</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
+rowsep="0" valign="top"><para>Choose one of the following options to specify
+what to display on the toolbars in your GNOME-compliant applications:</para><itemizedlist>
+<listitem><para><guilabel>Text Below Icons</guilabel>: Select this option
+to display toolbars with text as well as an icon on each button. </para></listitem>
+<listitem><para><guilabel>Priority Text Beside Icons</guilabel>: Select this
+option to display toolbars with an icon only on each button, and with text
+on the most important buttons.</para></listitem>
+<listitem><para><guilabel>Icons Only</guilabel>: Select this option to display
+toolbars with an icon only on each button.</para></listitem>
+<listitem><para><guilabel>Text Only</guilabel>: Select this option to display
+toolbars with text only on each button.</para></listitem>
 </itemizedlist></entry></row>
-<row><entry colname="COLSPEC0"><para><guilabel>Desktop Shortcuts</guilabel></para></entry>
-<entry colname="COLSPEC1"><para>This table displays the shortcut key settings.
-The actions are listed with their key combinations.</para><para> Use this
-table to display your shortcut key settings.</para><para>To customize a shortcut
-key, double-click in the shortcut column for the function you want to change.
-Press the key combination that you want to associate with the function you
-want to change.</para><para>To disable a shortcut key, double-click in the
-shortcut column for the function you want to change, then press <keycap>Back
-Space</keycap>.</para></entry></row>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
+Toolbars can be detached and moved around</guilabel></para></entry><entry
+colname="COLSPEC1" colsep="0" rowsep="0" valign="top"><para>Select this option
+if you want to move toolbars from application windows to any location on the
+desktop. If you select this option, handles are 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 on the desktop.</para></entry>
+</row>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
+Show icons in menus</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
+rowsep="0" valign="top"><para>Select this option to display an icon beside
+each item in a menu. Some menu items do not have an icon.</para></entry></row>
 </tbody>
 </tgroup>
 </table>
@@ -394,8 +345,8 @@ Space</keycap>.</para></entry></row>
 <indexterm><primary>preference tools</primary><secondary>Mouse</secondary>
 </indexterm><indexterm><primary>mouse</primary><secondary>configuring</secondary>
 </indexterm><para>Use the <application>Mouse</application> preference tool
-to configure your mouse for right&ndash;hand use or for left-hand use. You
-can also specify the speed and sensitivity of mouse movement.</para>
+to configure your mouse for right-hand use or for left-hand use. You can also
+specify the speed and sensitivity of mouse movement.</para>
 <para>You can customize the settings for the <application>Mouse</application>
 preference tool in the following functional areas:</para>
 <itemizedlist>
@@ -408,22 +359,8 @@ preference tool in the following functional areas:</para>
 <para>Use the <guilabel>Buttons</guilabel> tabbed section to specify whether
 the mouse buttons are configured for left-hand use. You can also specify the
 delay between clicks for a double-click.</para>
-<figure id="goscustperiph-FIG-4">
-<title>Default Settings for Mouse Buttons</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_mouse_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Mouse preference tool, Buttons tabbed section. Contains: Left-handed mouse check box, Delay slider.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustperiph-TBL-6"/> lists the mouse button settings
-that you can configure.</para>
+<para><xref linkend="goscustperiph-TBL-6"/> lists the mouse button
+settings that you can configure.</para>
 <table frame="topbot" id="goscustperiph-TBL-6">
 <title>Settings for Mouse Buttons</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -437,15 +374,15 @@ colwidth="46.79*"/>
 <tbody>
 <row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Left-handed
 mouse</guilabel></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
-Select this option to configure your mouse for left hand use. When you configure
-your mouse for left hand use, the functions of the left and right mouse buttons
-are swapped.</para></entry></row>
+Select this option to configure your mouse for left-hand use. When you configure
+your mouse for left-hand use, the functions of the left mouse button and the
+right mouse button are swapped.</para></entry></row>
 <row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Delay</guilabel></para></entry>
 <entry colsep="0" rowsep="0" valign="top"><para>Use the slider to specify
-the amount of time that can pass between clicks when you double-click a mouse
-button. If the interval between the first and second clicks exceeds the time
-that is specified here, the action is not interpreted as a double-click. 
-</para></entry></row>
+the amount of time that can pass between clicks when you double-click. If
+the interval between the first and second clicks exceeds the time that is
+specified here, the action is not interpreted as a double-click. </para></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
@@ -454,22 +391,8 @@ that is specified here, the action is not interpreted as a double-click.
 <title>Pointer Settings</title>
 <para>Use the <guilabel>Cursors</guilabel> tabbed section to set your mouse
 pointer preferences.</para>
-<figure id="goscustdesk-FIG-44">
-<title>Settings for Mouse Pointers</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_basic_mousepointers_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Mouse preference tool, Cursors tabbed section. Contains Cursor Theme list box, Show position of cursor when the Control key is pressed check box.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdesk-TBL-45"/> lists the mouse pointer settings
-that you can configure:</para>
+<para><xref linkend="goscustdesk-TBL-45"/> lists the mouse pointer
+settings that you can configure:</para>
 <table frame="topbot" id="goscustdesk-TBL-45">
 <title>Settings for Mouse Pointers</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="50*"/>
@@ -485,8 +408,9 @@ from the list box. </para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para><guilabel>Show position
 of cursor when the Control key is pressed</guilabel></para></entry><entry
 colname="COLSPEC1" valign="top"><para>Select this option to enable a mouse
-pointer animation when you press <keycap>Ctrl</keycap>. This feature can assist
-you to locate the mouse pointer on your desktop.</para></entry></row>
+pointer animation when you press and release <keycap>Ctrl</keycap>. This feature
+can assist you to locate the mouse pointer on your desktop.</para></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
@@ -495,25 +419,12 @@ you to locate the mouse pointer on your desktop.</para></entry></row>
 <title>Motion Settings</title>
 <para>Use the <guilabel>Motion</guilabel> tabbed section to set your preferences
 for mouse movement.</para>
-<figure id="goscustdesk-FIG-46">
-<title>Settings for Mouse Motion</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_basic_mousemotion_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Mouse preference tool, Motion tabbed section. Contains: Acceleration, Sensitivity, Threshold sliders.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdesk-TBL-47"/> lists the mouse motion settings
-that you can configure:</para>
+<para><xref linkend="goscustdesk-TBL-47"/> lists the mouse motion
+settings that you can configure:</para>
 <table frame="topbot" id="goscustdesk-TBL-47">
 <title>Settings for Mouse Motion</title>
-<tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="50*"/><colspec colwidth="50*"/>
+<tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="30.10*"/><colspec
+colwidth="69.90*"/>
 <thead>
 <row rowsep="1"><entry valign="top"><para>Setting</para></entry><entry valign="top"><para>
 Function</para></entry></row>
@@ -536,31 +447,24 @@ action.</para></entry></row>
 </sect2>
 </sect1>
 <sect1 id="goscustdesk-50">
-<title>Configuring Network Settings</title>
-<indexterm><primary>preference tools</primary><secondary>Network</secondary>
-</indexterm><indexterm><primary>network</primary><secondary>setting preferences
-</secondary></indexterm><para>The <application>Network</application> preference
-tool enables you to configure how your desktop connects to networks. You can
-configure the desktop to connect to a proxy server, and specify the details
-of the proxy server.</para>
-<figure id="goscustdesk-FIG-51">
-<title>Settings for Network</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_network.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Network preference tool. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdesk-TBL-52"/> lists the network settings that
-you can configure.</para>
+<title>Configuring Network Proxy Settings</title>
+<indexterm><primary>preference tools</primary><secondary>Network Proxy</secondary>
+</indexterm><indexterm><primary>network proxy</primary><secondary>setting
+preferences</secondary></indexterm><indexterm><primary>proxy</primary><secondary>
+setting preferences</secondary></indexterm><para>The <application>Network
+Proxy</application> preference tool enables you to configure how your system
+connects to networks. You can configure the desktop to connect to a <glossterm>
+proxy server</glossterm>, and specify the details of the proxy server. A proxy
+server is a server that intercepts requests to another server, and fulfills
+the request itself, if it can. You can enter the Domain Name Service (<acronym>
+DNS</acronym>) name or the Internet Protocol (<acronym>IP</acronym>) address
+of the proxy server. A <glossterm>DNS name</glossterm> is a unique alphabetic
+identifier for a computer on a network. An <glossterm>IP address</glossterm>
+is a unique numeric identifier for a computer on a network. </para>
+<para><xref linkend="goscustdesk-TBL-52"/> lists the network proxy
+settings that you can configure.</para>
 <table frame="topbot" id="goscustdesk-TBL-52">
-<title>Network Settings</title>
+<title>Network Proxy Settings</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC2" colwidth="35.09*"/>
 <colspec colname="COLSPEC3" colwidth="64.91*"/>
 <thead>
@@ -583,10 +487,10 @@ password</guilabel></para></entry><entry colname="COLSPEC3"><para>Select this
 option if the proxy server requires a username and password.</para></entry>
 </row>
 <row><entry colname="COLSPEC2"><para><guilabel>Username</guilabel></para></entry>
-<entry colname="COLSPEC3"><para>Enter the username for the proxy server.</para></entry>
-</row>
+<entry colname="COLSPEC3"><para>Enter your username for the proxy server.
+</para></entry></row>
 <row><entry valign="top"><para><guilabel>Password</guilabel></para></entry>
-<entry valign="top"><para>Enter the password for the proxy server.</para></entry>
+<entry valign="top"><para>Enter your password for the proxy server.</para></entry>
 </row>
 </tbody>
 </tgroup>
@@ -598,12 +502,12 @@ option if the proxy server requires a username and password.</para></entry>
 </indexterm><indexterm><primary>sound</primary><secondary>setting preferences
 </secondary></indexterm><indexterm><primary>sound</primary><secondary>associating
 events with sounds</secondary></indexterm><indexterm><primary>events, associating
-sounds with</primary></indexterm><indexterm><primary>sound engine</primary>
+sounds with</primary></indexterm><indexterm><primary>sound server</primary>
 </indexterm><para>The <application>Sound</application> preference tool enables
-you to control when the GNOME sound engine starts. You can also specify which
+you to control when the GNOME sound server starts. You can also specify which
 sounds to play when particular events occur.</para>
 <para>You can customize the settings for the <application>Sound</application>
-preference tool in the following functional areas.</para>
+preference tool in the following functional areas:</para>
 <itemizedlist>
 <listitem><para><guilabel>General</guilabel></para></listitem>
 <listitem><para><guilabel>Sound Events</guilabel></para></listitem>
@@ -612,23 +516,9 @@ preference tool in the following functional areas.</para>
 <title>General Settings</title>
 <para>Use the <guilabel>General</guilabel> tabbed section of the <application>
 Sound</application> preference tool to specify when to launch the GNOME sound
-engine. You can also enable sound event functions.</para>
-<figure id="goscustmulti-FIG-1">
-<title>Settings for Sound</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_sound_general.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Sound preference tool, General tabbed section. Contains: Enable sound server startup, Sounds for events check boxes.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustmulti-TBL-4"/> lists the general sound settings
-that you can configure.</para>
+server. You can also enable sound event functions.</para>
+<para><xref linkend="goscustmulti-TBL-4"/> lists the general sound
+settings that you can configure.</para>
 <table frame="topbot" id="goscustmulti-TBL-4">
 <title>Settings for Sound</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -642,8 +532,8 @@ colwidth="46.79*"/>
 <tbody>
 <row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Enable sound
 server startup</guilabel></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
-Select this option to start the GNOME sound engine when you start a GNOME
-session. When the sound engine is active, the desktop can play sounds.</para></entry>
+Select this option to start the GNOME sound server when you start a GNOME
+session. When the sound server is active, the desktop can play sounds.</para></entry>
 </row>
 <row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Sounds for
 events</guilabel></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
@@ -663,21 +553,8 @@ events. </para>
 option, and the <guilabel>Sounds for events</guilabel> option before you can
 access the <guilabel>Sound Events</guilabel> tabbed section.</para>
 </note>
-<figure id="goscustdesk-FIG-49">
-<title>Default Settings for Sound Events</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_sound_events.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase></phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustmulti-TBL-6"/> lists the sound events settings
-that you can configure.</para>
+<para><xref linkend="goscustmulti-TBL-6"/> lists the sound events
+settings that you can configure.</para>
 <table frame="topbot" id="goscustmulti-TBL-6">
 <title>Settings for Sound Events</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -702,12 +579,14 @@ occurs.</para></entry></row>
 file that is associated with the selected event. </para></entry></row>
 <row><entry colname="COLSPEC18" colsep="0" rowsep="0"><para>Sound file drop-down
 combination box, <guibutton>Browse </guibutton></para></entry><entry colname="COLSPEC19"
-colsep="0" rowsep="0"><para>Enter the name of the sound file that you want
-to associated with the selected event in the drop-down combination box. Alternatively,
-click <guibutton>Browse </guibutton> to display a <guilabel>Select sound file
-</guilabel> dialog. Use the dialog to specify the sound file that you want
-to associate with the selected event.</para><note><para>You can only associate
-sound files in <filename>.wav</filename> format with events.</para>
+colsep="0" rowsep="0"><para>To associate a sound with an event, select the
+event in the <guilabel>Sounds</guilabel> table. Enter the name of the sound
+file that you want to associate with the selected event in the drop-down combination
+box. Alternatively, click <guibutton>Browse </guibutton> to display a <guilabel>
+Select sound file</guilabel> dialog. Use the dialog to specify the sound file
+that you want to associate with the selected event.</para><note><para>You
+can only associate sound files in <filename>.wav</filename> format with events.
+</para>
 </note></entry></row>
 </tbody>
 </tgroup>
@@ -719,32 +598,20 @@ sound files in <filename>.wav</filename> format with events.</para>
 <indexterm><primary>Gtk+ themes</primary><see>themes</see></indexterm><indexterm>
 <primary>themes</primary><secondary>setting desktop themes</secondary></indexterm>
 <indexterm><primary>preference tools</primary><secondary>Theme</secondary>
-</indexterm><para>A <glossterm>theme</glossterm> is a group of coordinated
-settings that specify the visual appearance of a part of your interface. Use
-the <application>Theme</application> preference tool to select a theme for
-your desktop. </para>
+</indexterm><para>Use the <application>Theme</application> preference tool
+to select a theme for your desktop. </para>
 <para>Your desktop theme specifies the visual appearance of your panels, applets,
 and windows. The desktop theme also specifies the appearance of GNOME-compliant
 application interface items. For example, the theme affects the appearance
 of buttons, scrollbars, check boxes, and so on.</para>
+<para>The desktop theme is not the only theme that determines the appearance
+of your desktop. For example, <application>Nautilus</application> includes
+themes that you can use to change the look-and-feel of the <application>Nautilus
+</application> windows and the desktop background.</para>
 <para>You can choose from the list of available themes, or you can install
 new themes.</para>
-<figure id="goscustdesk-FIG-34">
-<title>Settings for the Theme Selector</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_theme_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Gtk+ Theme Selector preference tool, Theme tabbed section. Contains: Available Themes list box.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustlookandfeel-TBL-23"/> lists the theme settings
-that you can configure.</para>
+<para><xref linkend="goscustlookandfeel-TBL-23"/> lists the theme
+settings that you can configure.</para>
 <table frame="topbot" id="goscustlookandfeel-TBL-23">
 <title>Settings for Themes</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="40.81*"/><colspec
@@ -758,8 +625,15 @@ Function</para></entry></row>
 <entry valign="top"><para>Select the theme that you require from the list
 box.</para></entry></row>
 <row><entry valign="top"><para><guibutton>Install new theme</guibutton></para></entry>
-<entry valign="top"><para>Click on this button to install a new theme.</para></entry>
-</row>
+<entry valign="top"><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 add a theme to the list of available themes, click on the <guibutton>Install
+new theme</guibutton> button. A dialog is displayed. Enter the name 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><para>You can
+find many GTK themes on the Internet.</para></entry></row>
 <row><entry valign="top"><para><guibutton>Go to theme folder</guibutton></para></entry>
 <entry valign="top"><para>Click on this button to open a file manager window
 on the default theme folder.</para></entry></row>
@@ -767,91 +641,16 @@ on the default theme folder.</para></entry></row>
 </tgroup>
 </table>
 </sect1>
-<sect1 id="goscustuserinter-2">
-<title>Customizing Toolbars and Menus</title>
-<indexterm><primary>toolbars, customizing appearance</primary></indexterm>
-<indexterm><primary>preference tools</primary><secondary>Toolbars &amp; Menus
-</secondary></indexterm><indexterm><primary>menus</primary><secondary>in applications,
-customizing appearance</secondary></indexterm><para>You can use the <application>
-Toolbars &amp; Menus</application> preference tool to customize the appearance
-of menus, menubars, and toolbars for GNOME-compliant applications.</para>
-<figure id="goscustuserinter-FIG-6">
-<title>Settings for Toolbars and Menus</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_apps_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Toolbars and Menus preference tool. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustuserinter-TBL-8"/> lists the toolbar and menu settings
-that you can customize for GNOME-compliant applications.</para>
-<table frame="topbot" id="goscustuserinter-TBL-8">
-<title>Settings for Customizing Applications</title>
-<tgroup cols="2" colsep="1" rowsep="1">
-
-<colspec colname="COLSPEC0" colwidth="18.86*"/><colspec colname="COLSPEC1"
-colwidth="47.14*"/>
-<thead>
-<row><entry colsep="0" rowsep="1" valign="top"><para>Option</para></entry>
-<entry colsep="0" rowsep="1" valign="top"><para>Function</para></entry></row>
-</thead>
-<tbody>
-<row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Toolbars have</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
-rowsep="0" valign="top"><para>Choose one of the following options to specify
-what to display on the toolbars in your GNOME-compliant applications:</para><itemizedlist>
-<listitem><para><guilabel>Icons and Text</guilabel>: Select this option to
-display toolbars with text as well as an icon on each button. </para></listitem>
-<listitem><para><guilabel>Priority text only</guilabel>: Select this option
-to display toolbars with an icon only on each button, and with text on the
-most important buttons.</para></listitem>
-<listitem><para><guilabel>Icons only</guilabel>: Select this option to display
-toolbars with an icon only on each button.</para></listitem>
-</itemizedlist></entry></row>
-<row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Toolbars can be detached and moved around</guilabel></para></entry><entry
-colname="COLSPEC1" colsep="0" rowsep="0" valign="top"><para>Select this option
-if you want to move toolbars from application windows to any location on the
-desktop. If you select this option, handles are 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 on the desktop.</para></entry>
-</row>
-<row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Menu items have icons</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
-rowsep="0" valign="top"><para>Select this option to display an icon beside
-each item in a menu. Some menu items do not have an icon.</para></entry></row>
-</tbody>
-</tgroup>
-</table>
-</sect1>
 <sect1 id="goscustwindows-2">
 <title>Customizing Window Focus</title>
 <indexterm><primary>Metacity window manager</primary><see>window manager</see>
 </indexterm><indexterm><primary>window manager</primary><secondary>customizing
-</secondary></indexterm><para>Use the <application>Window Behavior</application>
-preference tool to customize window focus behavior for your desktop.</para>
-<figure id="goscustwindows-FIG-1">
-<title>Settings for Window Focus</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_metacity.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Window Focus preference tool. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustwindows-TBL-3"/> lists the window focus settings
-that you can customize.</para>
+</secondary></indexterm><indexterm><primary>preference tools</primary><secondary>
+Window Focus</secondary></indexterm><para>Use the <application>Window Focus
+</application> preference tool to specify the  to customize window focus behavior
+for your desktop.</para>
+<para><xref linkend="goscustwindows-TBL-3"/> lists the window focus
+settings that you can customize.</para>
 <table frame="topbot" id="goscustwindows-TBL-3">
 <title>Settings for Window Focus</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -873,8 +672,8 @@ to give focus</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
 rowsep="0"><para>Select this option to give focus to a window when you point
 to the window. The window retains focus until you point to another window.
 </para></entry></row>
-<row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>
-Raise window on focus</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>Raise
+window on focus</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
 rowsep="0"><para>Select this option if you want your windows to be raised
 when the windows receive focus.</para></entry></row>
 </tbody>
diff --git a/gnome2-user-guide/C/goscustlookandfeel-C.omf b/gnome2-user-guide/C/goscustlookandfeel-C.omf
index bc5f4bc..fcd342a 100644
--- a/gnome2-user-guide/C/goscustlookandfeel-C.omf
+++ b/gnome2-user-guide/C/goscustlookandfeel-C.omf
@@ -16,10 +16,10 @@
       Advanced Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Using the Advanced Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustlookandfeel-applications-C.omf b/gnome2-user-guide/C/goscustlookandfeel-applications-C.omf
index 7119183..a1737f8 100644
--- a/gnome2-user-guide/C/goscustlookandfeel-applications-C.omf
+++ b/gnome2-user-guide/C/goscustlookandfeel-applications-C.omf
@@ -16,10 +16,10 @@
       Advanced Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Applications|Desktop Preferences"/>
     <description>
       Using the Advanced Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustlookandfeel-preferences-C.omf b/gnome2-user-guide/C/goscustlookandfeel-preferences-C.omf
index 9c8c461..dcfd72b 100644
--- a/gnome2-user-guide/C/goscustlookandfeel-preferences-C.omf
+++ b/gnome2-user-guide/C/goscustlookandfeel-preferences-C.omf
@@ -16,10 +16,10 @@
       Advanced Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Preferences"/>
     <description>
       Using the Advanced Preference Tools chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goscustlookandfeel.xml b/gnome2-user-guide/C/goscustlookandfeel.xml
index 7214210..6fec049 100644
--- a/gnome2-user-guide/C/goscustlookandfeel.xml
+++ b/gnome2-user-guide/C/goscustlookandfeel.xml
@@ -8,10 +8,8 @@ you to customize the behavior and appearance of your applications, panels,
 and other user interface items. You can use the <guilabel>Advanced</guilabel>
 preference tools to configure file types, your default applications, and your
 panels. You can also use the <guilabel>Advanced</guilabel> tools to customize
-your sessions and startup programs. You can also use the <guilabel>Advanced
-</guilabel> tools to choose a theme for the desktop, and how to customize
-your application menubars and toolbars. This chapter describes how to use
-the <guilabel>Advanced</guilabel> tools to customize your desktop.</para></highlights>
+your sessions and startup programs. This chapter describes how to use the <guilabel>
+Advanced</guilabel> tools to customize your desktop.</para></highlights>
 <sect1 id="goscustlookandfeel-17">
 <title>Opening an Advanced Preference Tool</title>
 <para>You can open an <guilabel>Advanced</guilabel> preference tool in either
@@ -30,47 +28,88 @@ on the desktop background. The <guilabel>Start Here</guilabel> location is
 displayed. Double-click on the <guilabel>Preferences</guilabel> object in
 the <application>Nautilus</application> window, then double-click on the <guilabel>
 Advanced</guilabel> folder. The <guilabel>Advanced</guilabel> preference tools
-are displayed, as shown in the following figure: </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_advanced_window.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows the Desktop Preferences Advanced location in a Nautilus window. View pane contains CDDB, File Types and Programs, Panel, Preferred Applications, Session Properties and Startup Programs icons.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
+are displayed.</para>
+
 <para>Double-click on the tool that you require. The dialog for the tool is
 displayed.</para></listitem>
 </itemizedlist>
 </sect1>
+<sect1 id="goscustlookandfeel-39">
+<title>Configuring a CD Database</title>
+<indexterm><primary>preference tools</primary><secondary>CD Database</secondary>
+</indexterm><para>The <application>CD Database</application> preference tool
+enables you to configure a CD database that your system can query. A CD database
+contains information about CDs, such as the name of the artist, the title,
+and the track list. When an application plays a CD, the application can query
+the CD database about the CD, then display the information. </para>
+<para><xref linkend="goscustlookandfeel-TBL-40"/> describes the elements on
+the <application>CD Database</application> preference tool.</para>
+<table frame="topbot" id="goscustlookandfeel-TBL-40">
+<title>Settings for CD Database</title>
+<tgroup cols="2" colsep="1" rowsep="1">
+
+<colspec colname="COLSPEC0" colwidth="18.86*"/><colspec colname="COLSPEC1"
+colwidth="47.14*"/>
+<thead>
+<row><entry colsep="0" rowsep="1" valign="top"><para>Element</para></entry>
+<entry colsep="0" rowsep="1" valign="top"><para>Description</para></entry>
+</row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
+Send no info</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
+rowsep="0" valign="top"><para>Select this option if you do not want to send
+any information to the CD database server.</para></entry></row>
+<row><entry colsep="0" rowsep="0" valign="top"><para><guilabel>Send real info
+</guilabel></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
+Select this option to send your name and hostname information to the CD database
+server.</para></entry></row>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
+Send other info</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
+rowsep="0" valign="top"><para>Select this option to send another name and
+hostname to the CD database server. Enter the name in the <guilabel>Name</guilabel>
+field. Enter the hostname in the <guilabel>Hostname</guilabel> field.</para></entry>
+</row>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>FreeDB
+round robin server</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
+rowsep="0"><para>FreeDB is a CD database. The FreeDB round robin server is
+a load-sharing configuration of FreeDB servers. Select this option to access
+the FreeDB CD database from this server.</para></entry></row>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>Other
+FreeDB server</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
+rowsep="0"><para> Select this option to access the FreeDB CD database from
+another server. Select the server that you require from the server table.
+</para></entry></row>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guibutton>Update
+server list</guibutton></para></entry><entry colname="COLSPEC1" colsep="0"
+rowsep="0"><para>Click on this button to update the list of available FreeDB
+servers in the server table.</para></entry></row>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>Other
+server</guilabel></para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0"><para>
+Select this option to use another CD database. Enter the name of the server
+on which the database resides in the <guilabel>Hostname</guilabel> field.
+Enter the port number on which you can access the database in the <guilabel>
+Port</guilabel> field.</para></entry></row>
+</tbody>
+</tgroup>
+</table>
+</sect1>
 <sect1 id="goscustdoc-7">
 <title>Configuring File Types and Programs</title>
 <indexterm><primary>preference tools</primary><secondary>File Types and Programs
 </secondary></indexterm><indexterm><primary>file types</primary><secondary>
 configuring</secondary></indexterm><para>Use the <application>File Types and
 Programs</application> preference tool to specify how files of various types
-are created, displayed, and edited. For example, you can specify that if the
-MIME type of a file indicates that the file is an audio file, the desktop
-launches the file with an audio application.</para>
-<figure id="goscustdoc-FIG-5">
-<title>File Types and Programs Preference Tool</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_filesprograms_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows File Types and Programs preference tool. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdoc-TBL-8"/> describes the elements on the <application>
-File Types and Programs</application> preference tool.</para>
+are created, displayed, and edited. For example, you can specify that if a
+file is a plain text file, the desktop launchers the file in a text editor.
+</para>
+<para><application>Nautilus</application> and other GNOME applications check
+the contents of a file to determine the type of a file. If the first lines
+do not determine the type of the file, then the application checks the file
+extension.</para>
+<para><xref linkend="goscustdoc-TBL-8"/> describes the elements
+on the <application>File Types and Programs</application> preference tool.
+</para>
 <table frame="topbot" id="goscustdoc-TBL-8">
 <title>Elements on File Types and Programs Preference Tool</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -85,11 +124,11 @@ colwidth="47.14*"/>
 <tbody>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para>Table
 </para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0" valign="top"><para>
-To view the contents of a category of file types, click on right arrow next
-to the category name. The category expands, and displays a description of
-each file type, and the file extension that is associated with the file type. 
-</para><para>To select a file type that you want to work with, click on the
-file type.</para></entry></row>
+To view the contents of a category of file types, click on the right arrow
+next to the category name. The category expands, and displays a description
+of each file type, and the file extension that is associated with the file
+type. </para><para>To select a file type that you want to work with, click
+on the file type.</para></entry></row>
 <row><entry colsep="0" rowsep="0" valign="top"><para><guibutton>Add file type
 </guibutton></para></entry><entry colsep="0" rowsep="0" valign="top"><para>
 Click on this button to add a file type. For more information, see <xref linkend="goscustlookandfeel-28"/>.
@@ -106,9 +145,9 @@ valign="top"><indexterm><primary>file types</primary><secondary>editing</seconda
 select the item that you want to edit, then click <guibutton>Edit</guibutton>. 
 </para></entry></row>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guibutton>
-Remove</guibutton></para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0"
+Delete</guibutton></para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0"
 valign="top"><para>To delete a file type or a service, select the item that
-you want to remove, then click <guibutton>Remove</guibutton>. </para></entry>
+you want to delete, then click <guibutton>Delete</guibutton>. </para></entry>
 </row>
 </tbody>
 </tgroup>
@@ -126,11 +165,11 @@ tool.</para></listitem>
 <listitem><para>Click on the <guibutton>Add file type</guibutton> button.
 The <guilabel>Add file type</guilabel> dialog is displayed.</para></listitem>
 <listitem><para>Enter the properties of the file type in the dialog. The following
-table describes the dialog elements on the <guilabel>Add file type</guilabel>dialog:
-</para>
+table describes the dialog elements on the <guilabel>Add file type</guilabel>
+dialog:</para>
 <informaltable frame="topbot">
-<tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="37.42*"/><colspec
-colwidth="62.58*"/>
+<tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="37.42*"/>
+<colspec colname="COLSPEC1" colwidth="62.58*"/>
 <thead>
 <row rowsep="1"><entry valign="top"><para>Option</para></entry><entry valign="top"><para>
 Function</para></entry></row>
@@ -151,30 +190,28 @@ you choose an icon, click <guibutton>OK</guibutton>. </para></entry></row>
 <row><entry valign="top"><para><guilabel>Category</guilabel></para></entry>
 <entry valign="top"><para>Enter the category to which you want the file type
 to belong in the <application>File Types and Programs</application> preference
-tool.</para><para>Choose button</para></entry></row>
-<row><entry valign="top"><para><guilabel>Filename extensions</guilabel></para></entry>
+tool. Click on the <guibutton>Choose</guibutton> to choose a category from
+the <guilabel>Choose a file category</guilabel> dialog.</para></entry></row>
+<row><entry valign="top"><para><guilabel>Filename Extensions</guilabel></para></entry>
 <entry valign="top"><para>Enter the filename extensions to associate with
-the file type. Enter a filename extension in the upper field, then click on
-the <guibutton>Add</guibutton> button. To delete a filename extension, select
-the filename extension in the lower field, then click on the <guibutton>Remove
-</guibutton> button. </para></entry></row>
-<row><entry valign="top"><para><guilabel>Use category defaults</guilabel></para></entry>
-<entry valign="top"><para>Select this option to associate the application
-that is associated with the category, with the file type.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Viewing component</guilabel></para></entry>
+the file type. Enter a filename extension in the field on the left side, then
+click on the <guibutton>Add</guibutton> button. To delete a filename extension,
+select the filename extension in the field on the right side, then click on
+the <guibutton>Remove</guibutton> button. </para></entry></row>
+<row><entry valign="top"><para><guilabel>Viewer Component</guilabel></para></entry>
 <entry valign="top"><para>Information to be supplied in a future release.
 </para></entry></row>
 <row><entry valign="top"><para><guilabel>Default action</guilabel></para></entry>
 <entry valign="top"><para>Information to be supplied in a future release.
 </para></entry></row>
-<row><entry valign="top"><para><guilabel>Program to run</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Program to Run</guilabel></para></entry>
 <entry valign="top"><para>If you do not select the <guilabel>Use category
 defaults</guilabel> option, specify a program to associate with the file type.
 Enter the command to start the program in this field. Alternatively, to choose
  a command that you entered previously, click the down arrow button, then
 choose the command to run.</para><para>You can also use the <guibutton>Browse
 </guibutton> button to choose a command to run. </para></entry></row>
-<row><entry valign="top"><para><guilabel>Needs terminal</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Run in Terminal</guilabel></para></entry>
 <entry valign="top"><para>Select this option to run the program in a terminal
 window. Choose this option for a program that does not create a window in
 which to run.</para></entry></row>
@@ -188,7 +225,7 @@ which to run.</para></entry></row>
 <sect2 id="goscustlookandfeel-30">
 <title>To Add a Service</title>
 <indexterm><primary>services</primary><secondary>adding</secondary></indexterm>
-<para>To add a file type, perform the following steps:</para>
+<para>To add a service, perform the following steps:</para>
 <orderedlist>
 <listitem><para>Choose <menuchoice><guimenu>Applications</guimenu>
 <guisubmenu>Desktop Preferences</guisubmenu><guisubmenu>Advanced
@@ -198,8 +235,8 @@ tool.</para></listitem>
 <listitem><para>Click on the <guibutton>Add service</guibutton> button. The <guilabel>
 Add service</guilabel> dialog is displayed.</para></listitem>
 <listitem><para>Enter the properties of the service in the dialog. The following
-table describes the dialog elements on the <guilabel>Add service</guilabel>dialog:
-</para>
+table describes the dialog elements on the <guilabel>Add service</guilabel>
+dialog:</para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="41.22*"/>
 <colspec colname="COLSPEC1" colwidth="58.78*"/>
@@ -211,71 +248,19 @@ Function</para></entry></row>
 <row><entry valign="top"><para><guilabel>Description</guilabel></para></entry>
 <entry valign="top"><para>Type a description of the service.</para></entry>
 </row>
-<row><entry valign="top"><para><guilabel>Protocol name</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Protocol </guilabel></para></entry>
 <entry valign="top"><para>Enter the protocol for the service.</para></entry>
 </row>
-<row><entry colname="COLSPEC0"><para><guilabel>Program to run</guilabel> drop-down
-list box</para></entry><entry colname="COLSPEC1"><para>Information to be supplied
-in a future release.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><guilabel>Program to run</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>Information to be supplied in a future release.
+</para></entry></row>
 <row><entry valign="top"><para><guilabel>Program</guilabel></para></entry>
 <entry valign="top"><para>Specify the program to associate with the file type.
 Enter the command to start the program in this field. Alternatively, to choose
  a command that you entered previously, click the down arrow button, then
 choose the command to run.</para><para>You can also use the <guibutton>Browse
 </guibutton> button to choose a command to run. </para></entry></row>
-<row><entry valign="top"><para><guilabel>Needs terminal</guilabel></para></entry>
-<entry valign="top"><para>Select this option to run the program in a terminal
-window. Choose this option for a program that does not create a window in
-which to run.</para></entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-</listitem>
-<listitem><para>Click <guibutton>OK</guibutton>.</para></listitem>
-</orderedlist>
-</sect2>
-<sect2 id="goscustlookandfeel-29">
-<title>To Edit a File Type Category</title>
-<indexterm><primary>file type categories</primary><secondary>editing</secondary>
-</indexterm><para>To edit a file type category, perform the following steps:
-</para>
-<orderedlist>
-<listitem><para>Choose <menuchoice><guimenu>Applications</guimenu>
-<guisubmenu>Desktop Preferences</guisubmenu><guisubmenu>Advanced
-</guisubmenu><guimenuitem>File Types and Programs</guimenuitem></menuchoice>
-to start the <application>File Types and Programs</application> preference
-tool.</para></listitem>
-<listitem><para>Select the file type category that you want to edit. Click
-on the <guibutton>Edit</guibutton> button. The <guilabel>Edit file category
-</guilabel> dialog is displayed.</para></listitem>
-<listitem><para>Enter the properties of the service in the dialog. The following
-table describes the dialog elements on the <guilabel>Edit file category</guilabel>dialog:
-</para>
-<informaltable frame="topbot">
-<tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="38.26*"/><colspec
-colwidth="61.74*"/>
-<thead>
-<row rowsep="1"><entry valign="top"><para>Option</para></entry><entry valign="top"><para>
-Function</para></entry></row>
-</thead>
-<tbody>
-<row><entry valign="top"><para><guilabel>Name</guilabel></para></entry><entry
-valign="top"><para>The name of the service. You can not edit this text box.
-</para></entry></row>
-<row><entry valign="top"><para><guilabel>Use parent category defaults</guilabel></para></entry>
-<entry valign="top"><para>Select this option to associate the application
-that is associated with the parent category, with this category.</para></entry>
-</row>
-<row><entry valign="top"><para><guilabel>Default action</guilabel></para></entry>
-<entry valign="top"><para>Information to be supplied in a future release.
-</para></entry></row>
-<row><entry valign="top"><para><guilabel>Program to run</guilabel></para></entry>
-<entry valign="top"><para>Specify the program to associate with the file type
-category. Enter the command to start the program in this field. Alternatively,
-to choose  a command that you entered previously, click the down arrow button,
-then choose the command to run.</para><para>You can also use the <guibutton>
-Browse</guibutton> button to choose a command to run. </para></entry></row>
-<row><entry valign="top"><para><guilabel>Needs terminal</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Run in Terminal</guilabel></para></entry>
 <entry valign="top"><para>Select this option to run the program in a terminal
 window. Choose this option for a program that does not create a window in
 which to run.</para></entry></row>
@@ -295,33 +280,19 @@ and appearance</secondary></indexterm><para>The <application>Panel</application>
 preference tool enables you to configure the behavior of panels. Any changes
 that you make with the <application>Panel</application> preference tool affect
 all of the panels on your desktop.</para>
-<figure id="goscustlookandfeel-FIG-21">
-<title>Settings for Panels</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_panel.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Panel preference tool. Contains: Close drawer if a launcher inside it is pressed, Enable panel animation check boxes, Animation speed drop-down list box.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
 <table frame="topbot" id="goscustlookandfeel-TBL-22">
-<title>Table Caption</title>
+<title>Settings for Panels</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="50*"/><colspec colwidth="50*"/>
 <thead>
 <row rowsep="1"><entry valign="top"><para>Setting</para></entry><entry valign="top"><para>
 Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry valign="top"><para><guilabel>Close drawer if a launcher inside
-it is pressed</guilabel></para></entry><entry valign="top"><para>Select this
-option if you want a drawer on a panel to close when you choose a launcher
-in the drawer.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Enable panel animation</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Close drawer when launcher is clicked
+</guilabel></para></entry><entry valign="top"><para>Select this option if
+you want a drawer on a panel to close when you choose a launcher in the drawer.
+</para></entry></row>
+<row><entry valign="top"><para><guilabel>Animation</guilabel></para></entry>
 <entry valign="top"><para>Select this option if you want your panels to show
 and to hide in an animated style.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Animation speed</guilabel></para></entry>
@@ -338,9 +309,9 @@ drop-down list box.</para></entry></row>
 <see>preferred applications</see></indexterm><para>Use the <application>Preferred
 Applications</application> preference tool to specify the applications that
 you want the desktop to use when the desktop starts an application for you.
-For example, you can specify <application>xterm</application> as your preferred
+For example, you can specify <application>Xterm</application> as your preferred
 terminal application. When you open the <guimenu>Desktop Background</guimenu>
-menu then choose <guimenuitem>New Terminal</guimenuitem>, <application>xterm
+menu then choose <guimenuitem>New Terminal</guimenuitem>, <application>Xterm
 </application> starts.</para>
 <para>You can customize the settings for the <application>Preferred Applications
 </application> preference tool in the following functional areas.</para>
@@ -354,23 +325,12 @@ menu then choose <guimenuitem>New Terminal</guimenuitem>, <application>xterm
 <indexterm><primary>preferred applications</primary><secondary>web browser
 </secondary></indexterm><indexterm><primary>web browser, preferred application
 </primary></indexterm><para>Use the <application>Web Browser</application>
-tabbed section to configure your preferred web browser.</para>
-<figure>
-<title>Settings for Preferred Web Browser</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_defaultwbrowser_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferred Applications preference tool, Web Browser tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustlookandfeel-TBL-37"/> lists the preferred web browser
-settings that you can configure.</para>
+tabbed section to configure your preferred web browser. The preferred web
+browser opens when you click on a URL. For example, the preferred web browser
+opens when you select a URL in an application, or when you select a URL launcher
+on the desktop background.</para>
+<para><xref linkend="goscustlookandfeel-TBL-37"/> lists the preferred
+web browser settings that you can configure.</para>
 <table frame="topbot" id="goscustlookandfeel-TBL-37">
 <title>Settings for Preferred Web Browser</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -385,7 +345,7 @@ colwidth="47.14*"/>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>Select
 a Web Browser</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
 rowsep="0"><para>Select this option if you want to use a standard web browser.
-Use the drop-down combination box to specify your preferred web browser.</para></entry>
+Use the drop-down combination box to select your preferred web browser.</para></entry>
 </row>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>Custom
 Web Browser</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
@@ -393,8 +353,9 @@ rowsep="0"><para>Select this option if you want to use a custom web browser.
 </para></entry></row>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>Command
 </guilabel></para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0"><para>
-Enter the command to execute to start the custom web browser.</para></entry>
-</row>
+Enter the command to execute to start the custom web browser. To enable the
+browser to display a URL that you click on, include <command>&ldquo;%s&rdquo;
+</command> after the command.</para></entry></row>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guilabel>Start
 in Terminal</guilabel></para></entry><entry colname="COLSPEC1" colsep="0"
 rowsep="0"><para>Select this option to run the command in a terminal window.
@@ -410,22 +371,8 @@ run.</para></entry></row>
 </secondary></indexterm><indexterm><primary>text editor, preferred application
 </primary></indexterm><para>Use the <application>Text Editor</application>
 tabbed section to configure your preferred text editor.</para>
-<figure id="goscustdoc-FIG-8">
-<title>Settings for Preferred Text Editor</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_defaulteditor_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferred Applications preference tool, Text Editor tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustdoc-TBL-1"/> lists the preferred text editor settings
-that you can configure.</para>
+<para><xref linkend="goscustdoc-TBL-1"/> lists the preferred text
+editor settings that you can configure.</para>
 <table frame="topbot" id="goscustdoc-TBL-1">
 <title>Settings for Preferred Text Editor</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -449,10 +396,10 @@ Editor Properties</guilabel> dialog is displayed.</para><itemizedlist>
 editor.</para></listitem>
 <listitem><para><guilabel>Command</guilabel>: Enter the command to execute
 to start the custom text editor.</para></listitem>
-<listitem><para><guilabel>The application can open multiple files</guilabel>:
+<listitem><para><guilabel>This application can open multiple files</guilabel>:
 Select this option if the default text editor can open multiple files.</para>
 </listitem>
-<listitem><para><guilabel>The application needs to be run in a shell</guilabel>:
+<listitem><para><guilabel>This application needs to be run in a shell</guilabel>:
 Select this option to run the command in a terminal window. Select this option
 for an editor that does not create a window in which to run.</para></listitem>
 </itemizedlist></entry></row>
@@ -476,22 +423,8 @@ the file manager to start the custom text editor to display text files.</para></
 </indexterm><indexterm><primary>terminal, preferred application</primary>
 </indexterm><para>Use the <application>Terminal</application> tabbed section
 to configure your preferred terminal.</para>
-<figure>
-<title>Settings for Preferred Terminal</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_defaultterminal_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferred Applications preference tool, Terminal tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustlookandfeel-TBL-35"/> lists the preferred terminal
-settings that you can configure.</para>
+<para><xref linkend="goscustlookandfeel-TBL-35"/> lists the preferred
+terminal settings that you can configure.</para>
 <table frame="topbot" id="goscustlookandfeel-TBL-35">
 <title>Settings for Preferred Terminal</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -524,23 +457,22 @@ Enter the <command>exec</command> option to use with the command.</para></entry>
 </sect2>
 </sect1>
 <sect1 id="goscustsession-5">
-<title>Configuring Session Properties and Startup Applications</title>
-<indexterm><primary>preference tools</primary><secondary>Session Properties
-&amp; Startup Programs</secondary></indexterm><indexterm><primary>sessions
-</primary><secondary>customizing properties</secondary></indexterm><indexterm>
-<primary>startup programs</primary><secondary>customizing</secondary></indexterm>
-<para>The <application>Session Properties &amp; Startup Programs</application>
-preference tool enables you to manage your sessions. You can set session preferences,
-and specify which applications to start when you start a session. You can
-configure sessions to save the state of applications on your desktop, and
-to restore the state when you start another session. You can also use this
-preference tool to manage multiple GNOME sessions.</para>
+<title>Configuring Sessions</title>
+<indexterm><primary>preference tools</primary><secondary>Sessions</secondary>
+</indexterm><indexterm><primary>sessions</primary><secondary>customizing properties
+</secondary></indexterm><indexterm><primary>startup applications</primary>
+<secondary>customizing</secondary></indexterm><para>The <application>Sessions
+</application> preference tool enables you to manage your sessions. You can
+set session preferences, and specify which applications to start when you
+start a session. You can configure sessions to save the state of applications
+on your desktop, and to restore the state when you start another session.
+You can also use this preference tool to manage multiple GNOME sessions.</para>
 <para>You can customize the settings for sessions and startup applications
 in the following functional areas:</para>
 <itemizedlist>
 <listitem><para><guilabel>Session Options</guilabel></para></listitem>
-<listitem><para><guilabel>Startup Programs</guilabel></para></listitem>
 <listitem><para><guilabel>Current Session</guilabel></para></listitem>
+<listitem><para><guilabel>Startup Programs</guilabel></para></listitem>
 </itemizedlist>
 <sect2 id="goscustsession-16">
 <title>Setting Session Options</title>
@@ -548,22 +480,8 @@ in the following functional areas:</para>
 </indexterm><para>Use the <guilabel>Session Options</guilabel> tabbed section
 to manage multiple sessions, and to set preferences for the current session.
 </para>
-<figure id="goscustsession-FIG-9">
-<title>Settings for Session Options</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_session_options.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Session preference tool, Session Options tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustsession-TBL-11"/> lists the session options settings
-that you can configure.</para>
+<para><xref linkend="goscustsession-TBL-11"/> lists the session
+options settings that you can configure.</para>
 <table frame="topbot" id="goscustsession-TBL-11">
 <title>Settings for Session Options</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -595,87 +513,23 @@ the saved settings.</para><para> If you do not select this option, when you
 end you session the <guilabel>Logout Confirmation</guilabel> dialog displays
 a <guilabel>Save current setup</guilabel> option.</para></entry></row>
 <row><entry colname="COLSPEC0" colsep="0" rowsep="0" valign="top"><para><guilabel>
-Choose Current Session</guilabel></para></entry><entry colname="COLSPEC1"
-colsep="0" rowsep="0" valign="top"><para>Use this area of the dialog to manage
-multiple sessions on the desktop, as follows:</para><itemizedlist>
+Sessions</guilabel></para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0"
+valign="top"><para>Use this area of the dialog to manage multiple sessions
+on the desktop, as follows:</para><itemizedlist>
 <listitem><para>To create a new session, click on the <guibutton>Add</guibutton>
 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>
-button . The <guilabel>Edit session name</guilabel> dialog is displayed. Type
+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>
 button.</para></listitem>
-</itemizedlist></entry></row>
-</tbody>
-</tgroup>
-</table>
-</sect2>
-<sect2 id="goscustsession-12">
-<title>Configuring Startup Applications</title>
-<indexterm><primary>startup applications</primary><secondary>non-session-managed
-</secondary></indexterm><para>Use the <guilabel>Startup Programs</guilabel>
-tabbed section of the <application>Session Properties &amp; Startup Programs
-</application> preference tool to specify non-session-managed <glossterm>
-startup applications</glossterm>. Startup applications are applications that
-start automatically when you start a session. You specify the commands that
-run the non-session-managed applications in the <guilabel>Startup Programs
-</guilabel> tabbed section. The commands execute automatically when you log
-in.</para>
-<para>You can also start session-managed applications automatically. For more
-information, <xref linkend="goscustsession-16"/>.</para>
-<figure id="goscustsession-FIG-13">
-<title>Settings for Startup Programs</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_session_startupprogs.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Session preference tool, Startup Programs tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="goscustsession-TBL-19"/> lists the startup applications
-settings that you can configure.</para>
-<table frame="topbot" id="goscustsession-TBL-19">
-<title>Settings for Startup Programs</title>
-<tgroup cols="2">
-
-<colspec colname="col1" colwidth="18.86*"/><colspec colname="col2" colwidth="47.14*"/>
-<thead>
-<row><entry colname="col1" colsep="0" valign="top"><para>Option</para></entry>
-<entry colname="col2" colsep="0" valign="top"><para>Function</para></entry>
-</row>
-</thead>
-<tbody>
-<row><entry colname="col1" colsep="0" rowsep="0" valign="top"><para><guilabel>
- Non-session-managed Startup Programs</guilabel></para></entry><entry colname="col2"
-colsep="0" rowsep="0" valign="top"><para>Use this area of the dialog to manage
-non-session-managed startup applications as follows:</para><itemizedlist>
-<listitem><para>To add a startup application, click on the <guibutton>Add
-</guibutton> button. The <guilabel>Add Startup Program</guilabel> dialog is
-displayed. Enter the command to start the application in the <guilabel>Startup
-Command</guilabel> field. Alternatively, you can use the <guibutton>Browse
-</guibutton> button to choose a command to run. You can also use the <guibutton>
-Browse</guibutton> button to choose a file to append to the command line.
-For example, you can enter <application>emacs</application> on the command
-line, then choose a file to edit. </para>
-<para>If you specify more than one startup application, use the <guilabel>
-Priority</guilabel> spin box to specify the startup order of the each application.
-The startup order is the order in which you want the startup applications
-to start.</para></listitem>
-<listitem><para>To edit a startup application, select the startup application,
-then click on the <guibutton>Edit</guibutton> button. The <guilabel>Edit Startup
-Program</guilabel> dialog is displayed. Use the dialog to modify the command
-and the startup order for the startup application.</para></listitem>
-<listitem><para>To delete a startup application, select the startup application,
-then click on the <guilabel>Delete</guilabel> button.</para></listitem>
-</itemizedlist></entry></row>
+</itemizedlist>
+<para>When you log in on GDM, you choose a session. When you choose a session,
+you can select which of the multiple sessions to use.</para>
+</entry></row>
 </tbody>
 </tgroup>
 </table>
@@ -688,22 +542,8 @@ setting properties</secondary></indexterm><para>Use the <guilabel>Current
 Session</guilabel> tabbed section to specify startup order values, and to
 choose restart styles for the session-managed applications in your current
 session. </para>
-<figure id="goscustlookandfeel-FIG-38">
-<title>Session Properties</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/cc_currentsession.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Session Properties and Startup Programs, Current Session tabbed section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="sessprop01"/> lists the session properties that you can
-configure. </para>
+<para><xref linkend="sessprop01"/> lists the session properties
+that you can configure. </para>
 <table frame="topbot" id="sessprop01">
 <title>Session Properties</title>
 <tgroup cols="2" colsep="1" rowsep="1">
@@ -730,13 +570,13 @@ style of an application. To select a restart style for an application, select
 the application in the table, then choose one of the following styles:</para><itemizedlist>
 <listitem><para><guilabel>Normal</guilabel></para>
 <para>Starts automatically when you start a GNOME session. Use the <command>
-kill</command> command to close applications with this restart style during
+kill</command> command to terminate applications with this restart style during
 a session.</para></listitem>
 <listitem><para><guilabel>Respawn</guilabel></para>
-<para>Restarts automatically whenever you close or kill the applications.
-Choose this style for a program if the program must run continuously during
-your  session. To kill an application with this restart style, select the
-application in the table, then click on the <guibutton>Remove</guibutton>
+<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></listitem>
 <listitem><para><guilabel>Trash</guilabel></para>
 <para>Does not start when you start a GNOME session.</para></listitem>
@@ -749,13 +589,69 @@ for GNOME and session-managed applications.</para></listitem>
 Remove</guibutton></para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0"
 valign="top"><para>Click on the <guibutton>Remove</guibutton> button to delete
 the selected application from the list. The application is removed from the
-session manager,  and closed. Deleted applications are not started the next
-time that you start a session.</para></entry></row>
+session manager,  and closed. Application that you delete are not started
+the next time that you start a session.</para></entry></row>
+<row><entry colname="COLSPEC0" colsep="0" rowsep="0"><para><guibutton>Apply
+</guibutton></para></entry><entry colname="COLSPEC1" colsep="0" rowsep="0"><para>
+Click on the <guibutton>Apply</guibutton> button to apply changes to the startup
+order and the restart style.</para></entry></row>
 </tbody>
 </tgroup>
 </table>
 </sect2>
-</sect1>
+<sect2 id="goscustsession-12">
+<title>Configuring Startup Applications</title>
+<indexterm><primary>startup applications</primary><secondary>non-session-managed
+</secondary></indexterm><para>Use the <guilabel>Startup Programs</guilabel>
+tabbed section of the <application>Session Properties &amp; Startup Programs
+</application> preference tool to specify non-session-managed <glossterm>
+startup applications</glossterm>. Startup applications are applications that
+start automatically when you start a session. You specify the commands that
+run the non-session-managed applications in the <guilabel>Startup Programs
+</guilabel> tabbed section. The commands execute automatically when you log
+in.</para>
+<para>You can also start session-managed applications automatically. For more
+information, <xref linkend="goscustsession-16"/>.</para>
+<para><xref linkend="goscustsession-TBL-19"/> lists the startup
+applications settings that you can configure.</para>
+<table frame="topbot" id="goscustsession-TBL-19">
+<title>Settings for Startup Programs</title>
+<tgroup cols="2">
 
+<colspec colname="col1" colwidth="18.86*"/><colspec colname="col2" colwidth="47.14*"/>
+<thead>
+<row><entry colname="col1" colsep="0" valign="top"><para>Option</para></entry>
+<entry colname="col2" colsep="0" valign="top"><para>Function</para></entry>
+</row>
+</thead>
+<tbody>
+<row><entry colname="col1" colsep="0" rowsep="0" valign="top"><para><guilabel>
+ Additional startup programs</guilabel></para></entry><entry colname="col2"
+colsep="0" rowsep="0" valign="top"><para>Use this table to manage non-session-managed
+startup applications as follows:</para><itemizedlist>
+<listitem><para>To add a startup application, click on the <guibutton>Add
+</guibutton> button. The <guilabel>Add Startup Program</guilabel> dialog is
+displayed. Enter the command to start the application in the <guilabel>Startup
+Command</guilabel> field. Alternatively, you can use the <guibutton>Browse
+</guibutton> button to choose a command to run. You can also use the <guibutton>
+Browse</guibutton> button to choose a file to append to the command line.
+For example, you can enter <command>emacs</command> on the command line, then
+choose a file to edit. </para>
+<para>If you specify more than one startup application, use the <guilabel>
+Priority</guilabel> spin box to specify the startup order of the each application.
+The startup order is the order in which you want the startup applications
+to start.</para></listitem>
+<listitem><para>To edit a startup application, select the startup application,
+then click on the <guibutton>Edit</guibutton> button. The <guilabel>Edit Startup
+Program</guilabel> dialog is displayed. Use the dialog to modify the command
+and the startup order for the startup application.</para></listitem>
+<listitem><para>To delete a startup application, select the startup application,
+then click on the <guilabel>Delete</guilabel> button.</para></listitem>
+</itemizedlist></entry></row>
+</tbody>
+</tgroup>
+</table>
+</sect2>
+</sect1>
 </chapter>
 
diff --git a/gnome2-user-guide/C/gosdeskback-C.omf b/gnome2-user-guide/C/gosdeskback-C.omf
index d415459..f2cad36 100644
--- a/gnome2-user-guide/C/gosdeskback-C.omf
+++ b/gnome2-user-guide/C/gosdeskback-C.omf
@@ -16,10 +16,10 @@
       Desktop Background
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Using the Desktop Background chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/gosdeskback.xml b/gnome2-user-guide/C/gosdeskback.xml
index c36aaf4..daab51a 100644
--- a/gnome2-user-guide/C/gosdeskback.xml
+++ b/gnome2-user-guide/C/gosdeskback.xml
@@ -20,10 +20,10 @@ background:</para>
 <listitem><para>Start your applications, and open your files and folders. 
 </para>
 <para>You can add desktop background objects for convenient access to files,
-folders, and applications that you use frequently. For example, you can create
-a symbolic link to a file that you use often, then add this link to your desktop
-background. You can also store files and folders on the desktop background.
-</para></listitem>
+folders, and applications that you use frequently. For example, you can add
+an application launcher to the desktop background. You can create a symbolic
+link to a file that you use often, then add this link to your desktop background.
+You can also store files and folders on the desktop background.</para></listitem>
 <listitem><para>Open the <guimenu>Desktop Background</guimenu> menu.</para>
 <para>Right-click on the desktop background to open the <guimenu>Desktop Background
 </guimenu> menu. You can use the <guimenu>Desktop Background</guimenu> menu
@@ -35,24 +35,10 @@ Trash</guilabel>.</para></listitem>
 <para>You can customize the pattern or color of the desktop background.</para>
 </listitem>
 </itemizedlist>
-<para>By default, your desktop background contains three objects. <xref linkend="gosdeskback-fig-12"/>
+<para>By default, your desktop background contains three objects. The following figure 
 shows the desktop background with the default objects.</para>
-<figure id="gosdeskback-fig-12">
-<title>Desktop Background with Default Objects</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_desktop.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows desktop with default desktop background objects.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</figure>
-<para><xref linkend="gosdeskback-tbl-84"/> describes the functions of the default
-objects on the desktop background.</para>
+<para><xref linkend="gosdeskback-tbl-84"/> describes the functions
+of the default objects on the desktop background.</para>
 <table frame="topbot" id="gosdeskback-tbl-84">
 <title>Functions of Default Desktop Background Objects</title>
 <tgroup cols="3" colsep="0" rowsep="0"><colspec colname="colspec2" colwidth="35.94*"/>
@@ -75,7 +61,7 @@ Shows Nautilus home location icon.</phrase>
   </textobject>
 </mediaobject>
 </screenshot></entry><entry valign="top"><para><guilabel>
-Home</guilabel> location</para></entry><entry valign="top"><para>Opens a <application>
+Home</guilabel></para></entry><entry valign="top"><para>Opens a <application>
 Nautilus</application> window, and displays your home location in the view
 pane.</para></entry></row>
 <row><entry colname="colspec2" valign="top"><screenshot>
@@ -91,8 +77,7 @@ Shows Nautilus Start Here icon.</phrase>
 </screenshot></entry><entry colname="colspec0"
 valign="top"><para><guilabel>Start Here</guilabel></para></entry><entry colname="colspec1"
 valign="top"><para>Provides an access point to some of the key features of
-the GNOME desktop. For more information, see <xref linkend="gosnautilus-445"/>.
-</para></entry></row>
+the GNOME desktop. </para></entry></row>
 <row><entry colname="colspec2" valign="top"><screenshot>
 <mediaobject>
   <imageobject>
@@ -142,11 +127,11 @@ manages the desktop background perform the following steps:</para>
 </application> window is displayed. </para></listitem>
 <listitem><para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
 Preferences</guimenuitem></menuchoice>. A <guilabel>Preferences</guilabel>
-dialog is displayed. Choose <guilabel>Windows &amp; Desktop</guilabel> from
+dialog is displayed. Choose <guilabel>Desktop &amp; Trash</guilabel> from
 the <guilabel>Preferences</guilabel> dialog.</para></listitem>
 <listitem><para>Select the <guilabel>Use Nautilus to draw the desktop</guilabel>
 option.</para></listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to close the dialog.</para>
+<listitem><para>Click <guibutton>Close</guibutton> to close the dialog.</para>
 </listitem>
 </orderedlist>
 <para>To set up <application>Nautilus</application> so that <application>
@@ -172,15 +157,13 @@ objects</secondary></indexterm><para>A desktop background object is an icon
 on your desktop background that you can use to open your files, folders, and
 applications. All objects on your desktop background reside in the desktop
 background directory. When you move objects to the desktop background, the
-objects are moved to this directory. By default, the desktop background directory
-is <filename>/.nautilus/desktop</filename>. You can also use your home directory
-as the desktop background directory. For more information, see <xref linkend="gosnautilus-55"/>.
-</para>
+objects are moved to this directory. You can also use your home directory
+as the desktop background directory. </para>
 <para>By default, your desktop background contains three objects. You can
 also add objects to your desktop background to provide convenient access to
 files, folders, and applications that you use frequently. For example, you
-can add a symbolic link to your desktop background to enable you to open a
-particular folder that you use often. </para>
+can add a launcher to your desktop background to enable you to open a particular
+application that you use often. </para>
 <para><xref linkend="gosdeskback-tbl-86"/> describes the types of object that
 you can add to your desktop.</para>
 <table frame="topbot" id="gosdeskback-tbl-86">
@@ -199,14 +182,13 @@ the file or folder that the symbolic link points to is opened. You can move
 or copy a symbolic link to the desktop background.</para><para>You can identify
 symbolic links by the default arrow emblem that appears on all symbolic links.
 </para></entry></row>
-<row><entry colname="colspec0" valign="top"><para>Nautilus link</para></entry>
-<entry valign="top"><para>A Nautilus link is a file that contains the following
-information:</para><itemizedlist>
-<listitem><para>A command to run when the object is chosen.</para></listitem>
-<listitem><para>An icon that represents the object.</para></listitem>
-</itemizedlist><para>When you choose a Nautilus link from the desktop background,
-the command specified in the Nautilus link file is executed.</para></entry>
-</row>
+<row><entry colname="colspec0" valign="top"><para>Launcher</para></entry>
+<entry valign="top"><para>You can add the following types of launcher to the
+desktop background:</para><itemizedlist>
+<listitem><para>Application: Starts a particular application.</para></listitem>
+<listitem><para>Link: Links to  a particular file, folder, or URL.</para>
+</listitem>
+</itemizedlist></entry></row>
 <row><entry colname="colspec0" valign="top"><para>File</para></entry><entry
 valign="top"><para>You can add files to your desktop background. Files on
 your desktop background reside in your desktop background directory. </para></entry>
@@ -228,8 +210,6 @@ on your desktop background reside in your desktop background directory.</para></
 <listitem><para>Resize the icon that represents the object.</para></listitem>
 <listitem><para>Add an emblem to the object.</para></listitem>
 </itemizedlist>
-<para>For more information on how to modify desktop background objects, see <xref
-linkend="gosnautilus-1"/>.</para>
 <para>The following sections describe how to work with objects on the desktop
 background.</para>
 <sect2 id="gosdeskback-30">
@@ -237,15 +217,15 @@ background.</para>
 <indexterm><primary>desktop background</primary><secondary>selecting objects
 </secondary></indexterm><indexterm><primary>desktop background objects</primary>
 <secondary>selecting</secondary></indexterm><para>To select an object on the
-desktop background, click on the object. To select multiple objects, press <keycap>
+desktop background, click on the object. To select multiple objects, press-and-hold <keycap>
 Ctrl</keycap>, then click on the objects that you want to select.</para>
 <para>You can also select an area on the desktop background to select all
 objects within that area. Click-and-hold on the desktop background, then drag
 over the area that contains the objects that you want to select. When you
-click-and-hold on the desktop background and drag, a grey rectangle appears
-to mark the area that you select.</para>
-<para>To select multiple areas, press <keycap>Ctrl</keycap>, then drag over
-the areas that you want to select. </para>
+click-and-hold then drag, a grey rectangle appears to mark the area that you
+select.</para>
+<para>To select multiple areas, press-and-hold <keycap>Ctrl</keycap>, then
+drag over the areas that you want to select. </para>
 </sect2>
 <sect2 id="gosdeskback-29">
 <title>To Open an Object from the Desktop Background</title>
@@ -268,12 +248,56 @@ Programs</application> desktop preference tool:</para>
 <itemizedlist>
 <listitem><para><guilabel>Default action</guilabel> drop-down list box in
 the <guilabel>Edit file type</guilabel> dialog</para></listitem>
-<listitem><para><guilabel>Viewing component</guilabel> drop-down list box
-in the <guilabel>Edit file type</guilabel> dialog</para></listitem>
+<listitem><para><guilabel>Viewer Component</guilabel> drop-down list box in
+the <guilabel>Edit file type</guilabel> dialog</para></listitem>
 </itemizedlist>
 <para>You can set your preferences in a <application>Nautilus</application>
 window so that you click once on a file to execute the default action.</para>
 </sect2>
+<sect2 id="gosdeskback-3">
+<title>To Add a Launcher to the Desktop Background</title>
+<indexterm><primary>desktop background</primary><secondary>adding launchers
+</secondary></indexterm><indexterm><primary>desktop background objects</primary>
+<secondary>launchers</secondary></indexterm><para>A desktop background launcher
+can start an application or link to  a particular file, folder, or FTP site.
+</para>
+<para>To add a launcher to your desktop background, perform the following
+steps:</para>
+<orderedlist>
+<listitem><para>Right-click on the desktop background, then choose <guimenuitem>
+New Launcher</guimenuitem>. A <guilabel>Create Launcher</guilabel> dialog
+is displayed.</para></listitem>
+<listitem><para>For information on how to enter the properties of the launcher
+in the <guilabel>Create Launcher</guilabel> dialog, see the panels chapter.
+</para>
+<para>The command that you enter for the launcher is the command that is executed
+when you use the desktop background object. The following table shows some
+sample commands and the actions that the commands perform.</para>
+<informaltable frame="topbot">
+<tgroup cols="2" colsep="0" rowsep="0"><colspec colname="colspec0" colwidth="47.36*"/>
+<colspec colname="colspec1" colwidth="52.64*"/>
+<thead>
+<row rowsep="1"><entry valign="top"><para>Sample Command</para></entry><entry
+valign="top"><para>Action</para></entry></row>
+</thead>
+<tbody>
+<row><entry colname="colspec0" valign="top"><para><command>gedit</command></para></entry>
+<entry colname="colspec1" valign="top"><para>Starts the <application>gedit
+</application> application.</para></entry></row>
+<row><entry valign="top"><para><command>gedit /user123/loremipsum.txt</command></para></entry>
+<entry valign="top"><para>Opens the file <filename>/user123/loremipsum.txt
+</filename> in the <application>gedit</application> application.</para></entry>
+</row>
+<row><entry colname="colspec0" valign="top"><para><command>nautilus /user123/Projects
+</command></para></entry><entry colname="colspec1" valign="top"><para>Opens
+the folder <filename>/user123/Projects</filename> in a <application>Nautilus
+</application> window.</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</listitem>
+</orderedlist>
+</sect2>
 <sect2 id="gosdeskback-20">
 <title>To Add a Symbolic Link to the Desktop Background</title>
 <indexterm><primary>desktop background</primary><secondary>adding symbolic
@@ -295,7 +319,7 @@ steps:</para>
 symbolic link in a <application>Nautilus</application> window.</para></listitem>
 <listitem><para>Create a symbolic link to the file or folder. To create a
 symbolic link to a file or folder, select the file or folder to which you
-want to create a link. Choose <menuchoice><guimenu>File</guimenu>
+want to create a link. Choose <menuchoice><guimenu>Edit</guimenu>
 <guimenuitem>Make Link</guimenuitem></menuchoice>. A link to the file or folder
 is added to the current folder. You can identify symbolic links by the default
 arrow emblem that appears on all symbolic links. The following figure shows
@@ -316,53 +340,6 @@ a symbolic link to a file:</para>
 for the object is moved to the desktop background. </para></listitem>
 </orderedlist>
 </sect2>
-<sect2 id="gosdeskback-3">
-<title>To Add a Nautilus Link to the Desktop Background</title>
-<indexterm><primary>desktop background</primary><secondary>adding Nautilus
-links</secondary></indexterm><indexterm><primary>desktop background objects
-</primary><secondary>Nautilus links</secondary></indexterm><para>When you
-choose a Nautilus link on the desktop background, the command in the Nautilus
-link file is executed. To add a Nautilus link to your desktop background,
-you must first create an application launcher for the object in a menu.</para>
-<para>To add a Nautilus link to your desktop background, perform the following
-steps:</para>
-<orderedlist>
-<listitem><para>Create an application launcher in a menu for the object that
-you want to add to your desktop background. The command that you enter for
-the launcher is the command that is executed when you use the desktop background
-object. The following table shows some sample commands and the actions that
-the commands perform.</para>
-<informaltable frame="topbot">
-<tgroup cols="2" colsep="0" rowsep="0"><colspec colname="colspec0" colwidth="47.36*"/>
-<colspec colname="colspec1" colwidth="52.64*"/>
-<thead>
-<row rowsep="1"><entry valign="top"><para>Sample Command</para></entry><entry
-valign="top"><para>Action</para></entry></row>
-</thead>
-<tbody>
-<row><entry colname="colspec0" valign="top"><para><command>gedit</command></para></entry>
-<entry colname="colspec1" valign="top"><para>Starts the <application>gedit
-</application> application.</para></entry></row>
-<row><entry valign="top"><para><command>gedit /user123/loremipsum.txt</command></para></entry>
-<entry valign="top"><para>Opens the file <filename>/user123/loremipsum.txt
-</filename> in the <application>gedit</application> application.</para></entry>
-</row>
-<row><entry colname="colspec0" valign="top"><para><command>nautilus /user123/Personal
-</command></para></entry><entry colname="colspec1" valign="top"><para>Opens
-the folder <filename>/user123/Personal</filename> in a <application>Nautilus
-</application> window.</para></entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-<para>For more information on how to add launchers to menus, see <xref linkend="goseditmainmenu-1"/>.
-</para></listitem>
-<listitem><para>Drag the launcher from the menu to the desktop background.
-An icon for the object is added to the desktop background. </para>
-<para>If you want, you can remove the menu item that you created in step 1.
-</para></listitem>
-</orderedlist>
-
-</sect2>
 <sect2 id="gosdeskback-16">
 <title>Adding a File or Folder to the Desktop Background</title>
 <indexterm><primary>desktop background</primary><secondary>adding a file or
@@ -386,14 +363,11 @@ to move.</para></listitem>
 for the file or folder is moved to the desktop background. The file or folder
 is moved to your desktop background directory.</para>
 <para>Alternatively, select the file or folder, then choose <menuchoice><guimenu>
-File</guimenu><guimenuitem>Cut Files</guimenuitem></menuchoice>. Right-click
+Edit</guimenu><guimenuitem>Cut Files</guimenuitem></menuchoice>. Right-click
 on any desktop background object, then choose <guimenuitem>Paste Files</guimenuitem>.
 </para></listitem>
 </orderedlist>
 
-<para>What about Cut, Copy and Paste solely in reference to the desktop background.
-Eg, to create a copy of a file by copying it from the desktop background,
-then pasting it?</para>
 </sect3>
 <sect3 id="gosdeskback-17">
 <title>To Copy a File or Folder to the Desktop Background</title>
@@ -407,12 +381,12 @@ copy a file or folder to the desktop background, perform the following steps:
 </listitem>
 <listitem><para>In the view pane, display the file or folder that you want
 to move.</para></listitem>
-<listitem><para>Press <keycap>Ctrl</keycap>, then drag the file or folder
-to the desktop background. An icon for the file or folder is added to the
-desktop background. The file or folder is copied to your desktop background
+<listitem><para>Press-and-hold <keycap>Ctrl</keycap>, then drag the file or
+folder to the desktop background. An icon for the file or folder is added
+to the desktop background. The file or folder is copied to your desktop background
 directory.</para>
 <para>Alternatively, select the file or folder, then choose <menuchoice><guimenu>
-File</guimenu><guimenuitem>Copy Files</guimenuitem></menuchoice>.
+Edit</guimenu><guimenuitem>Copy Files</guimenuitem></menuchoice>.
 Right-click on any desktop background object, then choose <guimenuitem>Paste
 Files</guimenuitem>.</para></listitem>
 </orderedlist>
@@ -447,8 +421,7 @@ Trash</guilabel>, but is immediately deleted from the desktop background.
 The <guimenuitem>Delete</guimenuitem> menu item is only available if you select
 the <guilabel>Include a Delete command that bypasses Trash</guilabel> option
 in the <application>Nautilus</application> <guilabel>Preferences</guilabel>
-dialog. For more information on this option, see <xref linkend="gosnautilus-55"/>.
-</para>
+dialog. </para>
 <para>To delete an object from the desktop background right-click on the object,
 then choose <guimenuitem>Delete</guimenuitem>. </para>
 </sect2>
@@ -491,9 +464,9 @@ ways:</para>
 background. The contents of <guilabel>Trash</guilabel> are displayed in a <application>
 Nautilus</application> window.</para></listitem>
 <listitem><para>From a <application>Nautilus</application> window</para>
-<para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Show
-Trash</guimenuitem></menuchoice>. The contents of <guilabel>Trash</guilabel>
-are displayed in the window.</para></listitem>
+<para>Choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Trash</guimenuitem>
+</menuchoice>. The contents of <guilabel>Trash</guilabel> are displayed in
+the window.</para></listitem>
 </itemizedlist>
 </sect2>
 <sect2 id="gosdeskback-10">
@@ -515,8 +488,8 @@ Trash</guimenuitem></menuchoice>.</para></listitem>
 <title>Using the Desktop Background Menu</title>
 <indexterm><primary>desktop background</primary><secondary>using Desktop Background
 menu</secondary></indexterm><indexterm><primary>Desktop Background menu</primary>
-<secondary>description</secondary></indexterm><para>You can open the following
-menus from the desktop background:</para>
+<secondary>description</secondary></indexterm><indexterm><primary>menus</primary>
+<secondary>Desktop Background menu</secondary></indexterm>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -554,17 +527,23 @@ in your desktop background directory.</para></entry></row>
 <row><entry colname="colspec0" valign="top"><para><guimenuitem>New Terminal
 </guimenuitem></para></entry><entry colname="colspec1" valign="top"><para>
 Starts a <application>GNOME Terminal</application>.</para></entry></row>
+<row><entry colname="colspec0"><para><guimenuitem>New Launcher</guimenuitem></para></entry>
+<entry colname="colspec1"><para>Creates a launcher on your desktop background.
+For more information, see <xref linkend="gosdeskback-3"/>.</para></entry></row>
+<row><entry colname="colspec0"><para><guisubmenu>Scripts</guisubmenu></para></entry>
+<entry colname="colspec1"><para>Opens a submenu of scripts that you can run.
+</para></entry></row>
 <row><entry colname="colspec0" valign="top"><para><guimenuitem>Clean Up By
 Name</guimenuitem></para></entry><entry colname="colspec1" valign="top"><para>
 Arranges the objects on the desktop background alphabetically by name.</para></entry>
 </row>
 <row><entry colname="colspec0"><para><guimenuitem>Cut Files</guimenuitem></para></entry>
 <entry colname="colspec1"><para>Deletes the selected file or files from the
-folder or desktop background and places the file or files in buffer.</para></entry>
+folder or desktop background, and places the file or files in buffer.</para></entry>
 </row>
 <row><entry colname="colspec0"><para><guimenuitem>Copy Files</guimenuitem></para></entry>
 <entry colname="colspec1"><para>Copies the selected file or files from the
-folder or desktop background and places the file or files in buffer.</para></entry>
+folder or desktop background, and places the file or files in buffer.</para></entry>
 </row>
 <row><entry colname="colspec0"><para><guimenuitem>Paste Files</guimenuitem></para></entry>
 <entry colname="colspec1"><para>Puts the file or files in the buffer into
@@ -572,15 +551,15 @@ the selected folder or the desktop background.</para></entry></row>
 <row><entry colname="colspec0" valign="top"><para><guimenuitem>Disks</guimenuitem></para></entry>
 <entry colname="colspec1" valign="top"><para>Enables you to mount diskettes
 and CD-ROMs.</para></entry></row>
+<row><entry colname="colspec0"><para><guimenuitem>Change Desktop Background
+</guimenuitem></para></entry><entry colname="colspec1"><para>Starts the <application>
+Background</application> desktop preference tool to enable you to change the
+desktop background.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Use Default Background </guimenuitem></para></entry>
 <entry valign="top"><para>Resets the desktop background to the last pattern
 that you chose from the <guilabel>Backgrounds and Emblems</guilabel> dialog.
 You can access the <guilabel>Backgrounds and Emblems</guilabel> dialog from <application>
 Nautilus</application> windows.</para></entry></row>
-<row><entry valign="top"><para><guimenuitem>Change Desktop Background</guimenuitem></para></entry>
-<entry valign="top"><para>Starts the <application>Background</application>
-desktop preference tool to enable you to change the desktop background.</para></entry>
-</row>
 </tbody>
 </tgroup>
 </table>
@@ -608,11 +587,10 @@ opposite edge of the screen.</para>
 panel on the screen edge. If there is an edge panel on the screen edge, you
 must hide the panel before you drag the color.</para></listitem>
 <listitem><para>Use the <application>Background</application> desktop preference
-tool. For more information, see <xref linkend="goscustdesk-7"/>.</para></listitem>
-<listitem><para>Use a <application>Nautilus</application> window to choose
-a background pattern or color from the <guilabel>Backgrounds and Emblems</guilabel>
-dialog. To change the pattern or color of the desktop background, perform
-the following steps:</para>
+tool. </para></listitem>
+<listitem><para>Choose a pattern or color for the background from the <guilabel>
+Backgrounds and Emblems</guilabel> dialog. To change the pattern or color
+of the desktop background, perform the following steps:</para>
 <orderedlist>
 <listitem><para>Open a <application>Nautilus</application> window.</para>
 </listitem>
@@ -625,7 +603,7 @@ use, click on the <guibutton>Colors</guibutton> button.</para></listitem>
 <listitem><para>To change the desktop background to a pattern, drag the pattern
 to the desktop background. To change the desktop background to a color, drag
 the color to the desktop background.</para></listitem>
-<listitem><para>Click <guibutton>Done</guibutton> to close the dialog.</para>
+<listitem><para>Click <guibutton>Close</guibutton> to close the dialog.</para>
 </listitem>
 </orderedlist>
 </listitem>
diff --git a/gnome2-user-guide/C/goseditmainmenu-C.omf b/gnome2-user-guide/C/goseditmainmenu-C.omf
index 0fb3b60..a9476f0 100644
--- a/gnome2-user-guide/C/goseditmainmenu-C.omf
+++ b/gnome2-user-guide/C/goseditmainmenu-C.omf
@@ -16,10 +16,10 @@
       Menus
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Working With Menus chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/goseditmainmenu.xml b/gnome2-user-guide/C/goseditmainmenu.xml
index a8cc63b..654d95c 100644
--- a/gnome2-user-guide/C/goseditmainmenu.xml
+++ b/gnome2-user-guide/C/goseditmainmenu.xml
@@ -9,10 +9,10 @@
 <sect1 id="goseditmainmenu-2">
 <title>Introduction to Menus</title>
 <indexterm><primary>menus</primary><secondary>introduction</secondary></indexterm>
-<para>You can access all desktop functions through menus. The default panels
-contain menus, so you can use a combination of menus and panels to perform
-your tasks. You can perform various actions on your menus, such as copy menu
-items to panels.</para>
+<para>You can access all desktop functions through menus. The Menu Panel contains
+menus, so you can use a combination of menus and panels to perform your tasks.
+You can perform various actions on your menus, such as copy menu items to
+panels.</para>
 <para>You can access the following menus from the desktop:</para>
 <itemizedlist>
 <listitem><para><guimenu>Applications</guimenu> menu: You can access many
@@ -20,7 +20,7 @@ of the applications, commands, and configuration options on your desktop from
 the <guimenu>Applications</guimenu> menu.</para></listitem>
 <listitem><para><guimenu>Actions</guimenu> menu: You can access various desktop
 commands from the <guimenu>Actions</guimenu> menu. For example, you can start
-the <application>Search Tool</application> application, or log out from the
+the <application>Search Tool</application> application, or log out of the
 desktop. </para></listitem>
 <listitem><para><guimenu>GNOME Menu</guimenu>: You can also access the items
 in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus
@@ -29,9 +29,7 @@ from the <guimenu>GNOME Menu</guimenu>. You can have many <guimenu>GNOME Menu
 </itemizedlist>
 <para>You can also right-click on the desktop background to open the <guimenu>
 Desktop Background</guimenu> menu. The <guimenu>Desktop Background</guimenu>
-menu enables you to perform desktop background-related tasks. For information
-on the <guimenu>Desktop Background</guimenu> menu, see <xref linkend="gosdeskback-1"/>.
-</para>
+menu enables you to perform desktop background-related tasks. </para>
 <para>All of these menus provide you with multiple ways to perform your tasks,
 and enable you to work in the way that you prefer.</para>
 </sect1>
@@ -41,7 +39,7 @@ and enable you to work in the way that you prefer.</para>
 <para>Menus can contain the following items: </para>
 <itemizedlist>
 <listitem><para>Submenus</para></listitem>
-<listitem><para>Launchers</para></listitem>
+<listitem><para>Launchers or menu items</para></listitem>
 </itemizedlist>
 <para>An arrow to the right of an item in a menu indicates that the item is
 a submenu. When you point to the submenu, the submenu opens. You can choose
@@ -67,18 +65,11 @@ menu also contains a submenu that allows you to perform menu-related tasks.
 </para>
 <itemizedlist>
 <listitem><para>Add launchers to panels. </para></listitem>
-<listitem><para>Remove launchers from menus. </para></listitem>
 <listitem><para>Open the <guilabel>Run Program</guilabel> dialog with the
 launcher command in the dialog.</para></listitem>
 <listitem><para>Add menus to panels. You can add a menu as a menu object or
 as a drawer object. </para></listitem>
-<listitem><para>Add new items to menus.</para></listitem>
-<listitem><para>Change the properties of submenus and launchers.</para></listitem>
 </itemizedlist>
-<para>Some items in the popup menu might not be available to you. Your user
-privileges determine which items are available. For example, if you do not
-have system administrator privileges, you can not modify the properties of
-the <guimenu>Applications</guimenu> menu. </para>
 <para><xref linkend="goseditmainmenu-FIG-39"/> shows the popup menu.</para>
 <indexterm><primary>launcher popup menu</primary><secondary>illustration</secondary>
 </indexterm>
@@ -111,9 +102,6 @@ Description</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Add this launcher to panel</guimenuitem></para></entry>
 <entry valign="top"><para>Adds the launcher to the panel from which you open
 the menu.</para></entry></row>
-<row><entry valign="top"><para><guimenuitem>Remove this item</guimenuitem></para></entry>
-<entry valign="top"><para>Removes the launcher from the menu.</para></entry>
-</row>
 <row><entry valign="top"><para><guimenuitem>Put into run dialog</guimenuitem></para></entry>
 <entry valign="top"><para>Displays the <guilabel>Run Program</guilabel> dialog
 with  the command from the <guilabel>Command</guilabel> field of the launcher
@@ -121,10 +109,7 @@ in  the command field on the <guilabel>Run Program</guilabel> dialog. </para></e
 </row>
 <row><entry colname="COLSPEC0"><para><guimenuitem>Help on <replaceable>application_name
 </replaceable></guimenuitem></para></entry><entry colname="COLSPEC1"><para>
-Open the online help for the application.</para></entry></row>
-<row><entry valign="top"><para><guimenuitem>Properties</guimenuitem></para></entry>
-<entry valign="top"><para>Displays a dialog that enables you to edit the properties
-of the launcher.</para></entry></row>
+Opens the online help for the application.</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para><menuchoice><guimenu>Entire
 menu</guimenu><guimenuitem>Add this as drawer to panel</guimenuitem>
 </menuchoice></para></entry><entry colname="COLSPEC1" valign="top"><para>
@@ -135,14 +120,6 @@ menu</guimenu><guimenuitem>Add this as menu to panel</guimenuitem>
 </menuchoice></para></entry><entry colname="COLSPEC1" valign="top"><para>
 Adds the submenu as a menu object to the panel from which you open the menu.
 </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><menuchoice><guimenu>Entire
-menu</guimenu><guimenuitem>Add new item to this menu</guimenuitem>
-</menuchoice></para></entry><entry colname="COLSPEC1" valign="top"><para>
-Enables you to add an item to the submenu.</para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><menuchoice><guimenu>Entire
-menu</guimenu><guimenuitem>Properties</guimenuitem></menuchoice></para></entry>
-<entry colname="COLSPEC1" valign="top"><para>Displays a dialog that enables
-you to edit the properties of the submenu.</para></entry></row>
 </tbody>
 </tgroup>
 </table>
@@ -151,11 +128,11 @@ you to edit the properties of the submenu.</para></entry></row>
 </sect1>
 <sect1 id="goseditmainmenu-8">
 <title>Applications Menu</title>
-<indexterm><primary>menus</primary><secondary>Applications</secondary></indexterm>
-<para>The <guimenu>Applications</guimenu> menu contains a hierarchy of submenus,
-from which you can start the standard GNOME applications and preference tools.
-The <guimenu>Applications</guimenu> menu also includes the file manager and
-the help browser.</para>
+<indexterm><primary>menus</primary><secondary>Applications menu</secondary>
+</indexterm><para>The <guimenu>Applications</guimenu> menu contains a hierarchy
+of submenus, from which you can start the standard GNOME applications and
+preference tools. The <guimenu>Applications</guimenu> menu also includes the
+file manager and the help browser.</para>
 <para>The <guimenu>Applications</guimenu> menu resides in the following places: 
 </para>
 <itemizedlist>
@@ -167,7 +144,7 @@ Nautilus</application></para></listitem>
 </sect1>
 <sect1 id="goseditmainmenu-51">
 <title>Actions Menu</title>
-<indexterm><primary>menus</primary><secondary>Actions</secondary></indexterm>
+<indexterm><primary>menus</primary><secondary>Actions menu</secondary></indexterm>
 <para>The <guimenu>Actions</guimenu> menu contains various desktop commands. <xref
 linkend="goseditmainmenu-TBL-52"/> describes the commands in the <guimenu>
 Actions</guimenu> menu.</para>
@@ -188,16 +165,15 @@ information, see <xref linkend="gospanel-23"/>.</para></entry></row>
 <entry valign="top"><para>Starts the <application>Search Tool</application>
 application. For more information, see the <citetitle>Search Tool</citetitle>
 manual.</para></entry></row>
-<row><entry valign="top"><para><guimenuitem>Take a Screen Shot</guimenuitem></para></entry>
-<entry valign="top"><para>Opens the <guilabel>Screenshot</guilabel> dialog.
-Use the <guilabel>Screenshot</guilabel> to take screenshots of your desktop.
-</para></entry></row>
+<row><entry valign="top"><para><guimenuitem>Screenshot</guimenuitem></para></entry>
+<entry valign="top"><para>Takes a screenshot of your desktop,
+and opens the <guilabel>Screenshot</guilabel> dialog. Use the <guilabel>Screenshot
+</guilabel> dialog to save the screenshot.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Lock Display</guimenuitem></para></entry>
-<entry valign="top"><para>Locks your screen. For more information, see <xref
-linkend="gosstartsession-1"/>.</para></entry></row>
+<entry valign="top"><para>Locks your screen. </para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Log Out</guimenuitem></para></entry>
-<entry valign="top"><para>Logs you out of the current session. For more information,
-see <xref linkend="gosgetstarted-73"/>.</para></entry></row>
+<entry valign="top"><para>Logs you out of the current session. </para></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
@@ -211,10 +187,10 @@ Actions</guimenu> menu are at the top level of the <guimenu>GNOME Menu</guimenu>
 </itemizedlist>
 <sect2 id="gospanel-23">
 <title>Using the Run Program Dialog</title>
-<indexterm><primary>Run Program dialog, using</primary></indexterm>
-<para>The <guilabel>Run Program</guilabel> dialog gives you access to the
-command line. When you run a command in the <guilabel>Run Program</guilabel>
-dialog, you cannot receive output from the command.</para>
+<indexterm><primary>Run Program dialog, using</primary></indexterm><para>
+The <guilabel>Run Program</guilabel> dialog gives you access to the command
+line. When you run a command in the <guilabel>Run Program</guilabel> dialog,
+you cannot receive output from the command.</para>
 <para>To run a command from the command line perform the following steps: 
 </para>
 <orderedlist>
@@ -227,11 +203,11 @@ Program</guimenuitem></menuchoice>.</para></listitem>
 <listitem><para>From the <guimenu>GNOME Menu</guimenu></para>
 <para>Open the <guimenu>GNOME Menu</guimenu>, then choose <guimenuitem>Run
 Program</guimenuitem>.</para></listitem>
-<listitem><para>Use a shortcut key</para>
-<para>The default shortcut key to display the <guilabel>Run Program</guilabel>
+<listitem><para>Use shortcut keys</para>
+<para>The default shortcut keys to display the <guilabel>Run Program</guilabel>
 dialog is <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>. You can change the shortcut
-key that displays the <guilabel>Run Program</guilabel> dialog in the <application>
-Desktop Preferences</application>. To change the shortcut key, choose <menuchoice>
+keys that display the <guilabel>Run Program</guilabel> dialog in the <application>
+Desktop Preferences</application>. To change the shortcut keys, choose <menuchoice>
 <guimenu>Applications</guimenu><guisubmenu>Desktop Preferences
 </guisubmenu><guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice>.</para>
 </listitem>
@@ -240,39 +216,12 @@ Desktop Preferences</application>. To change the shortcut key, choose <menuchoic
 run dialog</guilabel> from the popup menu. The <guilabel>Run Program</guilabel>
 dialog opens with the command from the menu in the command field.</para></listitem>
 </itemizedlist></para>
-<para>The <guilabel>Run Program</guilabel> dialog is displayed as follows:
-</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/runprogram_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Run Program dialog. Contains applications drop-down combination box, Run in terminal check box. Contains Append File, Help, Close, Run buttons. Contains Known Applications button.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
-<listitem><para>Choose the command that you want to run from the applications
-drop-down combination box.</para>
+<para>The <guilabel>Run Program</guilabel> dialog is displayed.</para></listitem>
+<listitem><para>Enter the command that you want to run in the blank field.
+Alternatively, to choose  a command that you ran previously, click the down
+arrow button beside the command field, then choose the command to run.</para>
 <para>Alternatively, click on the <guibutton>Known Applications</guibutton>
-button to display a list of available applications, as shown in the following
-figure:</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/runprogram2_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Run Program dialog, with advanced options. Contains applications drop-down combination box, Run in terminal check box. Contains Append File, Help, Close, Run buttons. Contains expanded Known Applications list.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para>Enter the command that you want to run in the blank field. Alternatively,
-to choose  a command that you ran previously, click the down arrow button,
-then choose the command to run.</para>
+button to display a list of available applications.</para>
 <para>You can also use the <guibutton>Append File</guibutton> button to choose
 a file to append to the command line. For example, you can enter <application>
 emacs</application> as the command, then choose a file to edit.</para>
@@ -283,6 +232,84 @@ command that does not create a window in which to run.</para></listitem>
 Run Program</guilabel> dialog. </para></listitem>
 </orderedlist>
 </sect2>
+<sect2 id="goseditmainmenu-53">
+<title>Taking Screenshots</title>
+<indexterm><primary>screenshots, taking</primary></indexterm><para>You can
+take a screenshot in any of the following ways:</para>
+<itemizedlist>
+<listitem><para>Use the <guimenu>Actions</guimenu> menu</para>
+<para>To take a screenshot of the entire screen, choose <menuchoice><guimenu>
+Actions</guimenu><guimenuitem>Screenshot</guimenuitem></menuchoice>.
+A <guilabel>Screenshot</guilabel> dialog is displayed. To save the screenshot,
+select the <guilabel>Save screenshot to file</guilabel> option. Enter the
+path and filename for the screenshot in the drop-down combination box. Alternatively,
+to save the screenshot to another directory, click <guibutton>Browse</guibutton>.
+When you select a directory, click <guibutton>OK</guibutton>. </para>
+<para>You can also save the screenshot to the desktop background. To save
+the screenshot to the desktop background, select the <guilabel>Save screenshot
+to desktop</guilabel> option. </para></listitem>
+<listitem><para>Use shortcut keys</para>
+<para>To take a screenshot, use the following shortcut keys:</para>
+<informaltable frame="topbot">
+<tgroup cols="2" colsep="0" rowsep="0">
+
+<colspec colname="COLSPEC0" colwidth="35.67*"/><colspec colname="COLSPEC1"
+colwidth="64.33*"/>
+<thead>
+<row rowsep="1"><entry valign="top"><para>Default Shortcut Keys</para></entry>
+<entry valign="top"><para>Function</para></entry></row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC0"><para><keycap>Print Screen</keycap></para></entry>
+<entry colname="COLSPEC1"><para>Takes a screenshot of the entire screen, and
+displays the <guilabel>Screenshot</guilabel> dialog. Use the <guilabel>Screenshot
+</guilabel> dialog to save the screenshot.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><keycombo><keycap>Alt</keycap><keycap>Print
+Screen</keycap></keycombo></para></entry><entry colname="COLSPEC1"><para>Takes a screenshot
+of the window that has focus, and displays the <guilabel>Screenshot</guilabel>
+dialog. Use the <guilabel>Screenshot</guilabel> dialog to save the screenshot.
+</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+<para>You can use the <application>Keyboard Shortcuts</application> preference
+tool to modify the default shortcut keys.</para></listitem>
+<listitem><para>Use a command</para>
+<para>You can use the <command>gnome-panel-screenshot</command> command to
+take a screenshot. The <command>gnome-panel-screenshot</command> command takes
+a screenshot of the entire screen, and displays the <guilabel>Screenshot</guilabel>
+dialog. Use the <guilabel>Screenshot</guilabel> dialog to save the screenshot.
+</para>
+<para>You can also use options on the <command>gnome-panel-screenshot</command>
+command as follows: </para>
+<informaltable frame="topbot">
+<tgroup cols="2" colsep="0" rowsep="0">
+
+<colspec colname="COLSPEC0" colwidth="35.67*"/><colspec colname="COLSPEC1"
+colwidth="64.33*"/>
+<thead>
+<row rowsep="1"><entry valign="top"><para>Option</para></entry><entry valign="top"><para>
+Function</para></entry></row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC0"><para><command>--window</command></para></entry>
+<entry colname="COLSPEC1"><para>Takes a screenshot of the window that has
+focus, and displays the <guilabel>Screenshot</guilabel> dialog. Use the <guilabel>
+Screenshot</guilabel> dialog to save the screenshot.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><command>--delay=<replaceable>seconds
+</replaceable></command></para></entry><entry colname="COLSPEC1"><para>Takes
+a screenshot after the specified number of seconds, and displays the <guilabel>
+Screenshot</guilabel> dialog. Use the <guilabel>Screenshot</guilabel> dialog
+to save the screenshot.</para></entry></row>
+<row><entry colname="COLSPEC0"><para><command>--help</command></para></entry>
+<entry colname="COLSPEC1"><para>Displays the options for the command.</para></entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+</listitem>
+</itemizedlist>
+</sect2>
 </sect1>
 <sect1 id="goseditmainmenu-7">
 <title>GNOME Menu</title>
@@ -307,14 +334,12 @@ configuration options on your desktop from the <guimenu>GNOME Menu</guimenu>.
 and special menu items: </para>
 <itemizedlist>
 <listitem><para><guimenu>Applications</guimenu>: Contains all applications
-and preference tools. This menu also includes the file manager and help browser.
-</para></listitem>
+and preference tools. This menu also includes the file manager and the help
+browser.</para></listitem>
 <listitem><para><guimenu>Actions</guimenu>: Contains desktop commands the <guimenuitem>
-Lock screen</guimenuitem> and <guimenuitem>Log out</guimenuitem> menu items.
-By default, the items in the <guimenu>Desktop</guimenu> menu are at the top
-level of the <guimenu>GNOME Menu</guimenu>. </para></listitem>
-<listitem><para><guimenuitem>Run</guimenuitem> launcher: Displays the <guilabel>
-Run Program</guilabel> dialog. </para></listitem>
+Lock Display</guimenuitem> and <guimenuitem>Log Out</guimenuitem> menu items.
+The items in the <guimenu>Actions</guimenu> menu are at the top level of the <guimenu>
+GNOME Menu</guimenu>. </para></listitem>
 </itemizedlist>
 <para>You can add <guimenu>GNOME Menu</guimenu> buttons to your panels. By
 default, the <guimenu>GNOME Menu</guimenu> is represented on panels by a stylized
@@ -337,14 +362,15 @@ footprint icon, as follows:</para>
 <itemizedlist>
 <listitem><para>From a panel with a <guimenu>GNOME Menu</guimenu></para>
 <para>Click on the <guimenu>GNOME Menu</guimenu>. </para></listitem>
-<listitem><para>Use a shortcut key</para>
-<para>You can use a shortcut key to open the <guimenu>GNOME Menu</guimenu>.
-When you use a shortcut key to open the <guimenu>GNOME Menu</guimenu>, the <guimenu>
+<listitem><para>Use shortcut keys</para>
+<para>You can use shortcut keys to open the <guimenu>GNOME Menu</guimenu>.
+When you use shortcut keys to open the <guimenu>GNOME Menu</guimenu>, the <guimenu>
 GNOME Menu</guimenu> appears at the mouse pointer. </para>
-<para>The default shortcut key to open the <guimenu>GNOME Menu</guimenu> is <keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>. To change the shortcut key that opens
-the <guimenu>GNOME Menu</guimenu>, choose <menuchoice><guimenu>Applications
-</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>
-Keyboard Shortcuts</guimenuitem></menuchoice>.</para></listitem>
+<para>The default shortcut keys to open the <guimenu>GNOME Menu</guimenu>
+are <keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>. To change the shortcut keys
+that open the <guimenu>GNOME Menu</guimenu>, choose <menuchoice><guimenu>
+Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu>
+<guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice>.</para></listitem>
 </itemizedlist>
 </sect2>
 <sect2 id="goseditmainmenu-29">
@@ -352,9 +378,9 @@ Keyboard Shortcuts</guimenuitem></menuchoice>.</para></listitem>
 <indexterm><primary>GNOME Menu</primary><secondary>adding to panel</secondary>
 </indexterm><para>You can add as many <guimenu>GNOME Menu</guimenu> buttons
 as you want to your panels. To add a <guimenu>GNOME Menu</guimenu> to a panel,
-right-click on any vacant space on the panel to open the panel popup menu.
-Choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>GNOME
-Menu</guimenuitem></menuchoice>.</para>
+right-click on any vacant space on the panel. Choose <menuchoice><guimenu>
+Add to Panel</guimenu><guimenuitem>GNOME Menu</guimenuitem></menuchoice>.
+</para>
 </sect2>
 </sect1>
 </chapter>
diff --git a/gnome2-user-guide/C/gosmetacity-C.omf b/gnome2-user-guide/C/gosmetacity-C.omf
index 5946d45..349c0f0 100644
--- a/gnome2-user-guide/C/gosmetacity-C.omf
+++ b/gnome2-user-guide/C/gosmetacity-C.omf
@@ -16,10 +16,10 @@
       Windows
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Working With Windows chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/gosmetacity.xml b/gnome2-user-guide/C/gosmetacity.xml
index 6b8c067..7d1dab0 100644
--- a/gnome2-user-guide/C/gosmetacity.xml
+++ b/gnome2-user-guide/C/gosmetacity.xml
@@ -39,27 +39,25 @@ visual representation of your windows and workspaces, as show in <xref linkend="
 </mediaobject>
 </screenshot>
 </figure>
-<para>By default, your desktop contains four workspaces. You can add more
-workspaces at any time. To add workspaces to your desktop, right-click on
-the <application>Workspace Switcher</application> applet, then choose <guimenuitem>
-Preferences</guimenuitem> from the applet popup menu. The <guilabel>Workspace
-Switcher Preferences</guilabel> dialog is displayed. Use the <guilabel>Number
-of workspaces</guilabel> spin box to specify the number of workspaces you
-require.</para>
+<para>You can add workspaces at any time. To add workspaces to your desktop,
+right-click on the <application>Workspace Switcher</application> applet, then
+choose <guimenuitem>Preferences</guimenuitem>. The <guilabel>Workspace Switcher
+Preferences</guilabel> dialog is displayed. Use the <guilabel>Number of workspaces
+</guilabel> spin box to specify the number of workspaces you require.</para>
 <sect2 id="gosmetacity-15">
 <title>Window Manager Behavior</title>
 <indexterm><primary>windows</primary><secondary>window managers</secondary>
 </indexterm><para>A window manager controls how windows appear and behave
 on your desktop. The window manager manages where your windows are located,
-which window has focus, and the style of the frame on the windows. The window
+which window has focus, and the theme of the frame on the windows. The window
 frame contains buttons that enable you to perform standard actions such as
 moving, closing, and resizing windows.</para>
-<para>You can configure window manager settings in the <application>Window
-Behavior</application> preference tool. This manual describes the functions
-that are associated with the default configuration of the <application>Window
-Behavior</application> window manager. The default configuration is specified
-in the <application>Metacity</application> preference tools. This manual also
-describes the default functions of the Crux theme.</para>
+<para>You can configure some window manager settings in the <application>
+Window Focus</application> preference tool. This manual describes the functions
+that are associated with the default configuration of the <application>Metacity
+</application> window manager. The default configuration is specified in the <application>
+Window Focus</application> preference tool. This manual also describes the
+default functions of the Crux theme.</para>
 </sect2>
 </sect1>
 <sect1 id="gosmetacity-713">
@@ -70,29 +68,14 @@ describes the default functions of the Crux theme.</para>
 <listitem><para>Application windows </para>
 <para>When you start an application, an application window opens. The window
 manager applies a frame to the application window. By default, the top edge
-of the application window contains a titlebar with buttons that you can use
-to work with the window. The buttons in an application window frame enable
-you to perform actions such as open the <guimenu>Window Menu</guimenu>, or
-close the window. The <guimenu>Window Menu</guimenu> provides a number of
-actions that you can perform on the window. </para>
-<para>The following figure shows a typical application window. </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/gedit_window.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows application window in Crux window frame style.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+of the application window contains a titlebar. The titlebar contains buttons
+that you can use to work with the window. The buttons in an application window
+frame enable you to perform actions such as open the <guimenu>Window Menu
+</guimenu>, or close the window. The <guimenu>Window Menu</guimenu> provides
+a number of actions that you can perform on the window. </para></listitem>
 <listitem><para>Dialog windows</para>
 <para>A dialog window is a popup window in which you enter information or
-commands. The dialog appears within a window frame. The frame of a dialog
-window contains buttons that enable you to open the <guimenu>Window Menu</guimenu>,
-or to close the dialog window.</para>
+commands. The dialog appears within a window frame. </para>
 <para>You can use the top edge of the frame to work with the window. For example,
 you can use the titlebar to move the dialog around the desktop. The frame
 also contains buttons that enable you to do the following:</para>
@@ -103,27 +86,14 @@ also contains buttons that enable you to do the following:</para>
 <para>Typically, you open a dialog window from an application window. When
 you open a dialog window, the window is usually raised and has focus. Some
 dialog windows do not allow you to use the application until you close the
-dialog. </para>
-<para>The following figure shows a typical dialog window. </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/gedit_pref_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows dialog window in Crux window frame style.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+dialog. </para></listitem>
 </itemizedlist>
 <sect2 id="gosmetacity-16">
 <title>Window Frames</title>
 <indexterm><primary>windows</primary><secondary>frames</secondary></indexterm>
 <para>A window frame is a border around a window. The window frame contains
-a titlebar. The titlebar normally contains buttons that you can use to work
-with the window.</para>
+a titlebar. The titlebar contains buttons that you can use to work with the
+window.</para>
 <sect3 id="gosmetacity-10">
 <title>Themes</title>
 <indexterm><primary>windows</primary><secondary>themes</secondary></indexterm>
@@ -138,9 +108,8 @@ are associated with the Crux theme. </para>
 <title>Control Elements</title>
 <indexterm><primary>windows</primary><secondary>frame control elements</secondary>
 </indexterm><para>You can use the window frame to perform various actions
-with the window. In particular, the titlebar contains various active control
-elements. The following figure shows the titlebar of an application window:
-</para>
+with the window. In particular, the titlebar contains various buttons. The
+following figure shows the titlebar of an application window:</para>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -201,7 +170,8 @@ in the window contents, then drag the window to the new location.</para></listit
 <listitem><para>To resize a window, press-and-hold <keycap>Alt</keycap>, 
 then middle-click near the corner you want to resize. To resize the window,
 drag from the corner on which you middle-clicked.</para></listitem>
-<listitem><para>To open the <guimenu>Window Menu</guimenu>, press-and-hold <keycap>Alt</keycap>, then right-click in the window contents.</para></listitem>
+<listitem><para>To open the <guimenu>Window Menu</guimenu>, press-and-hold <keycap>
+Alt</keycap>, then right-click in the window contents.</para></listitem>
 </itemizedlist></entry></row>
 </tbody>
 </tgroup>
@@ -228,6 +198,7 @@ that you can use to work with windows and workspaces.</para>
 </mediaobject>
 </screenshot>
 <indexterm><primary>windows</primary><secondary>Window Menu</secondary></indexterm>
+<indexterm><primary>menus</primary><secondary>Window Menu</secondary></indexterm>
 <para>The <guimenu>Window Menu</guimenu> is a menu of commands that you can
 use to perform actions on your windows. To open the <guimenu>Window Menu</guimenu>
 perform one of the following actions:</para>
@@ -273,8 +244,8 @@ the window.</para></entry></row>
 or <guimenuitem>Only on This Workspace</guimenuitem></para></entry><entry
 colname="COLSPEC3"><para>Puts the window on all of your workspaces. If the
 window is already on all of your workspaces, choose <guimenuitem>Only on This
-Workspace</guimenuitem>  to put on the current workspace only.</para></entry>
-</row>
+Workspace</guimenuitem>  to put the window on the current workspace only.
+</para></entry></row>
 <row><entry colname="COLSPEC2"><para><guimenuitem>Move to <replaceable>workspace_name
 </replaceable></guimenuitem> or <guimenuitem>Only on <replaceable>workspace_name
 </replaceable></guimenuitem></para></entry><entry colname="COLSPEC3"><para>
@@ -359,7 +330,7 @@ valign="top"><para>The window has focus.</para></entry><entry valign="top"><para
 gedit</guilabel></para></entry></row>
 <row><entry valign="top"><para>Square brackets around window title.</para></entry>
 <entry valign="top"><para>The window is minimized.</para></entry><entry valign="top"><para><guilabel>
-Dictionary</guilabel></para></entry></row>
+[Dictionary]</guilabel></para></entry></row>
 <row><entry valign="top"><para>Button is not pressed in, no square brackets
 around title.</para></entry><entry valign="top"><para>The window is displayed
 on the desktop, and is not minimized.</para></entry><entry valign="top"><para><guilabel>
@@ -374,13 +345,12 @@ Gnome-terminal (3)</guilabel></para></entry></row>
 <sect3 id="gosmetacity-708">
 <title>Grouping Buttons</title>
 <indexterm><primary>Window List applet</primary><secondary>grouping buttons
-</secondary></indexterm><para>If the space on a panel is limited, <application>
-Window List</application> can group the buttons that represent windows in
-the same class under one window list button. The <guibutton>GNOME Terminal
-</guibutton> button in <xref linkend="gosmetacity-FIG-8"/> is an example of
-a button that represents a group of buttons. The following figure shows an
-example of <application>Window List</application> with a button group open:
-</para>
+</secondary></indexterm><para><application>Window List</application> can group
+the buttons that represent windows in the same class under one window list
+button. The <guibutton>Gnome-terminal</guibutton> button in <xref linkend="gosmetacity-FIG-8"/>
+is an example of a button that represents a group of buttons. The following
+figure shows an example of <application>Window List</application> with a button
+group open:</para>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -491,10 +461,11 @@ Action</para></entry></row>
 <tbody>
 <row><entry valign="top"><para>Mouse</para></entry><entry valign="top"><para>
 Click on the window, if the window is visible. </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para>Shortcut key</para></entry>
-<entry colname="COLSPEC1" valign="top"><para>Switch between the windows that
-are open with a shortcut key. To give focus to a window, release the keys.
-The default shortcut key to switch between windows is <keycombo><keycap>Alt</keycap><keycap>Tab</keycap></keycombo>. </para></entry></row>
+<row><entry colname="COLSPEC0" valign="top"><para>Shortcut keys</para></entry>
+<entry colname="COLSPEC1" valign="top"><para>Use shortcut keys to switch between
+the windows that are open. To give focus to a window, release the keys. The
+default shortcut keys to switch between windows are <keycombo><keycap>Alt</keycap><keycap>
+Tab</keycap></keycombo>. </para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para><application>Window List
 </application></para></entry><entry colname="COLSPEC1" valign="top"><para>
 Click on the button that represents the window in <application>Window List
@@ -568,8 +539,8 @@ window in <application>Window List</application>.</para>
 <sect2 id="gosmetacity-32">
 <title>To Close a Window</title>
 <indexterm><primary>windows</primary><secondary>closing</secondary></indexterm>
-<indexterm><primary>closing</primary><secondary>windows</secondary></indexterm>
-<para>To close a window perform one of the following actions: </para>
+<indexterm><primary>closing windows</primary></indexterm><para>To close a
+window perform one of the following actions: </para>
 <itemizedlist>
 <listitem><para>Click on the <guibutton>Close Window</guibutton> button on
 the window frame.</para></listitem>
@@ -588,24 +559,22 @@ data.</para>
 <indexterm><primary>resizing windows</primary></indexterm><para>To resize
 a window perform one of the following actions:</para>
 <itemizedlist>
-<listitem><para>To resize a window vertically and horizontally point to a
-corner of the window. The mouse pointer changes to indicate that you can resize
-the window. Grab the corner and drag the window to the new size.</para></listitem>
-<listitem><para>To resize a window vertically or horizontally, right-click
-on the button that represents the window in <application>Window List</application>.
-Choose <guimenuitem>Move</guimenuitem> from the <guimenu>Window Menu</guimenu>.
-Use the arrow keys to resize the window.</para></listitem>
+<listitem><para>Point to a corner of the window. The mouse pointer changes
+to indicate that you can resize the window. Grab the corner and drag the window
+to the new size.</para></listitem>
+<listitem><para>Right-click on the button that represents the window in <application>
+Window List</application>. Choose <guimenuitem>Resize</guimenuitem> from the <guimenu>
+Window Menu</guimenu>. Use the arrow keys to resize the window.</para></listitem>
+<listitem><para>Press-and-hold <keycap>Alt</keycap>, then middle-click near
+the corner that you want to resize. The mouse pointer changes to indicate
+that you can resize from the corner. To resize the window, drag from the corner
+on which you middle-clicked.</para></listitem>
 <listitem><para>To resize a window horizontally point to one of the vertical
 edges of the window. The mouse pointer changes to indicate that you can resize
 the window. Grab the edge and drag the window to the new size.</para></listitem>
 <listitem><para>To resize a window vertically point to the bottom edge of
 the window. The mouse pointer changes to indicate that you can resize the
 window. Grab the edge and drag the window to the new size.</para></listitem>
-<listitem><para>To resize a window, press-and-hold <keycap>Alt</keycap>, 
-then middle-click near the corner you want to resize. The mouse pointer changes
-to indicate that you can resize from the corner. To resize the window, drag
-from the corner on which you middle-clicked.</para>
-<para></para></listitem>
 </itemizedlist>
 <note><para>You cannot resize some dialog windows. Also, some application
 windows have a minimum size below which you cannot reduce the window.</para>
@@ -619,8 +588,8 @@ perform one of the following actions: </para>
 <itemizedlist>
 <listitem><para>Grab the titlebar of the window and drag the window to the
 new location. </para></listitem>
-<listitem><para>Press-and-hold <keycap>Alt</keycap> then drag the window to
-the new location. </para></listitem>
+<listitem><para>Press-and-hold <keycap>Alt</keycap>, then drag the window
+to the new location. </para></listitem>
 <listitem><para>Open the <guimenu>Window Menu</guimenu>, then choose <guimenuitem>
 Move</guimenuitem>. Use the arrow keys to move the window to the new location.
 </para></listitem>
@@ -634,7 +603,7 @@ to the new location.</para></listitem>
 <title>To Shade a Window</title>
 <indexterm><primary>windows</primary><secondary>shading</secondary></indexterm>
 <indexterm><primary>shading windows</primary></indexterm><para>You can shade
-and unshade windows as follows:</para>
+and unshade windows, as follows:</para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="24.94*"/><colspec
 colwidth="75.06*"/>
@@ -662,10 +631,10 @@ Unshade</guimenuitem>.</para></listitem>
 </sect2>
 <sect2 id="gosmetacity-38">
 <title>To Put a Window on All Workspaces</title>
-<indexterm><primary>windows</primary><secondary>put on all workspaces</secondary>
-</indexterm><para>To put a window in all workspaces, open the <guimenu>Window
-Menu</guimenu>. Choose <guimenuitem>Put on All Workspaces</guimenuitem>. To
-set the window to appear only in the current workspace, choose <guimenuitem>
+<indexterm><primary>windows</primary><secondary>putting on all workspaces
+</secondary></indexterm><para>To put a window in all workspaces, open the <guimenu>
+Window Menu</guimenu>. Choose <guimenuitem>Put on All Workspaces</guimenuitem>.
+To set the window to appear only in the current workspace, choose <guimenuitem>
 Only on This Workspace</guimenuitem>.</para>
 </sect2>
 <sect2 id="gosmetacity-46">
@@ -675,8 +644,8 @@ Only on This Workspace</guimenuitem>.</para>
 moving windows to </secondary></indexterm><para>You can move a window to another
 workspace in either of the following ways:</para>
 <itemizedlist>
-<listitem><para>Use <application>Workpsace Switcher</application></para>
-<para>In the <application>Workpsace Switcher</application> display, drag the
+<listitem><para>Use <application>Workspace Switcher</application></para>
+<para>In the <application>Workspace Switcher</application> display, drag the
 window to the workspace you require.</para></listitem>
 <listitem><para>Use the <guimenu>Window Menu</guimenu></para>
 <para>Open the <guimenu>Window Menu</guimenu>. To move the window to the next
@@ -698,18 +667,21 @@ ways: </para>
 <listitem><para>Use <application>Workspace Switcher</application></para>
 <para>Click on the workspace that you want to switch to in <application>Workspace
 Switcher</application>.</para></listitem>
-<listitem><para>Use a shortcut key</para>
+<listitem><para>Use shortcut keys</para>
 <para>The default shortcut keys to switch between the workspaces are as follows: 
 </para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="50*"/><colspec colwidth="50*"/>
 <thead>
-<row><entry valign="top"><para>Shortcut Key</para></entry><entry valign="top"><para>
-Function</para></entry></row>
+<row><entry valign="top"><para>Default Shortcut Keys</para></entry><entry
+valign="top"><para>Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo></para></entry><entry valign="top"><para>Selects the workspace to the right. </para></entry></row>
-<row><entry valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo></para></entry><entry valign="top"><para>Selects
+<row><entry valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>right arrow</keycap></keycombo></para></entry><entry valign="top"><para>Selects
+the workspace to the right. </para></entry></row>
+<row><entry valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>left arrow</keycap></keycombo></para></entry><entry valign="top"><para>Selects
 the workspace to the left. </para></entry></row>
 </tbody>
 </tgroup>
@@ -721,39 +693,34 @@ the workspace to the left. </para></entry></row>
 <title>To Add Workspaces</title>
 <indexterm><primary>workspaces</primary><secondary>adding</secondary></indexterm>
 <para>To add workspaces to your desktop, right-click on <application>Workspace
-Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>
-from the applet popup menu. The <guilabel>Workspace Switcher Preferences</guilabel>
-dialog is displayed. Use the <guilabel>Number of workspaces</guilabel> spin
-box to specify the number of workspaces you require. <application>Workspace
-Switcher</application> adds new workspaces at the end of the workspace list.
-</para>
+Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>.
+The <guilabel>Workspace Switcher Preferences</guilabel> dialog is displayed.
+Use the <guilabel>Number of workspaces</guilabel> spin box to specify the
+number of workspaces you require. <application>Workspace Switcher</application>
+adds new workspaces at the end of the workspace list.</para>
 </sect2>
 <sect2 id="gosmetacity-51">
 <title>To Name Workspaces</title>
 <indexterm><primary>workspaces</primary><secondary>naming</secondary></indexterm>
 <para>The default names of your workspaces are <literal>Workspace 1</literal>, <literal>
-Workspace 2</literal>, <literal>Workspace 3</literal>, and so on. You can
-assign names to your workspaces in the <application>Workspaces</application>
-desktop preference tool. </para>
-<para>To assign names to your workspaces, right-click on <application>Workspace
-Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>
-from the applet popup menu. The <guilabel>Workspace Switcher Preferences</guilabel>
-dialog is displayed. Use the <guilabel>Workspaces</guilabel> list box to specify
-the names of your workspaces. Select a workspace, then type the new name for
-the workspace.</para>
+Workspace 2</literal>, <literal>Workspace 3</literal>, and so on. To assign
+names to your workspaces, right-click on <application>Workspace Switcher</application>,
+then choose <guimenuitem>Preferences</guimenuitem>. The <guilabel>Workspace
+Switcher Preferences</guilabel> dialog is displayed. Use the <guilabel>Workspaces
+</guilabel> list box to specify the names of your workspaces. Select a workspace,
+then type the new name for the workspace.</para>
 </sect2>
 <sect2 id="gosmetacity-52">
 <title>To Delete Workspaces</title>
-<indexterm><primary>workspaces</primary><secondary>delete</secondary></indexterm>
+<indexterm><primary>workspaces</primary><secondary>deleting</secondary></indexterm>
 <para>When you delete a workspace the windows in the workspace are moved to
 another workspace, and the empty workspace is deleted. </para>
 <para>To delete workspaces from your desktop, right-click on <application>
-Workspace Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>
-from the applet popup menu. The <guilabel>Workspace Switcher Preferences</guilabel>
-dialog is displayed. Use the <guilabel>Number of workspaces</guilabel> spin
-box to specify the number of workspaces you require. <application>Workspace
-Switcher</application> deletes workspaces from the end of the workspace list.
-</para>
+Workspace Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>.
+The <guilabel>Workspace Switcher Preferences</guilabel> dialog is displayed.
+Use the <guilabel>Number of workspaces</guilabel> spin box to specify the
+number of workspaces you require. <application>Workspace Switcher</application>
+deletes workspaces from the end of the workspace list.</para>
 </sect2>
 </sect1>
 </chapter>
diff --git a/gnome2-user-guide/C/gosnautilus-C.omf b/gnome2-user-guide/C/gosnautilus-C.omf
index 1645e63..e264056 100644
--- a/gnome2-user-guide/C/gosnautilus-C.omf
+++ b/gnome2-user-guide/C/gosnautilus-C.omf
@@ -16,10 +16,10 @@
       Nautilus File Manager
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Nautilus File Manager chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/gosnautilus-applications-C.omf b/gnome2-user-guide/C/gosnautilus-applications-C.omf
index cc72b45..a66899c 100644
--- a/gnome2-user-guide/C/gosnautilus-applications-C.omf
+++ b/gnome2-user-guide/C/gosnautilus-applications-C.omf
@@ -16,10 +16,10 @@
       Nautilus File Manager
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Applications"/>
     <description>
       Nautilus File Manager chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index d129d65..6ad3a1a 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -17,11 +17,8 @@ an integrated access point to your files and applications. <application>Nautilus
 <listitem><para>Run scripts.</para></listitem>
 <listitem><para>Customize your files and folders.</para></listitem>
 </itemizedlist>
-<para>You can also use <application>Nautilus</application> to browse the Web,
-but you can only view pages that contain HTML code. You can not view web pages
-that contain other types of code, for example, JavaScript. <application>Nautilus
-</application> also manages the desktop where your panels, menus, and windows
-are displayed. </para>
+<para><application>Nautilus</application> also manages the desktop where your
+panels, menus, and windows are displayed. </para>
 <para><application>Nautilus</application> windows enable you to display and
 manage your files and folders. You can open a <application>Nautilus</application>
 window in any of the following ways:</para>
@@ -89,8 +86,7 @@ to choose how to display items in your view pane.</para></listitem>
 </itemizedlist></entry></row>
 <row><entry valign="top"><para>Side pane</para></entry><entry valign="top"><para>
 Performs the following functions:</para><itemizedlist>
-<listitem><para>Enables you to navigate through your files and the online
-help system. </para></listitem>
+<listitem><para>Enables you to navigate through your files. </para></listitem>
 <listitem><para>Displays information about the current file or folder. </para>
 </listitem>
 </itemizedlist></entry></row>
@@ -108,8 +104,8 @@ Displays the contents of the following:</para><itemizedlist>
 <listitem><para>FTP sites</para></listitem>
 </itemizedlist></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para>Resize handle</para></entry>
-<entry colname="COLSPEC1" valign="top"><para>Grab this handle then drag to
-resize the side pane and view pane.</para></entry></row>
+<entry colname="COLSPEC1" valign="top"><para>Grab this handle, then drag to
+resize the side pane and the view pane.</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para>Statusbar</para></entry>
 <entry colname="COLSPEC1" valign="top"><para>Displays status information.
 </para></entry></row>
@@ -131,14 +127,14 @@ of the following:</para>
 <itemizedlist>
 <listitem><para>Particular types of files</para></listitem>
 <listitem><para>Folders</para></listitem>
-<listitem><para>Websites</para></listitem>
 <listitem><para>FTP sites</para></listitem>
 </itemizedlist>
 <para><indexterm><primary>viewer components</primary></indexterm><application>
 Nautilus</application> contains <glossterm>viewer components</glossterm> that
 enable you to display particular types of file in the view pane. For example,
- you can use a web page viewer to display HTML files in the view pane. The
-following figure shows a plain text document displayed in the view pane.</para>
+ you can use an image viewer to display Portable Network Graphics (PNG) files
+in the view pane. The following figure shows a PNG file displayed in the view
+pane.</para>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -158,7 +154,7 @@ following figure shows a plain text document displayed in the view pane.</para>
 <listitem><para>Takes less time than when you launch an application.</para>
 </listitem>
 </itemizedlist>
-<para>However, you can not edit a file in the view pane.</para>
+<para>However, you cannot edit a file in the view pane.</para>
 <para>Click on the <guibutton>Reload</guibutton> button to reload the contents
 of the view pane.</para>
 <para><application>Nautilus</application> also includes <glossterm>views</glossterm>
@@ -176,17 +172,6 @@ For more information on views, see <xref linkend="gosnautilus-7"/>.</para>
 </sect2>
 <sect2 id="gosnautilus-540">
 <title>Side Pane</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_folder_navigation_pane.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows side pane. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
 <indexterm><primary>file manager</primary><secondary>side pane</secondary>
 <tertiary>introduction</tertiary></indexterm><indexterm><primary>side pane
 </primary><see>file manager</see></indexterm><para>The side pane can contain
@@ -195,8 +180,8 @@ the following elements:</para>
 <listitem><para>An icon that represents the current file or current folder.
 The side pane also contains information about the current file or current
 folder.</para></listitem>
-<listitem><para>Tabbed panes that enable you to navigate through your files
-and the online help system.</para></listitem>
+<listitem><para>Tabbed panes that enable you to navigate through your files.
+</para></listitem>
 <listitem><para>If a file is displayed in the view pane, buttons appear in
 the side pane. The buttons enable you to perform actions on a file, other
 than the default action.</para></listitem>
@@ -206,12 +191,12 @@ than the default action.</para></listitem>
 <title>Tabbed Panes</title>
 <indexterm><primary>tabbed panes</primary><see>file manager</see></indexterm>
 <indexterm><primary>file manager</primary><secondary>tabbed panes</secondary>
-<tertiary>introduction</tertiary></indexterm><para>The side pane contains
+<tertiary>introduction</tertiary></indexterm><para>The side pane can contain
 the following tabbed panes:</para>
 <itemizedlist>
 <listitem><para><guilabel>History</guilabel></para>
-<para>Contains a history list of files, folders, and URLs that you have recently
-visited.</para></listitem>
+<para>Contains a history list of files, folders, and FTP sites that you have
+recently visited.</para></listitem>
 <listitem><para><guilabel>Notes</guilabel></para>
 <para>Enables you to add notes to your folders.</para></listitem>
 <listitem><para><guilabel>Tree</guilabel></para>
@@ -237,12 +222,12 @@ Action</para></entry></row>
 Click on the tab.</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para>Remove a tab from the side
 pane.</para></entry><entry colname="COLSPEC1" valign="top"><para>Right-click
-in the side pane, then choose the tab that you want to remove from the popup
-menu.</para></entry></row>
+in the side pane, then choose the tab that you want to remove from the menu.
+</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para>Add a tab to the side pane.
 </para></entry><entry colname="COLSPEC1" valign="top"><para>Right-click in
-the side pane, then choose the tab that you want to add from the popup menu.
-</para></entry></row>
+the side pane, then choose the tab that you want to add from the menu.</para></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
@@ -305,7 +290,7 @@ Emblem. This emblem is the <guilabel>Important</guilabel> emblem.</para></entry>
   </textobject>
 </mediaobject>
 </screenshot></entry><entry valign="top"><para>Icon that represents the file.
-This icon contains a preview of the content of the file.</para></entry></row>
+This icon contains a preview of the contents of the file.</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><screenshot>
 <mediaobject>
   <imageobject>
@@ -386,11 +371,11 @@ permission</para></entry></row>
 </sect2>
 </sect1>
 <sect1 id="gosnautilus-24">
-<title>Navigating Your Computer and the Internet</title>
+<title>Navigating Your Computer</title>
 <indexterm><primary>file manager</primary><secondary>navigating</secondary>
 </indexterm><para>Each <application>Nautilus</application> window displays
-the contents of a single file, folder, or URL. This section describes the
-following:</para>
+the contents of a single file, folder, or FTP site. This section describes
+the following:</para>
 <itemizedlist>
 <listitem><para>How to display items in <application>Nautilus</application>
 windows.</para></listitem>
@@ -398,7 +383,7 @@ windows.</para></listitem>
 windows.</para></listitem>
 <listitem><para>How to navigate the files and folders in your file system.
 </para></listitem>
-<listitem><para>How to navigate the Internet.</para></listitem>
+<listitem><para>How to navigate to FTP sites.</para></listitem>
 </itemizedlist>
 <sect2 id="gosnautilus-4">
 <title>To Display Your Home Location</title>
@@ -429,8 +414,6 @@ the <guibutton>Home</guibutton> toolbar button. </para></listitem>
 <para>The <application>Nautilus</application> window displays the contents
 of your home location. To reload the display,  click on the <guibutton>Reload
 </guibutton> button.</para>
-<para>For information on how to set your home location, see <xref linkend="gosnautilus-59"/>. 
-</para>
 </sect2>
 <sect2 id="gosnautilus-25">
 <title>To Display a Folder</title>
@@ -458,7 +441,7 @@ choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Up a Level</guimenuitem>
 button.</para>
 <para>To reload the display, click on the <guibutton>Reload</guibutton> button.
 </para>
-<para>If you can not find the folder that you want to display, you can use <application>
+<para>If you cannot find the folder that you want to display, you can use <application>
 Search Tool</application>. To start <application>Search Tool</application>,
 choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Search for
 Files</guimenuitem></menuchoice>.</para>
@@ -473,23 +456,10 @@ Tree</guilabel> tabbed pane provides a convenient way to navigate your file
 system. By default, the <guilabel>Tree</guilabel> tabbed pane is not displayed
 in your side pane. To add the <guilabel>Tree</guilabel> tabbed pane to the
 side pane, right-click in the side pane, then choose <guimenuitem>Tree</guimenuitem>
-from the popup menu. </para>
-<para>The following figure shows the <guilabel>Tree</guilabel> tabbed pane.
+from the popup menu. </para><para>
+In the <guilabel>Tree</guilabel> tabbed pane, folders are represented as follows:
 </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_tree_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Tree tabbed pane displaying contents of a folder.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para>In the <guilabel>Tree</guilabel> tabbed pane, folders are represented
-as follows:</para>
-<informaltable frame="none">
+<informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0">
 
 <colspec colwidth="42.60*"/><colspec colwidth="57.40*"/>
@@ -560,7 +530,7 @@ one of the following: </para>
 determine the type of a file. If the first lines do not determine the type
 of the file, then <application>Nautilus</application> checks the file extension.
 </para>
-<para>If you can not find the file that you want to open, you can use <application>
+<para>If you cannot find the file that you want to open, you can use <application>
 Search Tool</application>. To start <application>Search Tool</application>,
 choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Search for
 Files</guimenuitem></menuchoice>.</para>
@@ -614,8 +584,8 @@ following parts of the <application>File Types and Programs</application>
 desktop preference tool:<itemizedlist>
 <listitem><para><guilabel>Default action</guilabel> drop-down list box in
 the <guilabel>Edit file type</guilabel> dialog</para></listitem>
-<listitem><para><guilabel>Viewing component</guilabel> drop-down list box
-in the <guilabel>Edit file type</guilabel> dialog</para></listitem>
+<listitem><para><guilabel>Viewer Component</guilabel> drop-down list box in
+the <guilabel>Edit file type</guilabel> dialog</para></listitem>
 </itemizedlist></para></listitem>
 <listitem><para>Choose an action from the <guisubmenu>Open With</guisubmenu>
 submenu.</para></listitem>
@@ -653,8 +623,8 @@ pane. To open the file in the <application>gedit</application> application,
 click on the <guibutton>Open with gedit</guibutton> button.</para>
 <note><para>A button that represents the action does not appear in the side
 pane if the actions are excluded in either of the following dialogs: <itemizedlist>
-<listitem><para><guilabel>Open with Other</guilabel></para></listitem>
-<listitem><para><guilabel>View as Other</guilabel></para></listitem>
+<listitem><para><guilabel>Open with Other Application</guilabel></para></listitem>
+<listitem><para><guilabel>Open with Other Viewer</guilabel></para></listitem>
 </itemizedlist></para>
 </note>
 </sect3>
@@ -685,9 +655,9 @@ GNOME applications. You can also access the <guimenu>Applications</guimenu>
 menu through the <guimenu>GNOME Menu</guimenu> and the Menu Panel.</para>
 </listitem>
 <listitem><para><guilabel>Desktop Preferences</guilabel></para>
-<para>Double-click on <guilabel>Preferences</guilabel> to customize your desktop.
-For more information on how to customize your desktop, see <xref linkend="part2-1"/>.
-</para></listitem>
+<para>Double-click on <guilabel>Desktop Preferences</guilabel> to customize
+your desktop. You can also access the desktop preferences through the <guimenu>
+Applications</guimenu> menu. </para></listitem>
 <listitem><para>Programs that enable you to configure your system as a server,
 and to choose other system settings.</para></listitem>
 </itemizedlist>
@@ -704,27 +674,6 @@ background. The contents of the <guilabel>Start Here</guilabel> location are
 displayed in a <application>Nautilus</application> window.</para></listitem>
 </itemizedlist>
 </sect2>
-<sect2 id="gosnautilus-34">
-<title>To Navigate the World Wide Web</title>
-<indexterm><primary>file manager</primary><secondary>World Wide Web</secondary>
-<see>World Wide Web</see></indexterm><indexterm><primary>World Wide Web</primary>
-<secondary>navigating</secondary></indexterm><para>You can use <application>
-Nautilus</application> as a browser to view websites, but you can only view
-pages that contain HTML code. You can not view pages that contain other types
-of code, for example, JavaScript. </para>
-<para>To view a HTML-only website, enter the URL for the site in the field
-on the location bar, then press <keycap>Return</keycap>. The contents of the
-site are displayed in the view pane. To reload the current page, click on
-the <guibutton>Reload</guibutton> button.</para>
-<para>When you display a website in the view pane, the side pane might contain
-buttons. The buttons represent any actions that you can perform on the web
-page that is displayed in the view pane. To execute an action on the web page,
-click on the button that represents the action.</para>
-<para>For example, when you display a HTML document in the view pane, an <guibutton>
-Open with Netscape</guibutton> button is displayed in the side pane. To open
-the file in <application>Netscape</application>, click on the <guibutton>
-Open with Netscape</guibutton> button.</para>
-</sect2>
 <sect2 id="gosnautilus-37">
 <title>To Access FTP Sites</title>
 <indexterm><primary>FTP sites</primary><secondary>accessing</secondary></indexterm>
@@ -734,22 +683,26 @@ to access FTP sites. To access an FTP site, enter the URL for the site in
 the field on the location bar, then press <keycap>Return</keycap>. The contents
 of the site are displayed in the view pane. To copy a file from the FTP site,
 drag the file to the new location.</para>
+<para>To access an FTP site that requires a username and password, you can
+enter the URL in the following form: </para>
+<para><command>ftp://<replaceable>username</replaceable>:<replaceable>password
+</replaceable>@<replaceable>hostname</replaceable>.<replaceable>domain</replaceable></command></para>
 </sect2>
 <sect2 id="gosnautilus-5">
 <title>Using Your Navigation History</title>
 <indexterm><primary>file manager</primary><secondary>navigating history list
 </secondary></indexterm><para><application>Nautilus</application> maintains
-a history list of files, folders, and URLs. You can use the history list to
-navigate to files, folders, and URLs that you have recently visited. The following
-sections describe how to navigate your history list.</para>
+a history list of files, folders, and FTP sites. You can use the history list
+to navigate to files, folders, and FTP sites that you have recently visited.
+The following sections describe how to navigate your history list.</para>
 <para>To clear your history list choose <menuchoice><guimenu>Go</guimenu>
 <guimenuitem>Clear History</guimenuitem></menuchoice>.</para>
 <sect3 id="gosnautilus-77">
 <title>To Navigate Your History List Using the Go Menu</title>
 <para>To display a list of previously-viewed items, choose the <guimenu>Go
 </guimenu> menu. Your history list is displayed in the lower part of the <guimenu>
-Go</guimenu> menu. To open to an item in your history list, choose the item
-from the <guimenu>Go</guimenu> menu.</para>
+Go</guimenu> menu. To open an item in your history list, choose the item from
+the <guimenu>Go</guimenu> menu.</para>
 </sect3>
 <sect3 id="gosnautilus-78">
 <title>To Navigate Your History List Using the Toolbar</title>
@@ -759,10 +712,14 @@ following actions:</para>
 <listitem><para>To open the previous file, folder, or URL in your history
 list, click on the <guibutton>Back</guibutton> toolbar button.</para></listitem>
 <listitem><para>To open the next file, folder, or URL in your history list,
-click on the <guibutton>Forward</guibutton> toolbar button. </para></listitem>
-<listitem><para>To display a list of previously-viewed items, right-click
-on the <guibutton>Back</guibutton> toolbar button. To open an item from this
-list, click on the item.</para></listitem>
+click on the <guibutton>Forward</guibutton> toolbar button.</para></listitem>
+<listitem><para>To display a list of previously-viewed items, click on the
+down arrow to the right of the <guibutton>Back</guibutton> toolbar button.
+To open an item from this list, click on the item.</para></listitem>
+<listitem><para>To display a list of items that you viewed after you viewed
+the current item, click on the down arrow to the right of the <guibutton>
+Forward</guibutton> toolbar button. To open an item from this list, click
+on the item.</para></listitem>
 </itemizedlist>
 </sect3>
 <sect3 id="gosnautilus-80">
@@ -771,18 +728,7 @@ list, click on the item.</para></listitem>
 <tertiary>History</tertiary></indexterm><para>To display the <guilabel>History
 </guilabel> tabbed pane, click on the <guilabel>History</guilabel> tab in
 the side pane. The <guilabel>History</guilabel> tabbed pane displays a list
-of your previously-viewed items, as shown in the following figure:</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_history_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows History tabbed pane with sample file, folder, and URL locations.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
+of your previously-viewed items.</para>
 <para>To display an item from your history list in the view pane, click on
 the item in the <guilabel>History</guilabel> tabbed pane.</para>
 </sect3>
@@ -794,12 +740,7 @@ the item in the <guilabel>History</guilabel> tabbed pane.</para>
 </secondary></indexterm><para>To access an item in your bookmarks, choose
 the item from the <guimenu>Bookmarks</guimenu> menu. You can add your favorite
 locations to your <guimenu>Bookmarks</guimenu> menu. You can add bookmarks
-to locations on the Internet, or to files and folders in your file system.
-</para>
-<para>By default, <application>Nautilus</application> contains certain bookmarks.
-You can set your <application>Nautilus</application> preferences so that the
-default bookmarks are excluded from the <guimenu>Bookmarks</guimenu> menu.
-For more information, see <xref linkend="gosnautilus-17"/>. </para>
+to files and folders in your file system, or to FTP sites.</para>
 <sect3 id="gosnautilus-40">
 <title>To Add a Bookmark</title>
 <para>To add a bookmark, display the item that you want to bookmark in the
@@ -815,7 +756,7 @@ Edit Bookmarks</guimenuitem></menuchoice>. A <guilabel>Bookmarks</guilabel>
 dialog is displayed. </para></listitem>
 <listitem><para>To edit a bookmark, select the bookmark on the left side of
 the <guilabel>Bookmarks</guilabel> dialog. Edit the details for the bookmark
-on the right side of the <guilabel>Bookmarks</guilabel> dialog as follows:
+on the right side of the <guilabel>Bookmarks</guilabel> dialog, as follows:
 </para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="27.27*"/><colspec
@@ -835,8 +776,8 @@ bookmark in the <guimenu>Bookmarks</guimenu> menu.</para></entry></row>
 </tgroup>
 </informaltable>
 </listitem>
-<listitem><para>To remove a bookmark, select the bookmark on the left  side
-of the dialog. Click <guilabel>Remove</guilabel>. </para></listitem>
+<listitem><para>To delete a bookmark, select the bookmark on the left  side
+of the dialog. Click <guilabel>Delete</guilabel>. </para></listitem>
 </orderedlist>
 </sect3>
 </sect2>
@@ -857,8 +798,8 @@ shows the mouse pointers that appear when you drag-and-drop.</para>
 <table frame="topbot" id="gosnautilus-TBL-11">
 <title>Drag-and-Drop in Nautilus</title>
 <tgroup cols="3" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="36.36*"/>
-<colspec colname="COLSPEC2" colwidth="84.73*"/><colspec colname="COLSPEC1"
-colwidth="42.54*"/>
+<colspec colname="COLSPEC2" colwidth="98.56*"/><colspec colname="COLSPEC1"
+colwidth="28.70*"/>
 <thead>
 <row rowsep="1"><entry valign="top"><para>Task</para></entry><entry colname="COLSPEC2"
 valign="top"><para>Action</para></entry><entry colname="COLSPEC1" valign="top"><para>
@@ -917,6 +858,10 @@ Choose one of the following items from the popup menu:</para><itemizedlist>
 <para>Copies the item to the  location. </para></listitem>
 <listitem><para><guimenuitem>Link here</guimenuitem></para>
 <para>Creates a symbolic link to the item at the location.</para></listitem>
+<listitem><para><guimenuitem>Set as Background</guimenuitem></para>
+<para>If the item is an image, sets the image to be the background wallpaper.
+ You can use this command to set the desktop background and the view pane
+background.</para></listitem>
 <listitem><para><guimenuitem>Cancel</guimenuitem></para>
 <para>Cancels the drag-and-drop operation.</para></listitem>
 </itemizedlist></entry><entry colname="COLSPEC1" valign="top"><screenshot>
@@ -954,10 +899,10 @@ valign="top"><para>Action</para></entry></row>
 <entry colname="COLSPEC2" valign="top"><para>Click on the item.</para></entry>
 </row>
 <row><entry colname="COLSPEC0" valign="top"><para>Select a group of contiguous
-items</para></entry><entry colname="COLSPEC2" valign="top"><para>Press and
-hold <keycap>Shift</keycap>. Click on the first item in the group, then click
-on the last item in the group.</para><para>Alternatively, drag around the
-files that you want to select.</para></entry></row>
+items</para></entry><entry colname="COLSPEC2" valign="top"><para>Press-and-hold <keycap>
+Shift</keycap>. Click on the first item in the group, then click on the last
+item in the group.</para><para>Alternatively, drag around the files that you
+want to select.</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para>Select multiple items</para></entry>
 <entry colname="COLSPEC2" valign="top"><para>Press-and-hold <keycap>Ctrl</keycap>.
 Click on the items that you want to select.</para><para>Alternatively, press-and-hold <keycap>
@@ -1044,8 +989,8 @@ to copy the file or folder.</para></listitem>
 folder to the new location in the other window.</para></listitem>
 </orderedlist>
 <para>To copy the file or folder to a folder that is one level below the current
-location, do not open a new window. Instead, press <keycap>Ctrl</keycap> and
-drag the file or folder to the new location in the same window.</para>
+location, do not open a new window. Instead, press-and-hold <keycap>Ctrl</keycap>
+and drag the file or folder to the new location in the same window.</para>
 </sect3>
 <sect3 id="gosnautilus-441">
 <title>Copy and Paste to the New Location</title>
@@ -1118,7 +1063,7 @@ to <guilabel>Trash</guilabel> perform the following steps:</para>
 <orderedlist>
 <listitem><para>Select the file or folder that you want to move to <guilabel>
 Trash</guilabel> in the view pane.</para></listitem>
-<listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>
+<listitem><para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
 Move to Trash</guimenuitem></menuchoice>. Alternatively, right-click on the
 file or folder in the view pane, then choose <guimenuitem>Move to Trash</guimenuitem>.
 </para></listitem>
@@ -1133,13 +1078,12 @@ the <guilabel>Trash</guilabel> icon on the desktop.</para>
 folder is not moved to <guilabel>Trash</guilabel>, but is deleted from your
 file system immediately. The <guimenuitem>Delete</guimenuitem> menu item is
 only available if you select the <guilabel>Include a Delete command that bypasses
-Trash</guilabel> option in the <guilabel>Preferences</guilabel> dialog. For
-more information on this option, see <xref linkend="gosnautilus-55"/>.</para>
+Trash</guilabel> option in the <guilabel>Preferences</guilabel> dialog. </para>
 <para>To delete a file or folder perform the following steps:</para>
 <orderedlist>
 <listitem><para>Select the file or folder that you want to delete in the view
 pane.</para></listitem>
-<listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>
+<listitem><para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
 Delete</guimenuitem></menuchoice>. Alternatively, right-click on the file
 or folder in the view pane, then choose <guimenuitem>Delete</guimenuitem>.
 </para></listitem>
@@ -1154,7 +1098,7 @@ link, the action is performed on the file or folder to which the symbolic
 link points. However, when you delete a symbolic link, you delete the link
 file, not the file to which the symbolic link points.</para>
 <para>To create a symbolic link to a file or folder, select the file or folder
-to which you want to create a link. Choose <menuchoice><guimenu>File
+to which you want to create a link. Choose <menuchoice><guimenu>Edit
 </guimenu><guimenuitem>Make Link</guimenuitem></menuchoice>. A link to the
 file or folder is added to the current folder. </para>
 <para>Alternatively, press-and-hold <keycap>Shift</keycap>. Drag the item
@@ -1200,9 +1144,9 @@ dialog.</para></listitem>
 <listitem><para>Folders</para></listitem>
 <listitem><para>Desktop background objects</para></listitem>
 </itemizedlist>
-<para>When you move an item to <guilabel>Trash</guilabel>, the item is temporarily
-stored in your <filename>/.Trash</filename> directory. If you need to retrieve
-a file from <guilabel>Trash</guilabel>, you can display <guilabel>Trash</guilabel>
+<para>When you move an item to <guilabel>Trash</guilabel>, the item is stored
+in your <filename>/.Trash</filename> directory. If you need to retrieve a
+file from <guilabel>Trash</guilabel>, you can display <guilabel>Trash</guilabel>
 and move the file out of <guilabel>Trash</guilabel>.</para>
 <para>When you empty <guilabel>Trash</guilabel>, you delete the contents of <guilabel>
 Trash</guilabel> permanently. </para>
@@ -1213,9 +1157,9 @@ Trash</guilabel> permanently. </para>
 ways:</para>
 <itemizedlist>
 <listitem><para>From a <application>Nautilus</application> window</para>
-<para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Show
-Trash</guimenuitem></menuchoice>. The contents of <guilabel>Trash</guilabel>
-are displayed in the window.</para></listitem>
+<para>Choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Trash</guimenuitem>
+</menuchoice>. The contents of <guilabel>Trash</guilabel> are displayed in
+the window.</para></listitem>
 <listitem><para>From the desktop background</para>
 <para>Double-click on the <guilabel>Trash</guilabel> object on the desktop
 background.</para></listitem>
@@ -1237,22 +1181,11 @@ Empty Trash</guimenuitem>.</para></listitem>
 </sect3>
 </sect2>
 <sect2 id="gosnautilus-200">
-<title>Adding Notes to Folders</title>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_notes_tab.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Notes tabbed pane.</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<indexterm><primary>file manager</primary><secondary>tabbed panes</secondary>
-<tertiary>Notes</tertiary></indexterm><indexterm><primary>notes, adding to
-folders</primary></indexterm><para>You can use the <guilabel>Notes</guilabel>
-tab to add a note to a folder. To add a note to a folder perform the following
-steps:</para>
+<title>Adding Notes to Folders</title><indexterm><primary>file manager</primary>
+<secondary>tabbed panes</secondary><tertiary>Notes</tertiary></indexterm>
+<indexterm><primary>notes, adding to folders</primary></indexterm><para>You
+can use the <guilabel>Notes</guilabel> tab to add a note to a folder. To add
+a note to a folder perform the following steps:</para>
 <orderedlist>
 <listitem><para>Display the folder in the view pane.</para></listitem>
 <listitem><para>Click on the <guilabel>Notes</guilabel> tab to open the <guilabel>
@@ -1265,23 +1198,21 @@ opens.</para></listitem>
 </sect1>
 <sect1 id="gosnautilus-440">
 <title>Running Scripts From Nautilus</title>
-<indexterm><primary>file managers</primary><secondary>running scripts</secondary>
+<indexterm><primary>file manager</primary><secondary>running scripts</secondary>
 </indexterm><indexterm><primary>scripts, running from file manager</primary>
 </indexterm><para><application>Nautilus</application> includes a special folder
 where you can store your scripts. When you add an executable file to this
-folder, the file is added to the <menuchoice><guimenu>File</guimenu>
-<guimenuitem>Scripts</guimenuitem></menuchoice> submenu. To run a script choose <menuchoice>
-<guimenu>File</guimenu><guimenuitem>Scripts</guimenuitem></menuchoice>,
-then choose the script that you want to run from the submenu. </para>
+folder, the file is added to the <guisubmenu>Scripts</guisubmenu> submenu.
+To run a script choose <menuchoice><guimenu>File</guimenu><guimenuitem>
+Scripts</guimenuitem></menuchoice>, then choose the script that you want to
+run from the submenu. </para>
 <para>To run a script on a particular file, select the file in the view pane.
 Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Scripts</guimenuitem>
 </menuchoice>, then choose the script that you want to run on the file from
 the submenu. You can also select multiple files to run your scripts on.</para>
 <para>To view the contents of your scripts folder, choose <menuchoice><guimenu>
 File</guimenu><guisubmenu>Scripts</guisubmenu><guimenuitem>
-Open Scripts Folder</guimenuitem></menuchoice>. The <guimenu>Scripts</guimenu>
-folder corresponds to the <filename>$GNOME_BASEDIR/.gnome2/nautilus-scripts
-</filename> directory. </para>
+Open Scripts Folder</guimenuitem></menuchoice>. </para>
 </sect1>
 <sect1 id="gosnautilus-203">
 <title>Modifying the Appearance of Files and Folders</title>
@@ -1292,14 +1223,7 @@ ways, as described in the following sections.</para>
 <sect2 id="gosnautilus-112">
 <title>To Add an Emblem to a File or Folder</title>
 <indexterm><primary>file manager</primary><secondary>emblems</secondary><tertiary>
-adding</tertiary></indexterm><para>You can add an emblem to an item in either
-of the following ways: </para>
-<itemizedlist>
-<listitem><para>Use the <guilabel>Properties</guilabel> dialog.</para></listitem>
-<listitem><para>Use the <guilabel>Backgrounds and Emblems</guilabel> dialog.
-</para></listitem>
-</itemizedlist>
-<para>To add an emblem to an item with the properties dialog, perform the
+adding</tertiary></indexterm><para>To add an emblem to an item perform the
 following steps: </para>
 <orderedlist>
 <listitem><para>Select the item to which you want to add an emblem.</para>
@@ -1307,36 +1231,11 @@ following steps: </para>
 <listitem><para>Right-click on the item, then choose <guimenuitem>Properties
 </guimenuitem>. A properties dialog is displayed.</para></listitem>
 <listitem><para>Click on the <guilabel>Emblems</guilabel> tab to display the <guilabel>
-Emblems</guilabel> tabbed section, as shown in the following figure:</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_prop_emblem_window.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Properties dialog, Emblems tabbed section.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+Emblems</guilabel> tabbed section.</para></listitem>
 <listitem><para>Select the emblem to add to the item.</para></listitem>
 <listitem><para>Click <guibutton>Close</guibutton> to close the properties
 dialog.</para></listitem>
 </orderedlist>
-<para>To add an emblem to an item with the <guilabel>Backgrounds and Emblems
-</guilabel> dialog, perform the following steps: </para>
-<orderedlist>
-<listitem><para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
-Backgrounds and Emblems</guimenuitem></menuchoice>. The <guilabel>Backgrounds
-and Emblems</guilabel> dialog is displayed.</para></listitem>
-<listitem><para>To display a list of emblems that you can add, click on the <guibutton>
-Emblems</guibutton> button.</para></listitem>
-<listitem><para>To add an emblem to an item, drag the emblem to the item.
-</para></listitem>
-<listitem><para>Click <guibutton>Done</guibutton> to close the dialog.</para>
-</listitem>
-</orderedlist>
 </sect2>
 <sect2 id="gosnautilus-51">
 <title>To Modify the Icon for a File or Folder</title>
@@ -1365,16 +1264,16 @@ File Types and Programs</application> desktop preference tool, choose <menuchoic
 </guimenuitem></menuchoice>. </para>
 <para>To restore an icon from a custom icon to the default icon specified
 in the <application>File Types and Programs</application> desktop preference
-tool, right-click on the icon then choose <guimenuitem>Remove Custom Image
+tool, right-click on the icon then choose <guimenuitem>Remove Custom Icon
 </guimenuitem>. Alternatively, click on the <guilabel>Remove Custom Icon</guilabel>
 button on the <guilabel>Properties</guilabel> dialog.</para>
 </sect2>
 <sect2 id="gosnautilus-102">
 <title>To Change the Size of Items in a View</title>
 <indexterm><primary>file manager</primary><secondary>zooming in and out</secondary>
-</indexterm><para>You can change the size of items in a view. You change the
-size if the view displays a file or a folder. You can change the size of items
-in a view in the following ways:</para>
+</indexterm><para>You can change the size of items in a view. You can change
+the size if the view displays a file or a folder. You can change the size
+of items in a view in the following ways:</para>
 <itemizedlist>
 <listitem><para>To enlarge the size of items in a view, choose <menuchoice>
 <guimenu>View</guimenu><guimenuitem>Zoom In</guimenuitem></menuchoice>.
@@ -1446,10 +1345,10 @@ Click on this button to enlarge the size of items in a view.</para></entry>
 </table>
 <para><application>Nautilus</application> remembers the size of items in a
 particular folder. The next time that you display the folder, the items are
-displayed in the size you selected. In other words, when you change the size
-of items in a folder, you customize the folder to display the items at that
-size. To return the size of the items to the default size specified in your
-preferences, choose <menuchoice><guimenu>View</guimenu><guimenuitem>
+displayed in the size that you selected. In other words, when you change the
+size of items in a folder, you customize the folder to display the items at
+that size. To return the size of the items to the default size specified in
+your preferences, choose <menuchoice><guimenu>View</guimenu><guimenuitem>
 Reset View to Defaults</guimenuitem></menuchoice>.</para>
 </sect2>
 <sect2 id="gosnautilus-7">
@@ -1503,22 +1402,22 @@ how to work with icon view, list view, and views of files.</para>
 <title>To Choose a View in Which to Display a File or Folder</title>
 <indexterm><primary>file manager</primary><secondary>views</secondary><tertiary>
 choosing</tertiary></indexterm><para>Choose the type of view in which to display
-the contents of a file or folder from the <guilabel>View</guilabel> menu.
-Alternatively, to choose a view, choose <menuchoice><guimenu>View
+the contents of a file or folder from the <guilabel>View</guilabel> menu. 
+</para>
+<para>Alternatively, to choose a view, choose <menuchoice><guimenu>View
 </guimenu><guimenuitem>View as</guimenuitem></menuchoice>. Select the view
-that you want to use from the <guilabel>View as Other</guilabel> dialog, then
-click on the <guibutton>Choose</guibutton> button. </para>
+that you want to use from the <guilabel>Open with Other Viewer</guilabel>
+dialog, then click on the <guibutton>Choose</guibutton> button. </para>
 <para>You can also choose the type of view from the <guilabel>View as</guilabel>
 drop-down list box. The <guilabel>View as</guilabel> drop-down list box is
 located at the right side of the location bar.</para>
 <para>You can display different folders in different views. <application>
 Nautilus</application> remembers the view that you choose for a particular
 folder. The next time that you display the folder, <application>Nautilus</application>
-displays the folder in that view. In other words, when you choose a view for
-a folder, you customize the folder to always display in that view. To return
-the view for the folder to the default view specified in your preferences,
-choose <menuchoice><guimenu>View</guimenu><guimenuitem>Reset View
-to Defaults</guimenuitem></menuchoice>.</para>
+displays the folder in that view. To return the view for the folder to the
+default view specified in your preferences, choose <menuchoice><guimenu>View
+</guimenu><guimenuitem>Reset View to Defaults</guimenuitem></menuchoice>.
+</para>
 </sect3>
 <sect3 id="gosnautilus-101">
 <title>To Arrange Your Files in Icon View</title>
@@ -1575,7 +1474,7 @@ The most recently modified item is first.</para></entry></row>
 <entry colname="COLSPEC7" valign="top"><para>Select this option to sort the
 items by any emblems that are added to the items. The items are sorted alphabetically
 by emblem name. Items that do not have emblems are last. </para></entry></row>
-<row><entry colname="COLSPEC6" valign="top"><para><guilabel>Tighter Layout
+<row><entry colname="COLSPEC6" valign="top"><para><guilabel>Compact Layout
 </guilabel></para></entry><entry colname="COLSPEC7" valign="top"><para>Select
 this option to arrange the items so that the items are closer to each other.
 </para></entry></row>
@@ -1623,31 +1522,19 @@ of a view in the following ways:</para>
 file or folder.</para></listitem>
 <listitem><para>Specify that the view is the default view for a file type
 or all folders.</para></listitem>
-<listitem><para>Specify that the view is an item in the <guilabel>View as
-</guilabel> drop-down list box for a particular file or folder.</para></listitem>
-<listitem><para>Specify that the view is an item in the <guilabel>View as
-</guilabel> drop-down list box for all of a particular file type or for all
-folders.</para></listitem>
-<listitem><para>Specify that the view is not an item in the <guilabel>View
-as</guilabel> drop-down list box for a particular file or folder.</para></listitem>
+<listitem><para>Specify that the view is an item in the <guisubmenu>View as
+</guisubmenu> submenu for a particular file or folder.</para></listitem>
+<listitem><para>Specify that the view is an item in the <guisubmenu>View as
+</guisubmenu> submenu for all of a particular file type or for all folders.
+</para></listitem>
+<listitem><para>Specify that the view is not an item in the <guisubmenu>View
+as</guisubmenu> submenu for a particular file or folder.</para></listitem>
 </itemizedlist>
 <para>To modify the behavior of a view perform the following steps:</para>
 <orderedlist>
 <listitem><para>Choose <menuchoice><guimenu>View</guimenu><guimenuitem>
-View as</guimenuitem></menuchoice>. A <guilabel>View as Other</guilabel> dialog
-is displayed, as shown in the following figure:</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_viewasother_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows View as Other dialog. Contains: Table of available views. Modify, Go There buttons. 
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-
+View as</guimenuitem></menuchoice>. A <guilabel>Open with Other Viewer</guilabel>
+dialog is displayed.</para>
 </listitem>
 <listitem><para>Select the view that you want to modify from the table in
 the dialog.</para></listitem>
@@ -1664,38 +1551,36 @@ Description </para></entry></row>
 <tbody>
 <row><entry valign="top"><para><guilabel>Include in the menu for <replaceable>
 item_name</replaceable> items</guilabel></para></entry><entry valign="top"><para>
-Select this option to include the view in the <guilabel>View as</guilabel>
-drop-down list box for this type of item.</para></entry></row>
+Select this option to include the view in the <guisubmenu>View as</guisubmenu>
+submenu for this type of item.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Use as default for <replaceable>
 item_name</replaceable> items</guilabel></para></entry><entry valign="top"><para>
 Select this option to use the view as the default for this type of item.</para></entry>
 </row>
-<row><entry valign="top"><para><guilabel>Include in the menu just for <replaceable>
-item_name</replaceable></guilabel></para></entry><entry valign="top"><para>
-Select this option to include the view in the <guilabel>View as</guilabel>
-drop-down list box for this item only.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Use as default just for <replaceable>
-item_name</replaceable></guilabel></para></entry><entry valign="top"><para>
+<row><entry valign="top"><para><guilabel>Include in the menu for <replaceable>
+item_name</replaceable> only</guilabel></para></entry><entry valign="top"><para>
+Select this option to include the view in the <guisubmenu>View as</guisubmenu>
+submenu for this item only.</para></entry></row>
+<row><entry valign="top"><para><guilabel>Use as default for <replaceable>
+item_name</replaceable> only</guilabel></para></entry><entry valign="top"><para>
 Select this option to use the view as the default for this item only.</para></entry>
 </row>
 <row><entry valign="top"><para><guilabel>Don't include in the menu for <replaceable>
 item_name</replaceable> items</guilabel></para></entry><entry valign="top"><para>
-Select this option to exclude the view from the <guilabel>View as</guilabel>
-drop-down list box for this type of item.</para></entry></row>
+Select this option to exclude the view from the <guisubmenu>View as</guisubmenu>
+submenu for this type of item.</para></entry></row>
 </tbody>
 </tgroup>
 </informaltable>
 </listitem>
 <listitem><para>Click <guibutton>OK</guibutton>, then click <guibutton>Cancel
-</guibutton> to close the <guilabel>View as Other</guilabel> dialog.</para>
-</listitem>
+</guibutton> to close the <guilabel>Open with Other Viewer</guilabel> dialog.
+</para></listitem>
 </orderedlist>
 <note><para>You can also modify the actions that are associated with a file
-type in the <application>File Types and Programs</application> desktop preference
-tool. To open the <application>File Types and Programs</application>  preference
-tool from the <guilabel>Open with Other</guilabel> or <guilabel>View as Other
-</guilabel> dialogs, click on the <guibutton>Go There</guibutton> button. 
-</para>
+type in the <application>File Types and Programs</application> preference
+tool. To open the <application>File Types and Programs</application> preference
+tool, click on the <guibutton>Go There</guibutton> button. </para>
 </note>
 </sect3>
 </sect2>
@@ -1727,8 +1612,6 @@ the file type.</para></listitem>
 specifies the format of the file so that Internet browsers and email applications
 can read the file.</para></listitem>
 </itemizedlist>
-<para>For more information on the <application>File Types and Programs</application>
-desktop preference tool, see <xref linkend="goscustdoc-7"/>.</para>
 <sect2 id="gosnautilus-75">
 <title>To Modify Actions</title>
 <indexterm><primary>file manager</primary><secondary>modifying actions</secondary>
@@ -1756,10 +1639,10 @@ a file of that type.</para></listitem>
 Open With</guimenuitem></menuchoice>. Perform either of the following steps:
 </para>
 <itemizedlist>
-<listitem><para>Choose <guimenuitem>An Application</guimenuitem>. An <guilabel>
-Open with Other</guilabel> dialog is displayed. </para></listitem>
-<listitem><para>Choose <guimenuitem>A Viewer</guimenuitem>. A <guilabel>View
-as Other</guilabel> dialog is displayed. </para></listitem>
+<listitem><para>Choose <guimenuitem>Other Application</guimenuitem>. An <guilabel>
+Open with Other Application</guilabel> dialog is displayed. </para></listitem>
+<listitem><para>Choose <guimenuitem>Other Viewer</guimenuitem>. A <guilabel>
+Open with Other Viewer</guilabel> dialog is displayed. </para></listitem>
 </itemizedlist>
 </listitem>
 <listitem><para>From the table in the dialog, select the application or viewer
@@ -1776,24 +1659,24 @@ Description </para></entry></row>
 </thead>
 <tbody>
 <row><entry valign="top"><para><guilabel>Include in the menu for <replaceable>
-file_type</replaceable> items</guilabel></para></entry><entry valign="top"><para>
+filetype</replaceable> items</guilabel></para></entry><entry valign="top"><para>
 Select this option to include the application or viewer in the <guisubmenu>
 Open With</guisubmenu> submenu for this file type.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Use as default for <replaceable>
-file_type</replaceable> items</guilabel></para></entry><entry valign="top"><para>
+filetype</replaceable> items</guilabel></para></entry><entry valign="top"><para>
 Select this option to use the application or viewer as the default action
 for this file type.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Include in the menu just for <replaceable>
-filename</replaceable></guilabel></para></entry><entry valign="top"><para>
+<row><entry valign="top"><para><guilabel>Include in the menu for <replaceable>
+filename</replaceable> only</guilabel></para></entry><entry valign="top"><para>
 Select this option to include the application or viewer in the <guisubmenu>
 Open With</guisubmenu> submenu for this file, and not for other files of this
 type.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Use as default just for <replaceable>
- filename</replaceable></guilabel></para></entry><entry valign="top"><para>
+<row><entry valign="top"><para><guilabel>Use as default for <replaceable>
+filename</replaceable> only</guilabel></para></entry><entry valign="top"><para>
 Select this option to use the application or viewer as the default action
 for this file, and not for other files of this type.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Don't include in the menu for <replaceable>
-file_type</replaceable> items</guilabel></para></entry><entry valign="top"><para>
+filetype</replaceable> items</guilabel></para></entry><entry valign="top"><para>
 Select this option to exclude the application or viewer from the <guisubmenu>
 Open With</guisubmenu> submenu for this file type.</para></entry></row>
 </tbody>
@@ -1804,11 +1687,9 @@ Open With</guisubmenu> submenu for this file type.</para></entry></row>
 </guibutton> to close the dialog. </para></listitem>
 </orderedlist>
 <note><para>You can also modify the actions that are associated with a file
-type in the <application>File Types and Programs</application> desktop preference
+type in the <application>File Types and Programs</application> preference
 tool. To open the <application> File Types and Programs</application>  preference
-tool from the <guilabel>Open with Other</guilabel> or <guilabel>View as Other
-</guilabel> dialogs, click on the <guibutton>Go There</guibutton> button. 
-</para>
+tool, click on the <guibutton>Go There</guibutton> button. </para>
 </note>
 </sect2>
 </sect1>
@@ -1821,52 +1702,42 @@ Nautilus</application>.</para>
 <sect2 id="gosnautilus-17">
 <title>Setting Your Preferences</title>
 <indexterm><primary>file manager</primary><secondary>preferences</secondary>
-<tertiary>introduction</tertiary></indexterm><para>Use the <guilabel>Preferences
-</guilabel> dialog to set preferences for the <application>Nautilus</application>
-windows and desktop. To display the <guilabel>Preferences</guilabel> dialog,
-choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences
-</guimenuitem></menuchoice>.</para>
+<tertiary>introduction</tertiary></indexterm><indexterm><primary>preferences,
+file manager</primary><see>file manager preferences</see></indexterm><para>
+Use the <guilabel>Preferences</guilabel> dialog to set preferences for the <application>
+Nautilus</application> windows and desktop. To display the <guilabel>Preferences
+</guilabel> dialog, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
+Preferences</guimenuitem></menuchoice>.</para>
 <para>You can set preferences in the following categories: </para>
 <itemizedlist>
 <listitem><para>The default settings for views. </para></listitem>
 <listitem><para>The appearance of the <application>Nautilus</application>
 windows and desktop.</para></listitem>
-<listitem><para>The behavior of the <application>Nautilus</application> windows
-and desktop.</para></listitem>
+<listitem><para>The behavior and visible components of new <application>Nautilus
+</application> windows.</para></listitem>
+<listitem><para>The behavior of the desktop background and <guilabel>Trash
+</guilabel>.</para></listitem>
 <listitem><para>The behavior of items in icon views and list views.</para>
 </listitem>
 <listitem><para>The information that is displayed in icon captions.</para>
 </listitem>
 <listitem><para>Items that are displayed in the side pane.</para></listitem>
-<listitem><para>Home location and HTTP proxy details.</para></listitem>
-<listitem><para>Speed tradeoffs to improve the performance of <application>
+<listitem><para>Performance options to improve the performance of <application>
 Nautilus</application>.</para></listitem>
 </itemizedlist>
 <sect3 id="gosnautilus-438">
 <title>To Set View Preferences</title>
 <indexterm><primary>file manager</primary><secondary>preferences</secondary>
-<tertiary>view defaults</tertiary></indexterm><para>You can specify a default
-view, and default settings for icon views and list views. To specify your
-default view settings for <application>Nautilus</application> windows, choose <menuchoice>
+<tertiary>views</tertiary></indexterm><para>You can specify a default view,
+and default settings for icon views and list views. To specify your default
+view settings for <application>Nautilus</application> windows, choose <menuchoice>
 <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
-Choose <guilabel>View Defaults</guilabel> from the <guilabel>Preferences</guilabel>
-dialog.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_view_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, View Defaults section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para><xref linkend="gosnautilus-TBL-30"/> lists the view settings that you
-can modify. The <guilabel>Preferences</guilabel> dialog contains an <guilabel>
-Icon View Defaults</guilabel> group box and a <guilabel>List View Defaults
-</guilabel> group box. The group boxes contain mostly the same dialog elements.
-Each dialog element is described once in <xref linkend="gosnautilus-TBL-30"/>.
+Choose <guilabel>Views</guilabel> from the <guilabel>Preferences</guilabel>
+dialog.</para><para><xref linkend="gosnautilus-TBL-30"/> lists the view settings
+that you can modify. The <guilabel>Preferences</guilabel> dialog contains
+an <guilabel>Icon View Defaults</guilabel> group box and a <guilabel>List
+View Defaults</guilabel> group box. The group boxes contain mostly the same
+dialog elements. Each dialog element is described once in <xref linkend="gosnautilus-TBL-30"/>.
 </para>
 <table frame="topbot" id="gosnautilus-TBL-30">
 <title>View Preferences</title>
@@ -1888,15 +1759,15 @@ the items in folders that are displayed in this view.</para></entry></row>
 </guilabel></para></entry><entry colname="COLSPEC1" valign="top"><para>Select
 the default zoom level for folders that are displayed in this view. The zoom
 level specifies the size of items in a view.</para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Sort in reversed
-order</guilabel></para></entry><entry colname="COLSPEC1" valign="top"><para>
-Select this option if you want to reverse the order by which items are sorted
-in this view. If you select this option, the order of the characteristic you
-select in <guilabel>Layout items</guilabel> is reversed. For example, if you
-select <guilabel>By Name</guilabel> from the <guilabel>Layout items</guilabel>
+<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Sort in reverse
+</guilabel></para></entry><entry colname="COLSPEC1" valign="top"><para>Select
+this option if you want to reverse the order by which items are sorted in
+this view. If you select this option, the order of the characteristic you
+select in <guilabel>Arrange Items</guilabel> is reversed. For example, if
+you select <guilabel>By Name</guilabel> from the <guilabel>Arrange Items</guilabel>
 drop-down list box. You can select the <guilabel>Sort in reversed order</guilabel>
 option to sort the items in reverse alphabetical order.</para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Use tighter layout
+<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Use compact layout
 </guilabel></para></entry><entry colname="COLSPEC1" valign="top"><para>Icon
 view only. Select this option to arrange the items so that the items in the
 folder are closer to each other.</para></entry></row>
@@ -1905,32 +1776,17 @@ folder are closer to each other.</para></entry></row>
 </table>
 </sect3>
 <sect3 id="gosnautilus-54">
-<title>To Set Font and Theme Preferences</title>
+<title>To Select a Nautilus Theme</title>
 <indexterm><primary>file manager</primary><secondary>preferences</secondary>
-<tertiary>font</tertiary></indexterm><indexterm><primary>file manager</primary>
-<secondary>preferences</secondary><tertiary>theme</tertiary></indexterm><para>
-You can select the font that <application>Nautilus</application> uses in windows
-and the desktop background. <application>Nautilus</application> also includes
-themes that you can use to change the look-and-feel of the <application>Nautilus
-</application> windows and the desktop background.</para>
-<para>To set your preferences for the font and theme of the <application>
-Nautilus</application> windows and desktop background, choose <menuchoice>
-<guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
-Choose <guilabel>Appearance</guilabel> from the <guilabel>Preferences</guilabel>
-dialog.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_appear_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, Appearance section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para><xref linkend="gosnautilus-TBL-35"/> lists the font and theme settings
-that you can modify. </para>
+<tertiary>theme</tertiary></indexterm><para><application>Nautilus</application>
+includes themes that you can use to change the look-and-feel of the <application>
+Nautilus</application> windows and the desktop background. To set your preferences
+for the font and theme of the <application>Nautilus</application> windows
+and desktop background, choose <menuchoice><guimenu>Edit</guimenu>
+<guimenuitem>Preferences</guimenuitem></menuchoice>. Choose <guilabel>Appearance
+</guilabel> from the <guilabel>Preferences</guilabel> dialog.</para>
+<para><xref linkend="gosnautilus-TBL-35"/> lists the font and
+theme settings that you can modify. </para>
 <table frame="topbot" id="gosnautilus-TBL-35">
 <title>Appearance Preferences</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="35.09*"/>
@@ -1943,13 +1799,11 @@ valign="top"><para>Description </para></entry></row>
 <row><entry valign="top"><para><guilabel>Nautilus Themes</guilabel></para></entry>
 <entry valign="top"><para>To change your <application>Nautilus</application>
 theme, choose a theme from the list.</para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><guibutton>Add New Theme
-</guibutton></para></entry><entry colname="COLSPEC1" valign="top"><para>To
-add a new <application>Nautilus</application> theme, click on the <guibutton>
-Add New Theme</guibutton> button. A dialog is displayed. Use the dialog to
-find the new theme.</para><para><application>Nautilus</application> themes
-are stored as directories in the <filename>$GNOME_BASEDIR/share/pixmaps/nautilus/
-</filename> directory.  </para></entry></row>
+<row><entry colname="COLSPEC0" valign="top"><para><guibutton>Add Theme</guibutton></para></entry>
+<entry colname="COLSPEC1" valign="top"><para>To add a new <application>Nautilus
+</application> theme, click on the <guibutton>Add New Theme</guibutton> button.
+A dialog is displayed. Use the dialog to find the new theme.</para></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
@@ -1958,23 +1812,12 @@ are stored as directories in the <filename>$GNOME_BASEDIR/share/pixmaps/nautilus
 <title>To Set Preferences for New Windows</title>
 <indexterm><primary>file manager</primary><secondary>preferences</secondary>
 <tertiary>new windows</tertiary></indexterm><para>To set your preferences
-for the <application>Nautilus</application> windows and desktop, choose <menuchoice>
-<guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
+for new <application>Nautilus</application> windows, choose <menuchoice><guimenu>
+Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
 Choose <guilabel>Windows</guilabel> from the <guilabel>Preferences</guilabel>
 dialog.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_window_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, Windows section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para><xref linkend="gosnautilus-TBL-36"/> lists the windows settings that
-you can modify. </para>
+<para><xref linkend="gosnautilus-TBL-36"/> lists the window settings
+that you can modify. </para>
 <table frame="topbot" id="gosnautilus-TBL-36">
 <title>New Window Preferences</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC8" colwidth="35.09*"/>
@@ -1988,19 +1831,19 @@ Description </para></entry></row>
 or folder in a separate window</guilabel></para></entry><entry colname="COLSPEC9"
 valign="top"><para>Select this option to open a new window when you open a
 file or folder.</para></entry></row>
-<row><entry colname="COLSPEC8"><para><guilabel>Display side bar in new windows
-</guilabel></para></entry><entry colname="COLSPEC9"><para>Select this option
-to display a side pane in new windows.</para></entry></row>
+<row><entry colname="COLSPEC8"><para><guilabel>Display side pane</guilabel></para></entry>
+<entry colname="COLSPEC9"><para>Select this option to display a side pane
+in new windows.</para></entry></row>
 <row><entry colname="COLSPEC8" valign="top"><para><guilabel>Display toolbar
-in new windows</guilabel></para></entry><entry colname="COLSPEC9" valign="top"><para>
-Select this option to display a toolbar in new windows.</para></entry></row>
+</guilabel></para></entry><entry colname="COLSPEC9" valign="top"><para>Select
+this option to display a toolbar in new windows.</para></entry></row>
 <row><entry colname="COLSPEC8" valign="top"><para><guilabel>Display location
-bar in new windows</guilabel></para></entry><entry colname="COLSPEC9" valign="top"><para>
+bar</guilabel></para></entry><entry colname="COLSPEC9" valign="top"><para>
 Select this option to display a location bar in new windows.</para></entry>
 </row>
-<row><entry colname="COLSPEC8" valign="top"><para><guilabel>Display status
-bar in new windows</guilabel></para></entry><entry colname="COLSPEC9" valign="top"><para>
-Select this option to display a statusbar in new windows.</para></entry></row>
+<row><entry colname="COLSPEC8" valign="top"><para><guilabel>Display statusbar
+</guilabel></para></entry><entry colname="COLSPEC9" valign="top"><para>Select
+this option to display a statusbar in new windows.</para></entry></row>
 </tbody>
 </tgroup>
 </table>
@@ -2017,19 +1860,8 @@ Nautilus</application> desktop background and <guilabel>Trash</guilabel>,
 choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences
 </guimenuitem></menuchoice>. Choose <guilabel>Desktop &amp; Trash</guilabel>
 from the <guilabel>Preferences</guilabel> dialog.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_trash_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, Desktop and Trash section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para><xref linkend="gosnautilus-TBL-43"/> lists the desktop background and <guilabel>
-Trash</guilabel> settings that you can modify. </para>
+<para><xref linkend="gosnautilus-TBL-43"/> lists the desktop background
+and <guilabel>Trash</guilabel> settings that you can modify. </para>
 <table frame="topbot" id="gosnautilus-TBL-43">
 <title>Windows and Desktop Background Preferences</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC8" colwidth="35.09*"/>
@@ -2042,11 +1874,12 @@ Description </para></entry></row>
 <row><entry valign="top"><para><guilabel>Use Nautilus to draw the desktop
 </guilabel></para></entry><entry valign="top"><para>Select this option to
 use <application> Nautilus</application> to manage your desktop. If you do
-not use <application>Nautilus</application> to manage your desktop, you can
-not do the following: </para><itemizedlist>
-<listitem><para>Use the <guimenu>File Manager</guimenu> menu.</para></listitem>
+not use <application>Nautilus</application> to manage your desktop, you cannot
+do the following: </para><itemizedlist>
+<listitem><para>Use the <guimenu>Desktop Background</guimenu> menu.</para>
+</listitem>
 <listitem><para>Use <application>Nautilus</application> to change the pattern
-or color of the desktop. </para></listitem>
+or color of the desktop background. </para></listitem>
 <listitem><para>Use the <application>Nautilus</application> <guilabel> Home
 </guilabel> launcher and <guilabel>Trash</guilabel> launcher. The <guilabel>
 Home</guilabel> launcher and <guilabel>Trash</guilabel> launcher are not displayed
@@ -2055,17 +1888,17 @@ on the desktop. </para></listitem>
 <row><entry colname="COLSPEC8" valign="top"><para><guilabel>Use your home
 folder as the desktop</guilabel></para></entry><entry colname="COLSPEC9" valign="top"><para>
 Select this option to use your home directory as the desktop background directory,
-instead of the default desktop background directory, <filename>/.nautilus/desktop
-</filename>. If you select this option, the contents of your home directory
-are displayed as desktop background objects.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Ask before emptying the Trash</guilabel></para></entry>
-<entry valign="top"><para>Select this option to display a confirmation message
-before <guilabel>Trash</guilabel> is emptied. </para></entry></row>
+instead of the default directory. If you select this option, the contents
+of your home directory are displayed as desktop background objects.</para></entry></row>
+<row><entry valign="top"><para><guilabel>Ask before emptying the Trash or
+deleting files</guilabel></para></entry><entry valign="top"><para>Select this
+option to display a confirmation message before <guilabel>Trash</guilabel>
+is emptied, or files are deleted. </para></entry></row>
 <row><entry colname="COLSPEC8" valign="top"><para><guilabel>Include a Delete
 command that bypasses Trash</guilabel></para></entry><entry colname="COLSPEC9"
 valign="top"><para>Select this option to add a <guimenuitem>Delete</guimenuitem>
 menu item to the following menus:</para><itemizedlist>
-<listitem><para>The <guimenu>File</guimenu> menu.</para></listitem>
+<listitem><para>The <guimenu>Edit</guimenu> menu.</para></listitem>
 <listitem><para>The popup menu that is displayed when you right-click on a
 file, folder, or desktop background object. </para></listitem>
 </itemizedlist><para>When you select an item then choose the <guimenuitem>
@@ -2078,28 +1911,17 @@ immediately.</para></entry></row>
 <sect3 id="gosnautilus-56">
 <title>To Set Icon and List Views Preferences</title>
 <indexterm><primary>file manager</primary><secondary>preferences</secondary>
-<tertiary>views</tertiary></indexterm><indexterm><primary>file manager</primary>
-<secondary>views</secondary><tertiary>preferences</tertiary></indexterm><indexterm>
-<primary>file manager</primary><secondary>icon view</secondary><tertiary>
-preferences</tertiary></indexterm><indexterm><primary>file manager</primary>
-<secondary>list view</secondary><tertiary>preferences</tertiary></indexterm>
-<para>To set your preferences for items in icon views and list views, choose <menuchoice>
-<guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
-Choose <guilabel>Icon &amp; List Views</guilabel> from the <guilabel>Preferences
-</guilabel> dialog.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_icon_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, Icon and List Views section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para><xref linkend="gosnautilus-TBL-37"/> lists the settings that you can
-modify for items in icon views and list views. </para>
+<tertiary>icon and list views</tertiary></indexterm><indexterm><primary>file
+manager</primary><secondary>views</secondary><tertiary>preferences</tertiary>
+</indexterm><indexterm><primary>file manager</primary><secondary>icon view
+</secondary><tertiary>preferences</tertiary></indexterm><indexterm><primary>
+file manager</primary><secondary>list view</secondary><tertiary>preferences
+</tertiary></indexterm><para>To set your preferences for items in icon views
+and list views, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>
+Preferences</guimenuitem></menuchoice>. Choose <guilabel>Icon &amp; List Views
+</guilabel> from the <guilabel>Preferences</guilabel> dialog.</para>
+<para><xref linkend="gosnautilus-TBL-37"/> lists the settings
+that you can modify for items in icon views and list views. </para>
 <table frame="topbot" id="gosnautilus-TBL-37">
 <title>Icon and List Views Preferences</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC6" colwidth="35.09*"/>
@@ -2132,25 +1954,26 @@ choose the executable file.</para></entry></row>
 this option to display a dialog when you choose an executable file. The dialog
 asks whether you want to execute the file or display the file. </para></entry>
 </row>
-<row><entry colname="COLSPEC6" valign="top"><para><guilabel>Show hidden files
-</guilabel></para></entry><entry colname="COLSPEC7" valign="top"><para>Select
-this option to display hidden files in the view pane. The first character
-in a hidden file name is a period (.).</para></entry></row>
-<row><entry colname="COLSPEC6" valign="top"><para><guilabel>Show backup files
-</guilabel></para></entry><entry colname="COLSPEC7" valign="top"><para>Select
-this option to display backup files in the view pane. The last character in
-a backup file name is a tilde (~).</para></entry></row>
-<row><entry valign="top"><para><guilabel>Show special flags in Properties
-window</guilabel></para></entry><entry valign="top"><para>Select this option
-to show the following special flags in the <guilabel>Permissions</guilabel>
-tab on a properties dialog:</para><itemizedlist>
+<row><entry colname="COLSPEC6" valign="top"><para><guilabel>Hidden files</guilabel></para></entry>
+<entry colname="COLSPEC7" valign="top"><para>Select this option to display
+hidden files in the view pane. The first character in a hidden file name is
+a period (.).</para></entry></row>
+<row><entry colname="COLSPEC6" valign="top"><para><guilabel>Backup files</guilabel></para></entry>
+<entry colname="COLSPEC7" valign="top"><para>Select this option to display
+backup files in the view pane. The last character in a backup file name is
+a tilde (~).</para></entry></row>
+<row><entry valign="top"><para><guilabel>Special flags in Properties dialog
+</guilabel></para></entry><entry valign="top"><para>Select this option to
+show the following special flags in the <guilabel>Permissions</guilabel> tab
+on a properties dialog:</para><itemizedlist>
 <listitem><para><guilabel>Set User ID</guilabel></para></listitem>
 <listitem><para><guilabel>Set Group ID</guilabel></para></listitem>
 <listitem><para><guilabel>Sticky</guilabel></para></listitem>
 </itemizedlist></entry></row>
-<row><entry colname="COLSPEC6" valign="top"><para><guilabel>Always list folders
-before files</guilabel></para></entry><entry colname="COLSPEC7" valign="top"><para>
-Select this option to list folders before files.</para></entry></row>
+<row><entry colname="COLSPEC6" valign="top"><para><guilabel>Folders before
+files</guilabel></para></entry><entry colname="COLSPEC7" valign="top"><para>
+Select this option to list folders before files when you sort a folder.</para></entry>
+</row>
 </tbody>
 </tgroup>
 </table>
@@ -2170,22 +1993,11 @@ information is displayed in icon captions. </para>
 Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
 Choose <guilabel>Icon Captions</guilabel> from the <guilabel>Preferences</guilabel>
 dialog.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_iconcaptions_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, Icon Captions section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para>Select the items of information that you want to display in the icon
-caption from the three drop-down list boxes. Select the first item from the
-first drop-down list box, select the second item from the second drop-down
-list box, and so on. The following table describes the items of information
-that you can select:</para>
+<para>Select the items of information that you want to display
+in the icon caption from the three drop-down list boxes. Select the first
+item from the first drop-down list box, select the second item from the second
+drop-down list box, and so on. The following table describes the items of
+information that you can select:</para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="35.09*"/>
 <colspec colname="COLSPEC1" colwidth="64.91*"/>
@@ -2247,21 +2059,10 @@ no information for the item.</para></entry></row>
 </primary><secondary>side pane</secondary><tertiary>preferences</tertiary>
 </indexterm><para>To set your preferences for the side pane, choose <menuchoice>
 <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
-Choose <guilabel>Sidebar Panels</guilabel> from the <guilabel>Preferences
-</guilabel> dialog. </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_sidebar_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, Sidebar Panels section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para><xref linkend="gosnautilus-TBL-38"/> lists the side pane settings that
-you can modify. </para>
+Choose <guilabel>Side Panes</guilabel> from the <guilabel>Preferences</guilabel>
+dialog. </para>
+<para><xref linkend="gosnautilus-TBL-38"/> lists the side pane
+settings that you can modify. </para>
 <table frame="topbot" id="gosnautilus-TBL-38">
 <title>Side Pane Preferences</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC4" colwidth="35.09*"/>
@@ -2271,83 +2072,31 @@ you can modify. </para>
 Description </para></entry></row>
 </thead>
 <tbody>
-<row><entry colname="COLSPEC4" valign="top"><para><guilabel>Display History
-tab in sidebar</guilabel></para></entry><entry colname="COLSPEC5" valign="top"><para>
- Select this option to display the <guilabel>History</guilabel> tab in the
-side pane.</para></entry></row>
-<row><entry colname="COLSPEC4" valign="top"><para><guilabel>Display Notes
-tab in sidebar</guilabel></para></entry><entry colname="COLSPEC5" valign="top"><para>
- Select this option to display the <guilabel>Notes</guilabel> tab in the side
-pane.</para></entry></row>
-<row><entry colname="COLSPEC4" valign="top"><para><guilabel>Display Tree tab
-in sidebar</guilabel></para></entry><entry colname="COLSPEC5" valign="top"><para>
- Select this option to display the <guilabel>Tree</guilabel> tab in the side
-pane.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Show only folders (no files) in the
-tree</guilabel></para></entry><entry valign="top"><para>Select this option
-to display only folders in the <guilabel>Tree</guilabel> tabbed pane.</para></entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-</sect3>
-<sect3 id="gosnautilus-59">
-<title>To Set Navigation Preferences</title>
-<indexterm><primary>file manager</primary><secondary>preferences</secondary>
-<tertiary>navigation</tertiary></indexterm><indexterm><primary>World Wide
-Web</primary><secondary>navigation preferences</secondary></indexterm><para>
-To set navigation preferences, choose <menuchoice><guimenu>Edit</guimenu>
-<guimenuitem>Preferences</guimenuitem></menuchoice>. Choose <guilabel>Navigation
-</guilabel> from the <guilabel>Preferences</guilabel> dialog.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_navigation_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, Navigation section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para><xref linkend="gosnautilus-TBL-40"/> lists the navigation settings that
-you can modify. </para>
-<table frame="topbot" id="gosnautilus-TBL-40">
-<title>Navigation Preferences</title>
-<tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC2" colwidth="35.09*"/>
-<colspec colname="COLSPEC3" colwidth="64.91*"/>
-<thead>
-<row rowsep="1"><entry valign="top"><para>Dialog Element</para></entry><entry
-valign="top"><para>Description </para></entry></row>
-</thead>
-<tbody>
-<row><entry valign="top"><para><guilabel>Home Location</guilabel></para></entry>
-<entry valign="top"><para>Enter the location that you want to use as your
-home page. Enter your home location as follows:</para><itemizedlist>
-<listitem><para>To specify a web page as your home location, enter the URL
-in the <guilabel>Home Location</guilabel> field.</para></listitem>
-<listitem><para>To specify a file or folder as your home location, enter the
-path in the <guilabel>Home Location</guilabel> field. </para></listitem>
-</itemizedlist></entry></row>
-<row><entry valign="top"><para><guilabel>Don't include the built-in bookmarks
-in the Bookmarks menu</guilabel></para></entry><entry valign="top"><para>
-Select this option to exclude the default bookmarks that are supplied with <application>
-Nautilus </application> from the <guimenu>Bookmarks</guimenu> menu.</para></entry>
-</row>
+<row><entry colname="COLSPEC4" valign="top"><para><guilabel>History</guilabel></para></entry>
+<entry colname="COLSPEC5" valign="top"><para> Select this option to display
+the <guilabel>History</guilabel> tab in the side pane.</para></entry></row>
+<row><entry colname="COLSPEC4" valign="top"><para><guilabel>Notes</guilabel></para></entry>
+<entry colname="COLSPEC5" valign="top"><para> Select this option to display
+the <guilabel>Notes</guilabel> tab in the side pane.</para></entry></row>
+<row><entry colname="COLSPEC4" valign="top"><para><guilabel>Tree</guilabel></para></entry>
+<entry colname="COLSPEC5" valign="top"><para> Select this option to display
+the <guilabel>Tree</guilabel> tab in the side pane.</para></entry></row>
+<row><entry valign="top"><para><guilabel>Show folders only</guilabel></para></entry>
+<entry valign="top"><para>Select this option to display only folders in the <guilabel>
+Tree</guilabel> tabbed pane.</para></entry></row>
 </tbody>
 </tgroup>
 </table>
 </sect3>
 <sect3 id="gosnautilus-60">
-<title>To Set Speed Tradeoffs Preferences</title>
+<title>To Set Performance Preferences</title>
 <indexterm><primary>file manager</primary><secondary>preferences</secondary>
-<tertiary>speed tradeoffs</tertiary></indexterm><para>Some <application>Nautilus
+<tertiary>performance</tertiary></indexterm><para>Some <application>Nautilus
 </application> features can affect the speed with which <application>Nautilus
 </application> responds to your requests. You can modify the behavior of some
 of these features to improve the speed of <application>Nautilus</application>.
-In this way, you can exchange, or trade off, a <application>Nautilus</application>
-feature for better performance. For each of the speed tradeoff preferences,
-you can select one of the options described in the following table:</para>
+For each performance preference, you can select one of the options described
+in the following table:</para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="35.09*"/><colspec
 colwidth="64.91*"/>
@@ -2359,7 +2108,7 @@ Description </para></entry></row>
 <row><entry valign="top"><para><guilabel>Always</guilabel></para></entry>
 <entry valign="top"><para>Performs the action for both local files, and files
 on other file systems.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Local Files Only</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Local File Only</guilabel></para></entry>
 <entry valign="top"><para>Performs the action for local files only.</para></entry>
 </row>
 <row><entry valign="top"><para><guilabel>Never</guilabel></para></entry><entry
@@ -2369,21 +2118,10 @@ valign="top"><para>Never performs the action. </para></entry></row>
 </informaltable>
 <para>To set your speed tradeoff preferences, choose <menuchoice><guimenu>
 Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
-Choose <guilabel>Speed Tradeoffs</guilabel> from the <guilabel>Preferences
-</guilabel> dialog.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/naut_pref_speed_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Preferences dialog, Speed Tradeoffs section. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-<para><xref linkend="gosnautilus-TBL-41"/> lists the speed tradeoff settings
-that you can modify.</para>
+Choose <guilabel>Performance</guilabel> from the <guilabel>Preferences</guilabel>
+dialog.</para>
+<para><xref linkend="gosnautilus-TBL-41"/> lists the speed tradeoff
+settings that you can modify.</para>
 <table frame="topbot" id="gosnautilus-TBL-41">
 <title>Speed Tradeoff Preferences</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="35.09*"/>
@@ -2397,7 +2135,7 @@ valign="top"><para>Description </para></entry></row>
 <entry valign="top"><para>Select an option to specify when to preview the
 content of text files in the icon that represents the file. </para></entry>
 </row>
-<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Show Count of
+<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Show Number of
 Items in Folders</guilabel></para></entry><entry colname="COLSPEC1" valign="top"><para>
 Select an option to specify when to show the number of items in folders.</para></entry>
 </row>
@@ -2406,7 +2144,7 @@ for Image Files</guilabel></para></entry><entry colname="COLSPEC1" valign="top">
 Select an option to specify when to show thumbnails of image files. <application>
 Nautilus</application> stores the thumbnail files for each folder in a <filename>
 .thumbnails</filename> directory that is one level below the folder.</para><para><guilabel>
-Don't make thumbnails for files larger than</guilabel>: Specify the maximum
+Do not make thumbnails for files larger than</guilabel>: Specify the maximum
 file size for files for which <application>Nautilus</application> creates
 a thumbnail.</para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para><guilabel>Preview Sound
@@ -2444,9 +2182,15 @@ the colors that you can use on the background, click on the <guibutton>Colors
 <listitem><para>To change the background to a pattern, drag the pattern to
 the screen component. To change the background to a color, drag the color
 to the screen component. </para></listitem>
-<listitem><para>Click <guibutton>Done</guibutton> to close the dialog.</para>
+<listitem><para>Click <guibutton>Close</guibutton> to close the dialog.</para>
 </listitem>
 </orderedlist>
+<para>Alternatively, you can right-click on the background of the side pane
+and the view pane, then choose <guimenuitem>Change Background</guimenuitem>.
+The <guilabel>Backgrounds and Emblems</guilabel> dialog is displayed. To reset
+the pane background to the default background, right-click on the background
+of the pane, then choose <guimenuitem>Use Default Background</guimenuitem>.
+</para>
 <para>When you change the background of the side pane or the view pane of
 a particular folder, <application>Nautilus</application> remembers the background
 that you chose. The next time that you display the folder, the background
@@ -2482,27 +2226,26 @@ and hiding</secondary></indexterm><para>You can show and hide <application>
 Nautilus</application> window components as follows: </para>
 <itemizedlist>
 <listitem><para>To hide the side pane, choose <menuchoice><guimenu>View
-</guimenu><guimenuitem>Hide Sidebar</guimenuitem></menuchoice>. To display
-the side pane again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>
-Show Sidebar</guimenuitem></menuchoice>. </para></listitem>
+</guimenu><guimenuitem>Side Pane</guimenuitem></menuchoice>. To display the
+side pane again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>
+Side Pane</guimenuitem></menuchoice> again. </para></listitem>
 <listitem><para>To hide the toolbar, choose <menuchoice><guimenu>View
-</guimenu><guimenuitem>Hide Toolbar</guimenuitem></menuchoice>. To display
-the toolbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>
-Show Toolbar</guimenuitem></menuchoice>. </para></listitem>
+</guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>. To display the
+toolbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>
+Toolbar</guimenuitem></menuchoice> again. </para></listitem>
 <listitem><para>To hide the location bar, choose <menuchoice><guimenu>View
-</guimenu><guimenuitem>Hide Location Bar</guimenuitem></menuchoice>. To display
+</guimenu><guimenuitem>Location Bar</guimenuitem></menuchoice>. To display
 the location bar again, choose <menuchoice><guimenu>View</guimenu>
-<guimenuitem>Show Location Bar</guimenuitem></menuchoice>.</para></listitem>
+<guimenuitem>Location Bar</guimenuitem></menuchoice> again.</para></listitem>
 <listitem><para>To hide the statusbar, choose <menuchoice><guimenu>View
-</guimenu><guimenuitem>Hide Status Bar</guimenuitem></menuchoice>. To display
-the statusbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>
-Show Status Bar</guimenuitem></menuchoice>. </para></listitem>
+</guimenu><guimenuitem>Statusbar</guimenuitem></menuchoice>. To display the
+statusbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>
+Statusbar</guimenuitem></menuchoice> again. </para></listitem>
 <listitem><para>To remove a tab from the side pane, right-click in the side
 pane. Choose the tab that you want to remove from the popup menu. To add the
 tab to the side pane again, choose the tab from the popup menu again.</para>
 </listitem>
 </itemizedlist>
 </sect2>
-</sect1>
-</chapter>
+</sect1></chapter>
 
diff --git a/gnome2-user-guide/C/gosoverview-C.omf b/gnome2-user-guide/C/gosoverview-C.omf
index 69545bc..4f9b22d 100644
--- a/gnome2-user-guide/C/gosoverview-C.omf
+++ b/gnome2-user-guide/C/gosoverview-C.omf
@@ -16,10 +16,10 @@
       Overview
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Overview chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index 83ad6c2..d6d5701 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -38,8 +38,8 @@ Menu Panel stretches the full width of the top edge of the desktop. The Menu
 Panel includes two special menus, as follows:</para>
 <itemizedlist>
 <listitem><para><guimenu>Applications</guimenu> menu: Contains all applications
-and configuration tools. This menu also includes the file manager and help
-browser.</para></listitem>
+and configuration tools. This menu also includes the file manager and the
+help browser.</para></listitem>
 <listitem><para><guimenu>Actions</guimenu> menu: Contains various desktop
 commands, for example <guimenuitem>Search for Files</guimenuitem> and <guimenuitem>
 Log Out</guimenuitem>. </para></listitem>
@@ -51,9 +51,11 @@ a list of all open windows on the desktop.</para></listitem>
 menus, so you can use a combination of menus and panels to perform your tasks.
 You can use the <guimenu>Applications</guimenu> menu and the <guimenu>Actions
 </guimenu> menu to access almost all of the applications, commands, and configuration
-options on your desktop. You can also access the items in the <guimenu>Applications
-</guimenu> and <guimenu>Actions</guimenu> menus from the <guimenu>GNOME Menu
-</guimenu>.</para></listitem>
+options on your desktop. </para>
+<para>You can also access the items in the <guimenu>Applications</guimenu>
+and <guimenu>Actions</guimenu> menus from the <guimenu>GNOME Menu</guimenu>.
+The items in the <guimenu>Actions</guimenu> menu are at the top level of the <guimenu>
+GNOME Menu</guimenu>. </para></listitem>
 <listitem><para>Windows</para>
 <para>You can display many windows at the same time on your desktop. You can
 run different applications in each window. The window manager provides frames
@@ -61,9 +63,8 @@ and buttons for windows. The window manager enables you to perform standard
 actions such as move, close, and resize windows. </para></listitem>
 <listitem><para>Workspaces</para>
 <para>You can subdivide your desktop into separate <glossterm>workspaces</glossterm>.
-A workspace is a discrete area on the desktop in which you can work. When
-you start a desktop session for the first time, you have four workspaces.
-You can create more workspaces on the desktop. You can switch to a different
+A workspace is a discrete area on the desktop in which you can work. You can
+specify the number of workspaces on your desktop. You can switch to a different
 workspace, but you can only display one workspace at a time on the screen.
 </para></listitem>
 <listitem><para><application>Nautilus</application> file manager</para>
@@ -82,9 +83,9 @@ right-click on the background to open a menu.</para></listitem>
 <listitem><para><guilabel>Start Here</guilabel> location</para>
 <para>The <guilabel>Start Here</guilabel> location provides an access point
 to some of the key features of the GNOME desktop. You can access your GNOME
-applications and configuration tools. You can also access programs that enable
-you to configure your system as a server, and to choose other system settings.
-</para></listitem>
+applications and configuration tools from the <guilabel>Start Here</guilabel>
+location. You can also access programs that enable you to configure your system
+as a server, and to choose other system settings.</para></listitem>
 <listitem><para>Desktop preferences</para>
 <para>The GNOME desktop contains dedicated <glossterm>preference tools</glossterm>.
 Each tool controls a particular part of the behavior of the desktop. To start
@@ -106,8 +107,8 @@ work with the desktop. </para>
 <sect1 id="gosoverview-502">
 <title>Panels</title>
 <indexterm><primary>panels</primary><secondary>overview</secondary></indexterm>
-<para>You can add and delete panels at any time. When you start a session
-for the first time, the desktop usually contains at least two panels, as follows:
+<para>You can add or delete panels at any time. When you start a session for
+the first time, the desktop usually contains at least two panels, as follows:
 </para>
 <itemizedlist>
 <listitem><para>Menu Panel</para></listitem>
@@ -126,20 +127,19 @@ for the first time, the desktop usually contains at least two panels, as follows
 <para>To create panels on the desktop follow these steps: </para>
 <orderedlist>
 <listitem><para>Right-click on a vacant space on any of the panels on the
-desktop to open the panel popup menu, then choose <guimenuitem>Create panel
-</guimenuitem>.</para></listitem>
+desktop, then choose <guimenuitem>New Panel</guimenuitem>.</para></listitem>
 <listitem><para>Choose the type of panel you want to create from the submenu.
 The panel is added to the desktop.</para></listitem>
 </orderedlist>
-<para>Except for the Menu Panel, you can create as many panels as you want.
-You can create different types of panel on the desktop to fit your own requirements.
-You can customize the behavior and appearance of your panels. For example,
-you can change the background of your panels.</para>
+<para>You can create as many panels as you want. However, you can only create
+one Menu Panel. You can create different types of panel on the desktop to
+fit your own requirements. You can customize the behavior and appearance of
+your panels. For example, you can change the background of your panels.</para>
 </sect2>
 <sect2 id="gosoverview-508">
 <title>To Delete Panels</title>
-<para>To delete a panel, right-click on the panel to open the panel popup
-menu, then choose <guimenuitem>Remove this panel</guimenuitem>.</para>
+<para>To delete a panel, right-click on the panel then choose <guimenuitem>
+Delete This Panel</guimenuitem>.</para>
 </sect2>
 <sect2 id="gosoverview-24">
 <title>To Hide Panels</title>
@@ -176,9 +176,13 @@ the action that is associated with the launcher.</para>
 <para>You can create your own launchers for applications. For example, you
 can create a launcher for a word processor application that you use frequently,
 and place the launcher in a panel for convenient access. To add a new launcher
-to a panel, right-click on a vacant space on the panel to open the panel popup
-menu, then choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>
-Launcher</guimenuitem></menuchoice>.</para></listitem>
+to a panel, right-click on a vacant space on the panel, then choose <menuchoice>
+<guimenu>Add to Panel</guimenu><guimenuitem>Launcher</guimenuitem>
+</menuchoice>. </para>
+<para>Alternatively, to add a launcher from a menu, right-click on a vacant
+space on the panel, then choose <menuchoice><guimenu>Add to Panel
+</guimenu><guimenuitem>Launcher from menu</guimenuitem></menuchoice>. Choose
+the launcher to add from the submenus.</para></listitem>
 <listitem><para>Menus</para>
 <para>You can access all desktop functions through menus. The default panels
 contain menus, so you can use a combination of menus and panels to perform
@@ -191,9 +195,8 @@ linkend="gosoverview-FIG-28"/> is the icon that is displayed when you add the <g
 Desktop Preferences</guimenuitem> menu to a panel.</para>
 <para>You can also add the <guimenu>GNOME Menu</guimenu> to any of your panels.
 To add the <guimenu>GNOME Menu</guimenu> to a panel, right-click on a vacant
-space on the panel to open the panel popup menu, then choose <menuchoice>
-<guimenu>Add to panel</guimenu><guimenuitem>GNOME Menu</guimenuitem>
-</menuchoice>.</para></listitem>
+space on the panel, then choose <menuchoice><guimenu>Add to Panel
+</guimenu><guimenuitem>GNOME Menu</guimenuitem></menuchoice>.</para></listitem>
 <listitem><para>Applets</para><indexterm><primary>applets</primary><secondary>
 overview</secondary></indexterm>
 <para><glossterm>Applets</glossterm> are small, interactive applications that
@@ -202,20 +205,19 @@ linkend="gosoverview-FIG-28"/>. Each applet has a simple user interface that
 you can operate with the mouse or keyboard. The following applets appear in
 your panels by default:</para>
 <itemizedlist>
+<listitem><para><application>Window List</application>: Displays a button
+for each window that is open. You can click on a window list button to minimize
+and restore windows. By default, <application>Window List</application> appears
+in the edge panel at the bottom of the desktop.</para></listitem>
 <listitem><para><application>Workspace Switcher</application>: Displays a
 visual representation of your workspaces. You can use <application>Workspace
 Switcher</application> to switch between workspaces. By default, <application>
 Workspace Switcher</application> appears in the edge panel at the bottom of
 the desktop.</para></listitem>
-<listitem><para><application>Window List</application>: Displays a button
-for each window that is open. You can click on a window list button to minimize
-and restore windows. By default, <application>Window List</application> appears
-in the edge panel at the bottom of the desktop.</para></listitem>
 </itemizedlist>
 <para>To add an applet to a panel, right-click on a vacant space on the panel,
-then choose <guimenuitem>Add to panel</guimenuitem> from the panel popup menu.
-Choose the panel applet that you require from one of the following submenus:
-</para>
+then choose <guimenuitem>Add to Panel</guimenuitem>. Choose the applet that
+you require from one of the following submenus:</para>
 <itemizedlist>
 <listitem><para>Accessories</para></listitem>
 <listitem><para>Amusements</para></listitem>
@@ -230,20 +232,19 @@ you can open or close from a drawer icon, as shown in <xref linkend="gosoverview
  Drawers can help you to organize your work when you run a lot of applications
 simultaneously. You can place all the same functional elements in a drawer
 that you can put in any other type of panel. </para>
-<para>To add a drawer to a panel, right-click on a vacant space on the panel
-to open the panel popup menu, then choose <menuchoice><guimenu>Add to panel
-</guimenu><guimenuitem>Drawer</guimenuitem></menuchoice>. </para>
+<para>To add a drawer to a panel, right-click on a vacant space on the panel,
+then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>
+Drawer</guimenuitem></menuchoice>. </para>
 <para>To open a drawer click on the drawer. To close a drawer click on the
 drawer again.</para></listitem>
 <listitem><para>Other panel objects</para>
 <para>Some panel objects perform special functions that are not available
-through other panel objects. For example, the Lock screen object enables you
-to lock your screen. The lock icon in <xref linkend="gosoverview-FIG-28"/>
-is the Lock screen object. </para>
+through other panel objects. For example, the Lock button enables you to lock
+your screen. The lock icon in <xref linkend="gosoverview-FIG-28"/> is the Lock
+button.</para>
 <para>To add panel objects to a panel, right-click on a vacant space on the
-panel to open the panel popup menu, then choose <guimenuitem>Add to panel
-</guimenuitem>. You can then choose the specific panel object you require. 
-</para></listitem>
+pane, then choose <guimenuitem>Add to Panel</guimenuitem>. You can then choose
+the specific panel object you require. </para></listitem>
 </itemizedlist>
 </sect2>
 <sect2 id="gosoverview-21">
@@ -267,7 +268,7 @@ Add this launcher to panel</guimenuitem>.</para></listitem>
 <para>You can access all desktop functions through menus. Your default panels
 contain menus, so you can use a combination of menus and panels to perform
 your tasks. The Menu Panel contains <guimenu>Applications</guimenu> and <guimenu>
-Actions</guimenu> menus, and you can also add the <guimenu>GNOME Menu</guimenu>
+Actions</guimenu> menus. You can also add the <guimenu>GNOME Menu</guimenu>
 to your panels. </para>
 <para>You can use the <guimenu>Applications</guimenu> menu and the <guimenu>
 Actions</guimenu> menu to access almost all of the applications, commands,
@@ -275,9 +276,9 @@ and configuration options on your desktop. You can also access the items in
 the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus from
 the <guimenu>GNOME Menu</guimenu>.</para>
 <para>To add a <guimenu>GNOME Menu</guimenu> to a panel, right-click on the
-panel then choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>
-GNOME Menu</guimenuitem></menuchoice> from the panel popup menu. The <guimenu>
-GNOME Menu</guimenu> is represented by a stylized footprint, as follows:</para>
+panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>
+GNOME Menu</guimenuitem></menuchoice>. The <guimenu>GNOME Menu</guimenu> is
+represented by a stylized footprint, as follows:</para>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -307,18 +308,19 @@ you can use to work with the window.</para>
 <itemizedlist>
 <listitem><para>Application windows</para>
 <para>When you run an application on the desktop, a frame usually borders
-the window. The top edge of the application window contains a titlebar with
-buttons that you can use to work with the window. The buttons in an application
-window frame enable you to perform actions such as close the window, or open
-the <guimenu>Window</guimenu> menu. The <guimenu>Window</guimenu> menu provides
-commands that you can perform on the window.</para></listitem>
+the window. The top edge of the application window contains a titlebar. The
+titlebar contains buttons that you can use to work with the window. The buttons
+in an application window frame enable you to perform actions such as open
+the <guimenu>Window Menu</guimenu>, or close the window. The <guimenu>Window
+Menu</guimenu> provides commands that you can perform on the window.</para>
+</listitem>
 <listitem><para>Dialog windows</para>
 <para>Dialog windows are associated with interactive desktop processes. A
 dialog window consists of the window frame, and a single interactive pane
 that provides information and controls for the user. This manual refers to
 the interactive part of a dialog window as a dialog. The frame of a dialog
-window contains buttons that enable you to close the dialog window, or to
-open the <guimenu>Window</guimenu> menu.</para></listitem>
+window contains buttons that enable you to open the <guimenu>Window Menu</guimenu>,
+or to close the dialog window.</para></listitem>
 </itemizedlist>
 
 </sect2>
@@ -354,7 +356,7 @@ valign="top"><para>Description </para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para><guibutton>Window Menu</guibutton>
 button</para></entry><entry colname="COLSPEC1" valign="top"><para>Click on
 the <guibutton>Window Menu</guibutton> button to open the <guimenu>Window
-</guimenu> menu. </para></entry></row>
+Menu</guimenu>. </para></entry></row>
 <row><entry valign="top"><para>Titlebar</para></entry><entry valign="top"><para>
 You can use the titlebar to move and shade the window. </para></entry></row>
 <row><entry valign="top"><para><guibutton>Minimize</guibutton> button</para></entry>
@@ -370,13 +372,14 @@ click on the <guibutton>Maximize</guibutton> button again. </para></entry>
 </para></entry><entry valign="top"><para>Click on the <guibutton>Close Window
 </guibutton> button to close the window. </para></entry></row>
 <row><entry colname="COLSPEC0"><para>Border</para></entry><entry colname="COLSPEC1"><para>
-Right-click on the border to open the <guimenu>Window</guimenu> menu.</para></entry>
+Right-click on the border to open the <guimenu>Window Menu</guimenu>.</para></entry>
 </row>
 </tbody>
 </tgroup>
 </informaltable>
-<para>To change the size of windows grab the border of the window, then move
-the cursor until the window is the size that you require. </para>
+<para>To change the size of windows grab the border of the window, but not
+the titlebar. Drag the border until the window is the size that you require.
+</para>
 </sect2>
 <sect2 id="gosoverview-20">
 <title>To Give Focus to a Window</title>
@@ -394,10 +397,11 @@ Action</para></entry></row>
 <tbody>
 <row><entry valign="top"><para>Mouse</para></entry><entry valign="top"><para>
 Click on the window, if the window is visible. </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para>Shortcut key</para></entry>
-<entry colname="COLSPEC1" valign="top"><para>Switch between the windows that
-are open with a shortcut key. To give focus to a window, release the keys.
-The default shortcut key to switch between windows is <keycombo><keycap>Alt</keycap><keycap>Tab</keycap></keycombo>. </para></entry></row>
+<row><entry colname="COLSPEC0" valign="top"><para>Shortcut keys</para></entry>
+<entry colname="COLSPEC1" valign="top"><para>Use shortcut keys to switch between
+the windows that are open. To give focus to a window, release the keys. The
+default shortcut keys to switch between windows are <keycombo><keycap>Alt</keycap><keycap>
+Tab</keycap></keycombo>. </para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para><application>Window List
 </application></para></entry><entry colname="COLSPEC1" valign="top"><para>
 Click on the button that represents the window in <application>Window List
@@ -416,21 +420,21 @@ Switcher</application> display.</para></entry></row>
 <indexterm><primary>workspaces</primary><secondary>overview</secondary></indexterm>
 <para>You can display many windows at the same time on your desktop. Your
 windows are displayed in subdivisions of your desktop that are called workspaces.
-A workspace is a discrete area on the desktop in which you can work. Every
-workspace on the desktop contains the same desktop background, the same panels,
-and the same menus. However, you can run different applications, and open
-different windows in each workspace. You can display only one workspace at
-a time on your desktop but you can have windows open in other workspaces.
+A workspace is a discrete area on the desktop in which you can work. </para>
+<para>Every workspace on the desktop contains the same desktop background,
+the same panels, and the same menus. However, you can run different applications,
+and open different windows in each workspace. You can display only one workspace
+at a time on your desktop but you can have windows open in other workspaces.
  </para>
 <para>Workspaces enable you to organize the desktop when you run many applications
 at the same time. When your current workspace becomes crowded with windows,
 you can move your work to another workspace. You can also switch to another
 workspace then start more applications.</para>
-<para>The default setup of the desktop is to use four workspaces. Workspaces
-are displayed in the <application>Workspace Switcher</application> applet.
-In <xref linkend="gosoverview-FIG-42"/>, <application>Workspace Switcher</application>
-contains four workspaces. The first three workspaces contain open windows.
-The last workspace does not contain currently active windows.</para>
+<para>Workspaces are displayed in the <application>Workspace Switcher</application>
+applet. In <xref linkend="gosoverview-FIG-42"/>, <application>Workspace Switcher
+</application> contains four workspaces. The first three workspaces contain
+open windows. The last workspace does not contain currently active windows.
+</para>
 <figure id="gosoverview-FIG-42">
 <title>Workspaces Displayed in Workspace Switcher</title>
 <screenshot>
@@ -453,9 +457,11 @@ The last workspace does not contain currently active windows.</para>
 <itemizedlist>
 <listitem><para>In <application>Workspace Switcher</application>, click on
 the workspace where you want to work.</para></listitem>
-<listitem><para>Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo> to switch to the workspace on the right of the current
+<listitem><para>Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>
+right arrow</keycap></keycombo> to switch to the workspace on the right of the current
 workspace.</para></listitem>
-<listitem><para>Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo> to switch to the workspace on the left of the current
+<listitem><para>Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>
+left arrow</keycap></keycombo> to switch to the workspace on the left of the current
 workspace.</para></listitem>
 </itemizedlist>
 </sect2>
@@ -464,9 +470,9 @@ workspace.</para></listitem>
 <indexterm><primary>workspaces</primary><secondary>specifying number of</secondary>
 </indexterm><para>To add workspaces to your desktop, right-click on the <application>
 Workspace Switcher</application> applet, then choose <guimenuitem>Preferences
-</guimenuitem> from the applet popup menu. The <guilabel>Workspace Switcher
-Preferences</guilabel> dialog is displayed. Use the <guilabel>Number of workspaces
-</guilabel> spin box to specify the number of workspaces you require.</para>
+</guimenuitem>. The <guilabel>Workspace Switcher Preferences</guilabel> dialog
+is displayed. Use the <guilabel>Number of workspaces</guilabel> spin box to
+specify the number of workspaces that you require.</para>
 </sect2>
 </sect1>
 <sect1 id="gosoverview-56">
@@ -494,9 +500,9 @@ Nautilus</application> window that displays the contents of a folder.</para>
 panes:</para>
 <itemizedlist>
 <listitem><para>Side pane</para>
-<para>Enables you to navigate through your files and the online help system.
-This pane also displays information about the current file or folder. The
-side pane is on the left side of the window.</para></listitem>
+<para>Enables you to navigate through your files. This pane also displays
+information about the current file or folder. The side pane is on the left
+side of the window.</para></listitem>
 <listitem><para>View pane</para>
 <para>Displays the contents of files and folders. The view pane is on the
 right side of the window.</para></listitem>
@@ -553,8 +559,8 @@ following actions:</para>
 </para>
 <para>You can add <glossterm>desktop background objects</glossterm> for convenient
 access to the files, folders, and applications that you use frequently. For
-example, you can create a symbolic link to a file that you use often, then
-drag the link to your desktop background.</para></listitem>
+example, you add a launcher for an application that you use often.</para>
+</listitem>
 <listitem><para>Open the <guimenu>Desktop Background</guimenu> menu.</para>
 <para>Right-click on the desktop background to open the <guimenu>Desktop Background
 </guimenu> menu. You can use the <guimenu>Desktop Background</guimenu> menu
@@ -574,13 +580,13 @@ so that you click once on an object to execute the default action.</para>
 folders, and applications that you use frequently. You can add objects to
 your desktop background in the following ways:</para>
 <itemizedlist>
+<listitem><para>Use the <guimenu>Desktop Background</guimenu> menu to add
+a launcher to the desktop background.</para></listitem>
 <listitem><para>Drag an object from a file manager window to the desktop background.
 For example, you can create a symbolic link to a file that you use often,
 then drag the link to your desktop background. The icon for the link is moved
-to the desktop background. To open the file, double-click on the icon.</para>
-<para>You can also drag files and folders to the desktop background. When
-you drag a file or folder to the desktop background, the file or folder resides
-in your <filename>$HOME/.nautilus/desktop</filename> directory.</para></listitem>
+to the desktop background. To open the file, double-click on the icon. You
+can also drag files and folders to the desktop background. </para></listitem>
 <listitem><para>Drag an application launcher from a menu to the desktop background.
 For example, you can open a menu that contains a launcher for an application
 that you use often, then drag the launcher to your desktop background. </para>
@@ -613,8 +619,7 @@ menu through the <guimenu>GNOME Menu</guimenu> and the Menu Panel.</para>
 </listitem>
 <listitem><para><guilabel>Desktop Preferences</guilabel></para>
 <para>Double-click on <guilabel>Desktop Preferences</guilabel> to customize
-your desktop. For more information on how to customize your desktop, see <xref
-linkend="part2-1"/>.</para></listitem>
+your desktop. </para></listitem>
 <listitem><para>Programs that enable you to configure your system as a server,
 and to choose other system settings.</para></listitem>
 </itemizedlist>
@@ -636,8 +641,12 @@ displayed in a <application>Nautilus</application> window.</para></listitem>
 <indexterm><primary>preference tools</primary><secondary>overview</secondary>
 </indexterm><para>You can use desktop preference tools to configure almost
 every feature of the desktop. Each tool controls a particular part of the
-behavior of the desktop. For convenience, the tools are grouped under the
-following headings:</para>
+behavior of the desktop. For example, you can use a preference tool to select
+a theme for your desktop. A <glossterm>theme</glossterm> is a group of coordinated
+settings that specify the visual appearance of a part of your interface. 
+</para>
+<para>For convenience, the tools are grouped under the following headings:
+</para>
 <itemizedlist>
 <listitem><para>Basic</para></listitem>
 <listitem><para><guilabel>Accessibility</guilabel></para></listitem>
@@ -665,13 +674,13 @@ share several characteristics. For example, the applications have a consistent
 look-and-feel. The applications share characteristics because the applications
 use the same programming libraries. An application that uses the standard
 GNOME programming libraries is called a <glossterm>GNOME-compliant application
-</glossterm>. For example, <application>Nautilus</application> and <application>
-gedit</application> are GNOME-compliant applications.</para>
+</glossterm>. For example, <application>Nautilus</application> and the <application>
+gedit</application> text editor are GNOME-compliant applications.</para>
 <para>GNOME provides libraries in addition to the libraries provided by your
 operating system. The libraries enable GNOME to run your existing applications
 as well as GNOME-compliant applications. For example, if your operating system
-is UNIX-based, you can run your current X11 and Motif applications from the
-GNOME desktop.</para>
+is UNIX-based, you can run your current X11 applications and Motif applications
+from the GNOME desktop.</para>
 <para>Some of the features of GNOME-compliant applications are as follows:
 </para>
 <itemizedlist>
@@ -681,20 +690,18 @@ applications use the look-and-feel settings that you specify in the desktop
 preference tools. You can use the following tools to change the look-and-feel
 of your GNOME-compliant applications:<itemizedlist>
 <listitem><para><menuchoice><guimenu>Applications</guimenu><guisubmenu>
+Desktop Preferences</guisubmenu><guimenuitem>Menus &amp; Toolbars
+</guimenuitem></menuchoice></para></listitem>
+<listitem><para><menuchoice><guimenu>Applications</guimenu><guisubmenu>
 Desktop Preferences</guisubmenu><guimenuitem>Theme</guimenuitem></menuchoice></para>
 </listitem>
-<listitem><para><menuchoice><guimenu>Applications</guimenu><guisubmenu>
-Desktop Preferences</guisubmenu><guimenuitem>Toolbars &amp; Menus
-</guimenuitem></menuchoice></para></listitem>
 </itemizedlist></para></listitem>
 <listitem><para>Menubars, toolbars, and statusbars</para>
 <para>Most GNOME-compliant applications have a menubar, a toolbar, and a statusbar.
-A <glossterm>menubar</glossterm> is a bar at the top of a window that contains
-the menus for the application. The menubar in a GNOME-compliant application
-always contains a <guimenu>File</guimenu> menu and a <guimenu>Help</guimenu>
-menu. The <guimenu>File</guimenu> menu always contains an <guimenuitem>Exit
-</guimenuitem> menu item, and the <guimenu>Help</guimenu> menu always contains
-an <guimenuitem>About</guimenuitem> menu item.</para>
+The menubar always contains a <guimenu>File</guimenu> menu and a <guimenu>
+Help</guimenu> menu. The <guimenu>File</guimenu> menu always contains an <guimenuitem>
+Exit</guimenuitem> menu item, and the <guimenu>Help</guimenu> menu always
+contains an <guimenuitem>About</guimenuitem> menu item.</para>
 <para>A <glossterm>toolbar</glossterm> is a bar that appears under the menubar.
 A toolbar contains buttons for the most commonly-used commands. A <glossterm>
 statusbar</glossterm> is a bar at the bottom of a window that provides information
@@ -709,7 +716,8 @@ location bar in the <application>Nautilus</application> file manager. </para>
 </listitem>
 <listitem><para>Default shortcut keys</para>
 <para>GNOME-compliant applications use the same shortcut keys to perform the
-same actions. For example, to quit a GNOME-compliant application, press <keycombo><keycap>Ctrl</keycap><keycap>Q</keycap></keycombo>. To undo an action in a GNOME-compliant
+same actions. For example, to quit a GNOME-compliant application, press <keycombo><keycap>
+Ctrl</keycap><keycap>Q</keycap></keycombo>. To undo an action in a GNOME-compliant
 application, press <keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo>. </para></listitem>
 <listitem><para>Drag-and-drop</para>
 <para>GNOME-compliant applications use the same protocol to implement drag-and-drop
@@ -718,10 +726,9 @@ when you drag-and-drop items.</para>
 <para>The use of the same protocol also enables GNOME-compliant applications
 to interoperate in a sophisticated manner. For example, GNOME-compliant applications
 recognize the format of the items that you drag. When you drag a HTML file
-from a <application>Nautilus</application> window to a browser such as <application>
-Netscape</application>, the file is displayed in HTML format in the browser.
-However, when you drag the HTML file to a text editor such as <application>
-gedit</application>, the file is displayed in plain text format in the text
+from a <application>Nautilus</application> window to a web browser, the file
+is displayed in HTML format in the browser. However, when you drag the HTML
+file to a text editor, the file is displayed in plain text format in the text
 editor. </para></listitem>
 </itemizedlist>
 </sect1>
@@ -745,25 +752,19 @@ Yelp</application> help system, choose <menuchoice><guimenu>Applications
 </guimenu><guimenuitem>Help</guimenuitem></menuchoice>.</para>
 </sect2>
 <sect2 id="gosgetstarted-33">
-<title>To Find Out More About Panel Applets</title>
-<indexterm><primary>panel applets</primary><secondary>help</secondary></indexterm>
+<title>To Find Out More About Applets</title>
+<indexterm><primary>applets</primary><secondary>getting help</secondary></indexterm>
 <indexterm><primary>help</primary><secondary>applets</secondary></indexterm>
-<para>To find out more about a specific applet follow these steps: 
-</para>
-<orderedlist>
-<listitem><para>Right-click on the relevant applet icon to display the applet
-popup menu.</para></listitem>
-<listitem><para>Choose the <guimenuitem>Help</guimenuitem> menu item on the
-popup menu to display an online reference manual specific to that applet.
-</para></listitem>
-</orderedlist>
+<para>To find out more about a specific applet, right-click on the applet,
+then choose <guimenuitem>Help</guimenuitem>. </para>
 </sect2>
 <sect2 id="gosgetstarted-35">
 <title>To Find Out More About Applications</title>
 <indexterm><primary>applications</primary><secondary>help</secondary></indexterm>
 <indexterm><primary>help</primary><secondary>applications</secondary></indexterm>
 <para>To find out more about a specific application, start the application,
-then choose <guimenuitem>Help</guimenuitem> from the menubar.</para>
+then choose <menuchoice><guimenu>Help</guimenu><guimenuitem>Contents
+</guimenuitem></menuchoice>.</para>
 </sect2>
 </sect1>
 </chapter>
diff --git a/gnome2-user-guide/C/gospanel-C.omf b/gnome2-user-guide/C/gospanel-C.omf
index 9275b0f..f5aa3bf 100644
--- a/gnome2-user-guide/C/gospanel-C.omf
+++ b/gnome2-user-guide/C/gospanel-C.omf
@@ -16,10 +16,10 @@
       Panels
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Working With Panels chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index b10eda7..b50d37e 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -56,11 +56,6 @@ the standard GNOME applications.</para></entry></row>
 <row><entry valign="top"><para><guimenu>Actions</guimenu> menu</para></entry>
 <entry valign="top"><para>The <guimenu>Actions</guimenu> menu provides menu
 items that relate to the current status of your desktop. </para></entry></row>
-<row><entry colname="COLSPEC3" valign="top"><para><application>GNOME Terminal
-</application> launcher </para></entry><entry colname="COLSPEC4" valign="top"><para>
-Click on this button to start a <application>GNOME Terminal</application>. <application>
-GNOME Terminal</application> provides access to a UNIX command line.</para></entry>
-</row>
 <row><entry colname="COLSPEC3" valign="top"><para><application>Volume Control
 </application> applet</para></entry><entry colname="COLSPEC4" valign="top"><para><application>
 Volume Control</application> enables you to control the volume of the speaker
@@ -133,34 +128,34 @@ linkend="gospanel-TBL-47"/> lists the types of panel that you can create, and
 their characteristics. </para>
 <table frame="topbot" id="gospanel-TBL-47">
 <title>Types of Panel</title>
-<tgroup cols="3" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="32.86*"/>
-<colspec colname="COLSPEC1" colwidth="32.96*"/><colspec colname="COLSPEC2"
-colwidth="33.17*"/>
+<tgroup cols="3" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="24.28*"/>
+<colspec colname="COLSPEC1" colwidth="37.36*"/><colspec colname="COLSPEC2"
+colwidth="37.36*"/>
 <thead>
 <row rowsep="1"><entry valign="top"><para>Panel Type</para></entry><entry
 valign="top"><para>Snap Behavior </para></entry><entry valign="top"><para>
 Size</para></entry></row>
 </thead>
 <tbody>
-<row><entry colname="COLSPEC0" valign="top"><para>Corner panel</para></entry>
+<row><entry colname="COLSPEC0" valign="top"><para>Corner Panel</para></entry>
 <entry colname="COLSPEC1" valign="top"><para>Snaps to one of the edges of
 the screen, but can only snap to the center or the corner of the edge. </para></entry>
 <entry colname="COLSPEC2" valign="top"><para>Stretches as much as required
 to display the objects on the panel.</para></entry></row>
-<row><entry valign="top"><para>Edge panel</para></entry><entry valign="top"><para>
+<row><entry valign="top"><para>Edge Panel</para></entry><entry valign="top"><para>
 Snaps to one of the edges of the screen. The startup panel at the bottom of
 the desktop is an example of an edge panel. </para></entry><entry valign="top"><para>
 Stretches the full length of the edge that the panel snaps to.</para></entry>
 </row>
-<row><entry valign="top"><para>Floating panel</para></entry><entry valign="top"><para>
+<row><entry valign="top"><para>Floating Panel</para></entry><entry valign="top"><para>
 Does not snap to anything. You can place a floating panel anywhere on your
 desktop.</para></entry><entry valign="top"><para>Stretches as much as required
 to display the objects on the panel.</para></entry></row>
 <row><entry valign="top"><para>Menu Panel</para></entry><entry valign="top"><para>
-Snaps to the top edge of the screen. You can not move the Menu Panel.</para></entry>
+Snaps to the top edge of the screen. You cannot move the Menu Panel.</para></entry>
 <entry valign="top"><para>Stretches the full length of the top edge of the
 screen. You can only have one Menu Panel on your desktop.</para></entry></row>
-<row><entry valign="top"><para>Sliding panel</para></entry><entry valign="top"><para>
+<row><entry valign="top"><para>Sliding Panel</para></entry><entry valign="top"><para>
 Snaps to one of the edges of the screen, can snap to any point on the edge.
 </para></entry><entry valign="top"><para>Stretches as much as required to
 display the objects on the panel.</para></entry></row>
@@ -170,7 +165,7 @@ display the objects on the panel.</para></entry></row>
 <para>To create a panel perform the following steps:</para>
 <orderedlist>
 <listitem><para>Right-click on a vacant space on any panel, then choose <guimenuitem>
-Create panel</guimenuitem> from the panel popup menu.</para></listitem>
+New Panel</guimenuitem>.</para></listitem>
 <listitem><para>Choose the type of panel that you want to create. The new
 panel is added to the desktop. The new panel contains no objects, except for
 a Menu Panel. </para>
@@ -178,7 +173,7 @@ a Menu Panel. </para>
 </orderedlist>
 </sect2>
 <sect2 id="gospanel-11">
-<title>Interacting With a Panel</title>
+<title>To Interact With a Panel</title>
 <indexterm><primary>panels</primary><secondary>interacting with</secondary>
 </indexterm><para>To interact with a panel, you must left-click, middle-click,
 or right-click on a vacant space on the panel. You can also middle-click or
@@ -210,7 +205,7 @@ the panel to the new location.</para>
 The panel does not snap to any part of the desktop. When you drag a corner
 panel, an edge panel, or a sliding panel, the panel snaps to the edge of the
 screen.</para>
-<note><para>You can not move the Menu Panel.</para>
+<note><para>You cannot move the Menu Panel.</para>
 </note>
 </sect2>
 <sect2 id="gospanel-7">
@@ -218,8 +213,8 @@ screen.</para>
 <indexterm><primary>panels</primary><secondary>hiding</secondary></indexterm>
 <para>You can hide or show a panel on your desktop, except for the Menu Panel.
 To hide a panel, use a hide button. If the hide buttons are not visible on
-a panel, modify the preferences of the panel so that the hide buttons are
-visible. </para>
+a panel, modify the panel properties so that the hide buttons are visible. 
+</para>
 <para>Hide buttons are at either end of a panel. The hide buttons contain
 an optional arrow icon. The following illustration shows hide buttons. </para>
 <screenshot>
@@ -242,7 +237,7 @@ buttons are now visible.</para>
 <para>You can set a panel to autohide. When you set autohide, the panel hides
 automatically when the mouse is not pointing to the panel. The panel reappears
 when you point to the part of the screen where the panel resides. To set your
-panel to autohide, modify the preferences of the panel.</para>
+panel to autohide, modify the properties of the panel.</para>
 <note><para>On a corner panel, the behavior of the hide buttons is slightly
 different. If the panel is in one of the corners of the screen, you can use
 the hide buttons as follows:</para>
@@ -272,29 +267,19 @@ and the visual appearance. </para>
 <orderedlist>
 <listitem><para>Right-click on a vacant space on the panel, then choose <guimenuitem>
 Properties</guimenuitem> to display the <guilabel>Panel Properties</guilabel>
-dialog. The following figure shows the <guilabel>Panel Properties</guilabel>
-dialog for the edge panel at the bottom of your desktop. </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/panelprop_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows a Panel Properties dialog. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
+dialog. </para>
 <para>The <guilabel>Panel Properties</guilabel> dialog contains the following
 tabbed sections: </para>
 <itemizedlist>
-<listitem><para><guilabel>Panel</guilabel></para></listitem>
+<listitem><para><guilabel><replaceable>Panel_type</replaceable> Panel</guilabel></para>
+</listitem>
 <listitem><para><guilabel>Background</guilabel></para></listitem>
 </itemizedlist>
 </listitem>
 <listitem><para>To modify panel size, position, and hiding properties, click
-on the <guilabel>Panel</guilabel> tab. The following table describes the dialog
-elements on the <guilabel>Panel</guilabel> tabbed section: </para>
+on the <guilabel><replaceable>Panel_type</replaceable> Panel</guilabel> tab.
+The following table describes the dialog elements on the <guilabel><replaceable>
+Panel_type</replaceable> Panel</guilabel> tabbed section: </para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="28.57*"/>
 <colspec colname="COLSPEC1" colwidth="71.43*"/>
@@ -303,54 +288,38 @@ elements on the <guilabel>Panel</guilabel> tabbed section: </para>
 valign="top"><para>Description </para></entry></row>
 </thead>
 <tbody>
-<row><entry valign="top"><para><guilabel>Panel size</guilabel></para></entry>
-<entry valign="top"><para>Choose the size of the panel.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Panel position</guilabel></para></entry>
-<entry valign="top"><para>Choose the position of the panel on your desktop.
+<row><entry colname="COLSPEC0"><para><guilabel>Position</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>Select the position of the panel on your desktop.
 Click on the required position for the panel. </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Panel window level
-</guilabel></para></entry><entry colname="COLSPEC1" valign="top"><para>Select
-the level or layer at which you want the panel to appear. Select from one
-of the following options:</para><itemizedlist>
-<listitem><para><guilabel>Default (from global preferences) </guilabel>: Select
-this option to use the default setting that is specified in <menuchoice><guimenu>
-Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu>
-<guisubmenu>Advanced</guisubmenu><guimenuitem>Panel</guimenuitem>
-</menuchoice>.</para></listitem>
-<listitem><para><guilabel>Below other windows</guilabel>: Select this option
-if you want the panel to appear below windows.</para></listitem>
-<listitem><para><guilabel>Normal</guilabel>: Select this option if you want
-the panel to appear at the same level as windows.</para></listitem>
-<listitem><para><guilabel>Above other windows</guilabel>: Select this option
-if you want the panel to appear above windows.</para></listitem>
-</itemizedlist></entry></row>
-<row><entry valign="top"><para><guilabel>Orient panel horizontally</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Size</guilabel></para></entry><entry
+valign="top"><para>Select the size of the panel.</para></entry></row>
+<row><entry valign="top"><para><guilabel>Orient horizontally</guilabel></para></entry>
 <entry valign="top"><para>Floating panel only. Select this option to display
 the panel horizontally. </para></entry></row>
-<row><entry valign="top"><para><guilabel>Orient panel vertically</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Orient vertically</guilabel></para></entry>
 <entry valign="top"><para>Floating panel only. Select this option to display
 the panel vertically.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Top left corner's position</guilabel></para></entry>
-<entry valign="top"><para>Floating panel only. Use the <guilabel>X</guilabel>
-and <guilabel>Y</guilabel> spin boxes to specify the coordinates for the top-left
-corner of the panel. </para></entry></row>
-<row><entry valign="top"><para><guilabel>Offset from screen edge</guilabel></para></entry>
+<row><entry colname="COLSPEC0"><para><guilabel>Horizontal offset</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>Floating panel only. Use the spin box to specify
+the distance of the panel from the left edge of the desktop. </para></entry>
+</row>
+<row><entry colname="COLSPEC0"><para><guilabel>Vertical offset</guilabel></para></entry>
+<entry colname="COLSPEC1"><para>Floating panel only. Use the spin box to specify
+the distance of the panel from the top edge of the desktop. </para></entry>
+</row>
+<row><entry valign="top"><para><guilabel>Screen edge offset</guilabel></para></entry>
 <entry valign="top"><para>Sliding panel only. Use this spin box to specify
 the distance between your panel and the edge of the screen, in pixels. </para></entry>
 </row>
-<row><entry valign="top"><para><guilabel>Enable Auto-hide</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Autohide</guilabel></para></entry>
 <entry valign="top"><para>Select this option to enable autohide. </para></entry>
 </row>
 <row><entry valign="top"><para><guilabel>Show hide buttons</guilabel></para></entry>
 <entry valign="top"><para>Select this option to display hide buttons on your
 panel.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Show arrows on hide button </guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Arrows on hide button </guilabel></para></entry>
 <entry valign="top"><para>Select this option to display arrows on the hide
 buttons, if the hide button is enabled.</para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para><guilabel>Avoid this panel
-when maximizing windows</guilabel></para></entry><entry colname="COLSPEC1"
-valign="top"><para>Select this option if you do not want to overlap the panel
-when you maximize windows.</para></entry></row>
 </tbody>
 </tgroup>
 </informaltable>
@@ -370,26 +339,27 @@ namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>Description</para></entr
 <row><entry valign="top"><para><guilabel>Background Type</guilabel></para></entry>
 <entry namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>Choose the
 type of background for the panel. The choices are as follows:</para><itemizedlist>
-<listitem><para><guilabel>Standard</guilabel>: The standard background type.
+<listitem><para><guilabel>Default</guilabel>: The default background type.
 The standard background depends on the settings in <menuchoice><guimenu>Applications
 </guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>
 Theme</guimenuitem></menuchoice>. </para></listitem>
 <listitem><para><guilabel>Color</guilabel>: Enables you to choose a color
 for the panel background.</para></listitem>
-<listitem><para><guilabel>Pixmap</guilabel>: Enables you to choose an image
+<listitem><para><guilabel>Image</guilabel>: Enables you to choose an image
 for the panel background. </para></listitem>
 </itemizedlist></entry></row>
-<row><entry valign="top"><para><guilabel>Color</guilabel></para></entry><entry
-namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>If <guilabel>Background
-Type</guilabel> is <guilabel>Color</guilabel>, click on the <guibutton>Color
-to use</guibutton> button to display the color selector dialog. Choose the
-color that you require from the color selector dialog. </para></entry></row>
+<row><entry valign="top"><para><guilabel>Background Color</guilabel></para></entry>
+<entry namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>If <guilabel>
+Background Type</guilabel> is <guilabel>Color</guilabel>, click on the <guibutton>
+Color to use</guibutton> button to display the color selector dialog. Choose
+the color that you require from the color selector dialog. </para></entry>
+</row>
 <row><entry morerows="4" valign="top"><para><guilabel>Image</guilabel></para></entry>
 <entry namest="COLSPEC5" nameend="COLSPEC6" valign="top"><para>If <guilabel>
-Background Type</guilabel> is <guilabel>Pixmap</guilabel>, choose the image
+Background Type</guilabel> is <guilabel>Image</guilabel>, choose the image
 to use on the background of the panel. Specify the following settings for
 the image background:</para></entry></row>
-<row><entry valign="top"><para><guilabel>Don't scale image to fit</guilabel></para></entry>
+<row><entry valign="top"><para><guilabel>Do not scale image to fit</guilabel></para></entry>
 <entry valign="top"><para>Select this option to tile the background image
 to fit the panel background.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Scale image</guilabel></para></entry>
@@ -430,10 +400,10 @@ of the panel. You can also drag pattern images from the <application>Nautilus
 <title>To Delete a Panel</title>
 <indexterm><primary>panels</primary><secondary>deleting</secondary></indexterm>
 <para>To delete a panel from the desktop, right-click on the panel that you
-want to delete. Choose <menuchoice><guimenuitem>Remove this panel</guimenuitem>
-</menuchoice> from the panel popup menu.</para>
+want to delete, then choose <menuchoice><guimenuitem>Delete This Panel</guimenuitem>
+</menuchoice>.</para>
 <note><para>You must always have at least one panel on your desktop. If you
-have only one panel on your desktop, you can not delete that panel.</para>
+have only one panel on your desktop, you cannot delete that panel.</para>
 </note>
 </sect2>
 </sect1>
@@ -472,8 +442,8 @@ information, see <xref linkend="gospanel-39"/>.</para>
 <itemizedlist>
 <listitem><para>From the panel popup menu</para>
 <para>Right-click on a vacant space on a panel to open the panel popup menu.
-The panel popup menu contains an <guisubmenu>Add to panel</guisubmenu> submenu.
-The <guisubmenu>Add to panel</guisubmenu> submenu enables you to add the following
+The panel popup menu contains an <guisubmenu>Add to Panel</guisubmenu> submenu.
+The <guisubmenu>Add to Panel</guisubmenu> submenu enables you to add the following
 objects to your panels: <itemizedlist>
 <listitem><para>Launchers</para></listitem>
 <listitem><para>Menus</para></listitem>
@@ -551,9 +521,8 @@ object anchors at the new location.</para>
 <para>Alternatively, you can use the panel object popup menu to move an object,
 as follows: </para>
 <orderedlist>
-<listitem><para>Right-click on the object to open the panel object popup menu. 
+<listitem><para>Right-click on the object, then choose <guimenuitem>Move</guimenuitem>.
 </para></listitem>
-<listitem><para>Choose <guimenuitem>Move</guimenuitem>. </para></listitem>
 <listitem><para>Point to the new location for the object, then click any mouse
 button to anchor the object to the new location. This location can be on any
 panel that is currently on your desktop. </para></listitem>
@@ -592,8 +561,8 @@ further along the panel. </para></entry></row>
 <title>To Remove a Panel Object</title>
 <indexterm><primary>panel objects</primary><secondary>removing</secondary>
 </indexterm><para>To remove an object from a panel right-click on the object
-to open the panel object popup menu, then choose <guimenuitem>Remove from
-panel</guimenuitem>. </para>
+to open the panel object popup menu, then choose <guimenuitem>Remove From
+Panel</guimenuitem>. </para>
 </sect2>
 </sect1>
 <sect1 id="gospanel-16">
@@ -605,14 +574,18 @@ one of the following actions: </para>
 <listitem><para>Start a particular application.</para></listitem>
 <listitem><para>Execute a command.</para></listitem>
 <listitem><para>Open a folder in a file manager window.</para></listitem>
-<listitem><para>Open a browser at a particular URL.</para></listitem>
+<listitem><para>Open a browser at a particular <glossterm>Uniform Resource
+Locator</glossterm> (<acronym>URL</acronym>). A URL is the address of a particular
+location on the Web.</para></listitem>
 </itemizedlist>
 <para>You can find launchers in the following places on the desktop:</para>
 <itemizedlist>
 <listitem><para>Panels: On panels, launchers are represented by icons.</para>
 </listitem>
-<listitem><para>Menus: On menus, launchers are represented by menu items with
-an icon.</para></listitem>
+<listitem><para>Menus: On menus, launchers are represented by menu items.
+The menu items usually have an icon beside the menu item.</para></listitem>
+<listitem><para>Desktop background: On the desktop background, launchers are
+represented by icons.</para></listitem>
 </itemizedlist>
 <para>You can modify the properties of a launcher. For example, the properties
 of a launcher include the name of the launcher, the icon that represents the
@@ -624,20 +597,20 @@ launcher, and how the launcher runs. </para>
 ways:</para>
 <itemizedlist>
 <listitem><para>From the panel popup menu</para>
-<para>To create a new launcher, right-click on any vacant space on the panel
-to open the panel popup menu. Choose <menuchoice><guimenu>Add to panel
-</guimenu><guimenuitem>Launcher</guimenuitem></menuchoice>. A <guilabel>Launcher
-Properties</guilabel> dialog is displayed. For more information on how to
-complete this dialog, see <xref linkend="gospanel-52"/>.</para>
+<para>To create a new launcher, right-click on any vacant space on the panel,
+then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>
+Launcher</guimenuitem></menuchoice>. A <guilabel>Create Launcher</guilabel>
+dialog is displayed. For more information on how to complete this dialog,
+see <xref linkend="gospanel-52"/>.</para>
 <para>Alternatively, to add an existing launcher to the panel, choose <menuchoice>
-<guimenu>Add to panel</guimenu><guimenuitem>Launcher from menu</guimenuitem>
-</menuchoice> from the panel popup menu. Choose the launcher that you want
+<guimenu>Add to Panel</guimenu><guimenuitem>Launcher from menu</guimenuitem>
+</menuchoice> from the panel popup men. Choose the launcher that you want
 to add from the menu.</para></listitem>
 <listitem><para>From any menu</para>
 <para>To add a launcher to a panel from any menu, perform one of the following
 steps:<itemizedlist>
-<listitem><para>From the panel where you want the launcher to reside, open
-the menu that contains the launcher. Right-click on the title of the launcher.
+<listitem><para>Open the menu that contains the launcher from the panel where
+you want the launcher to reside. Right-click on the title of the launcher.
 Choose <guimenuitem>Add this launcher to panel</guimenuitem>. </para></listitem>
 <listitem><para>Open a menu that contains the launcher. Drag the launcher
 on to the panel. </para></listitem>
@@ -649,27 +622,15 @@ launcher drag the <filename>.desktop</filename> file to the panel. </para>
 </listitem>
 </itemizedlist>
 <sect3 id="gospanel-52">
-<title>To Create a Launcher With the Launcher Properties Dialog</title>
-<para>To create a launcher with the <guilabel>Launcher Properties</guilabel>
-dialog perform the following steps: </para>
+<title>To Create a Launcher With the Create Launcher Dialog</title>
+<para>To create a launcher with the <guilabel>Create Launcher</guilabel> dialog
+perform the following steps: </para>
 <orderedlist>
 <listitem><para>Right-click on any part of a panel to open the panel popup
-menu. Choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>
-Launcher</guimenuitem></menuchoice> to display the <guilabel>Launcher Properties
+menu. Choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>
+Launcher</guimenuitem></menuchoice> to display the <guilabel>Create Launcher
 </guilabel> dialog. The dialog displays the <guilabel>Basic</guilabel> tabbed
-section, as shown in the following figure:</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/launcherprop1_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Launcher Properties dialog, Basic tabbed section. Contains: Name, Generic name, Comment text boxes, Command field, Type drop-down list box, Icon icon selector button, Run in Terminal check box.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+section.</para></listitem>
 <listitem><para>Enter the properties of the launcher in the dialog. The following
 table describes the dialog elements on the <guilabel>Basic</guilabel> tabbed
 section: </para>
@@ -687,8 +648,11 @@ You can use the <guilabel>Advanced</guilabel> tab to add translations of the
 name. This name is the name that appears when you add the launcher to a menu
 or to the desktop. </para></entry></row>
 <row><entry colname="COLSPEC0"><para><guilabel>Generic name</guilabel></para></entry>
-<entry colname="COLSPEC1"><para>Information to be supplied in a future release.
-</para></entry></row>
+<entry colname="COLSPEC1"><para>Use this text box to specify the class of
+application to which the launcher belongs. For example, you might type <userinput>
+Text Editor</userinput> in this text box for a <application>gedit</application>
+launcher. You can use the <guilabel>Advanced</guilabel> tab to add translations
+of the generic name.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Comment</guilabel></para></entry>
 <entry valign="top"><para>Use this text box to specify a short description
 of the launcher. The comment is displayed as a tooltip when you point to the
@@ -696,24 +660,14 @@ launcher icon on the panel. You can use the <guilabel>Advanced</guilabel>
 tabbed section to add translations of the comment. </para></entry></row>
 <row><entry valign="top"><para><guilabel>Command</guilabel></para></entry>
 <entry valign="top"><para>Use this field to specify a command to execute when
-you click on the launcher. </para><para>If the launcher type is <guilabel>
-URL</guilabel>, use this text box to specify a URL to access when you choose
-the launcher. </para></entry></row>
+you click on the launcher. </para></entry></row>
 <row><entry valign="top"><para><guilabel>Type</guilabel></para></entry><entry
 valign="top"><para>Use this drop-down combination box to specify the type
-of launcher. Choose from the following: </para><itemizedlist>
-<listitem><para><guilabel>Application</guilabel>: Choose this list item to
-create a launcher that starts an application.</para></listitem>
-<listitem><para><guilabel>FSDevice</guilabel>: Information to be supplied
-in a future release.</para></listitem>
-<listitem><para><guilabel>Link</guilabel>: Information to be supplied in a
-future release.</para></listitem>
-<listitem><para><guilabel>MimeType</guilabel>: Information to be supplied
-in a future release.</para></listitem>
-<listitem><para><guilabel>Service</guilabel>: Information to be supplied in
-a future release.</para></listitem>
-<listitem><para><guilabel>ServiceType</guilabel>: Information to be supplied
-in a future release.</para></listitem>
+of launcher. Select from the following: </para><itemizedlist>
+<listitem><para><guilabel>Application</guilabel>: Select this option to create
+a launcher that starts an application.</para></listitem>
+<listitem><para><guilabel>Link</guilabel>:  Select this option to create a
+launcher that links to a file, folder, or FTP site.</para></listitem>
 </itemizedlist></entry></row>
 <row><entry valign="top"><para><guilabel>Icon</guilabel></para></entry><entry
 valign="top"><para>Choose an icon to represent the launcher. To choose an
@@ -731,20 +685,7 @@ does not create a window in which to run.</para></entry></row>
 </listitem>
 <listitem><para>To set advanced properties for the launcher, click on the <guilabel>
 Advanced</guilabel> tab. The <guilabel>Launcher Properties</guilabel> dialog
-displays the <guilabel>Advanced</guilabel> tabbed section, as shown in the
-following figure.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/launcherprop2_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows Launcher Properties dialog, Advanced tabbed section. Contains Try this before using, Documentation fields, Name/Comment translations table, Language, Name, Generic Name, and Comment translation fields, Add/Set and Remove buttons.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+displays the <guilabel>Advanced</guilabel> tabbed section.</para></listitem>
 <listitem><para>Enter the advanced properties of the launcher in the dialog.
 The following table describes the dialog elements on the top part of the <guilabel>
 Advanced</guilabel> tabbed section: </para>
@@ -767,13 +708,14 @@ on the panel.</para></entry></row>
 </tgroup>
 </informaltable>
 </listitem>
-<listitem><para>You can also add a translation of the <guilabel>Name</guilabel>
-and <guilabel>Comment</guilabel> fields from the <guilabel>Basic</guilabel>
-tabbed section. To add a translation, enter the details of the translation
-in the <guilabel>Name/Comment translations</guilabel> table as follows: </para>
+<listitem><para>You can also add a translation of the <guilabel>Name</guilabel>, <guilabel>
+Generic name</guilabel>, and <guilabel>Comment</guilabel> fields from the <guilabel>
+Basic</guilabel> tabbed section. To add a translation, enter the details of
+the translation in the <guilabel>Name/Comment translations</guilabel> table
+as follows: </para>
 <informaltable frame="topbot">
-<tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="20.78*"/><colspec
-colwidth="79.22*"/>
+<tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="20.78*"/>
+<colspec colname="COLSPEC1" colwidth="79.22*"/>
 <thead>
 <row rowsep="1"><entry valign="top"><para>Field</para></entry><entry valign="top"><para>
 Description </para></entry></row>
@@ -785,7 +727,10 @@ Enter the two-letter code for the language for which you want to add a translati
 <row><entry valign="top"><para>Second field</para></entry><entry valign="top"><para>
 Enter the translation of the <guilabel>Name</guilabel> of the launcher.</para></entry>
 </row>
-<row><entry valign="top"><para>Third field</para></entry><entry valign="top"><para>
+<row><entry colname="COLSPEC0"><para>Third field</para></entry><entry colname="COLSPEC1"><para>
+Enter the translation of the <guilabel>Generic name</guilabel> of the launcher.
+</para></entry></row>
+<row><entry valign="top"><para>Fourth field</para></entry><entry valign="top"><para>
 Enter the translation for the <guilabel>Comment</guilabel> for the launcher. 
 </para></entry></row>
 </tbody>
@@ -814,8 +759,8 @@ menu.</para></listitem>
 Launcher Properties</guilabel> dialog to modify the properties as required.
 For more information on the <guilabel>Launcher Properties</guilabel> dialog,
 see <xref linkend="gospanel-52"/>. </para></listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to apply your changes, then
-  close the <guilabel>Launcher Properties</guilabel> dialog.</para></listitem>
+<listitem><para>Click <guibutton>Close</guibutton> to close the <guilabel>
+Launcher Properties</guilabel> dialog.</para></listitem>
 </orderedlist>
 </sect2>
 </sect1>
@@ -832,15 +777,14 @@ menu and <guimenu>Actions</guimenu> menu are system menus. To add a system
 menu to a panel, right-click on a launcher in the menu, then choose <menuchoice>
 <guimenu>Entire menu</guimenu><guimenuitem>Add this as menu to panel
 </guimenuitem></menuchoice>. </para></listitem>
-<listitem><para><guimenu>GNOME Menu</guimenu>: The <guimenu>GNOME Menu</guimenu>
-is your primary menu. You can access almost all of the applications, commands,
-and configuration options on your desktop from the <guimenu>GNOME Menu</guimenu>.
-To add a <guimenu>GNOME Menu</guimenu> to a panel, right-click on any vacant
-space on the panel to open the panel popup menu. Choose <menuchoice><guimenu>
-Add to panel</guimenu><guimenuitem>GNOME Menu</guimenuitem></menuchoice>.
-You can add as many <guimenu>GNOME Menu</guimenu> objects to your panels as
-you want. By default, the <guimenu>GNOME Menu</guimenu> is represented on
-panels by a stylized footprint icon, as follows:</para>
+<listitem><para><guimenu>GNOME Menu</guimenu>: You can access almost all of
+the applications, commands, and configuration options on your desktop from
+the <guimenu>GNOME Menu</guimenu>. To add a <guimenu>GNOME Menu</guimenu>
+to a panel, right-click on any vacant space on the panel, then choose <menuchoice>
+<guimenu>Add to Panel</guimenu><guimenuitem>GNOME Menu</guimenuitem>
+</menuchoice>. You can add as many <guimenu>GNOME Menu</guimenu> objects to
+your panels as you want. By default, the <guimenu>GNOME Menu</guimenu> is
+represented on panels by a stylized footprint icon, as follows:</para>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -869,14 +813,12 @@ linkend="gospanel-FIG-68"/> shows how menus typically appear on panels. </para>
 </mediaobject>
 </screenshot>
 </figure>
-<para>For more information on menus, see <xref linkend="goseditmainmenu-1"/>.
-</para>
 </sect1>
 <sect1 id="gospanel-17">
 <title>Applets</title>
 <indexterm><primary>applets</primary><secondary>introduction</secondary></indexterm>
 <indexterm><primary>panel objects</primary><secondary>applets</secondary>
-<see>applets</see></indexterm><para>A applet is a small application whose
+<see>applets</see></indexterm><para>An applet is a small application whose
 user interface resides within a panel. You use the applet panel object to
 interact with the applet. For example, the following figure shows the following
 applets, from left to right: </para>
@@ -902,13 +844,10 @@ control the volume of the speaker on your system.</para></listitem>
 <sect2 id="gospanel-40">
 <title>To Add an Applet to a Panel</title>
 <indexterm><primary>applets</primary><secondary>adding to panel</secondary>
-</indexterm><para>You can add an applet to a panel in the following ways: 
-</para>
-<itemizedlist>
-<listitem><para>From the panel popup menu</para>
-<para>Right-click on any vacant space on the panel to open the panel popup
-menu. Choose <guimenu>Add to panel</guimenu>, then choose the applet that
-you want to add from one of the following submenus:</para>
+</indexterm><para>You can add an applet to a panel from the panel popup menu.
+Right-click on any vacant space on the panel to open the panel popup menu.
+Choose <guimenu>Add to Panel</guimenu>, then choose the applet that you want
+to add from one of the following submenus:</para>
 <itemizedlist>
 <listitem><para><guimenu>Accessories</guimenu></para></listitem>
 <listitem><para><guimenu>Amusements</guimenu></para></listitem>
@@ -916,22 +855,17 @@ you want to add from one of the following submenus:</para>
 <listitem><para><guimenu>Multimedia</guimenu></para></listitem>
 <listitem><para><guimenu>Utility</guimenu></para></listitem>
 </itemizedlist>
-</listitem>
-<listitem><para>From any menu</para>
-<para>Open any menu that contains the applet, then drag the applet on to the
-panel. </para>
-
-</listitem>
-</itemizedlist>
+<para>Alternatively, drag the applet from the submenu on to the panel. </para>
 </sect2>
 <sect2 id="gospanel-39">
 <title>To Select an Applet</title>
 <indexterm><primary>applets</primary><secondary>selecting</secondary></indexterm>
 <para>To modify the properties of an applet, you must first right-click on
 the applet to display the panel object popup menu. To move an applet, you
-must middle-click on the applet. Some restrictions apply on where you can
-click on an applet in order to display the panel object popup menu or to move
-the applet, as follows: </para>
+must middle-click on the applet. </para>
+<para>Some restrictions apply on where you can click on an applet in order
+to display the panel object popup menu, or to move the applet, as follows: 
+</para>
 <itemizedlist>
 <listitem><para>Some applets have popup menus of applet-specific commands
 that open when you right-click on particular parts of the applet. For example,
@@ -942,7 +876,7 @@ applet, you must right-click on the handle. If you right-click on a button
 on the right side, a popup menu for the button opens.</para></listitem>
 <listitem><para>Some applets have areas that you cannot use to select the
 applet. For example, the <application>Command Line</application> applet has
-a field in which you enter commands. You can not middle-click or right-click
+a field in which you enter commands. You cannot middle-click or right-click
 on this field to select the applet. Instead, middle-click or right-click on
 another part of the applet. </para></listitem>
 </itemizedlist>
@@ -953,13 +887,12 @@ another part of the applet. </para></listitem>
 </indexterm><para>To modify the preferences for an applet perform the following
 steps: </para>
 <orderedlist>
-<listitem><para>Right-click on the applet to open the panel object popup menu. 
-</para></listitem>
-<listitem><para>Choose <guimenuitem>Preferences</guimenuitem>. Use the <guilabel>
-Preferences</guilabel> dialog to modify the preferences as required. The preferences
-for applets vary depending on the applet.</para></listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to apply your changes, then
- close the <guilabel>Preferences</guilabel> dialog.</para></listitem>
+<listitem><para>Right-click on the applet, then choose <guimenuitem>Preferences
+</guimenuitem>. Use the <guilabel>Preferences</guilabel> dialog to modify
+the preferences as required. The preferences for applets vary depending on
+the applet.</para></listitem>
+<listitem><para>Click <guibutton>Close</guibutton> to close the <guilabel>
+Preferences</guilabel> dialog.</para></listitem>
 </orderedlist>
 </sect2>
 </sect1>
@@ -1006,9 +939,9 @@ a drawer in the following ways: </para>
 </para>
 <itemizedlist>
 <listitem><para>From the panel popup menu</para>
-<para>Right-click on any vacant space on the panel to open the panel popup
-menu. Choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>
-Drawer</guimenuitem></menuchoice>. </para></listitem>
+<para>Right-click on any vacant space on the panel, then choose <menuchoice>
+<guimenu>Add to Panel</guimenu><guimenuitem>Drawer</guimenuitem></menuchoice>. 
+</para></listitem>
 <listitem><para>From any menu</para>
 <para>You can add a menu as a drawer object to a panel.</para>
 <para>To add a menu as a drawer to a panel, open the menu from the panel.
@@ -1019,7 +952,7 @@ Entire menu</guimenu><guimenuitem>Add this as drawer to panel</guimenuitem>
 </sect2>
 <sect2 id="gospanel-54">
 <title>To Add an Object to a Drawer</title>
-<indexterm><primary>drawers</primary><secondary>adding objects</secondary>
+<indexterm><primary>drawers</primary><secondary>adding objects to</secondary>
 </indexterm><para>You add an object to a drawer in the same way that you add
 objects to panels. For more information, see <xref linkend="gospanel-15"/>.
 </para>
@@ -1040,23 +973,9 @@ can change features for each drawer, such as the visual appearance of the
 drawer and whether the drawer has hide buttons.</para>
 <para>To modify properties for a drawer perform the following steps: </para>
 <orderedlist>
-<listitem><para>Right-click on the drawer to open the panel object popup menu. 
-</para></listitem>
-<listitem><para>Choose <guimenuitem>Properties</guimenuitem> to display the <guilabel>
-Panel Properties</guilabel> dialog. The dialog displays the <guilabel>Drawer
-</guilabel> tabbed section, as shown in the following figure.</para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/drawerprop_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows a Panel Properties dialog for a drawer. The context describes the graphic.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+<listitem><para>Right-click on the drawer, then choose <guimenuitem>Properties
+</guimenuitem> to display the <guilabel>Panel Properties</guilabel> dialog.
+The dialog displays the <guilabel>Drawer</guilabel> tabbed section.</para></listitem>
 <listitem><para>Select the properties for the drawer in the dialog. The following
 table describes the elements on the <guilabel>Drawer</guilabel> tabbed section: 
 </para>
@@ -1068,26 +987,9 @@ table describes the elements on the <guilabel>Drawer</guilabel> tabbed section:
 valign="top"><para>Description </para></entry></row>
 </thead>
 <tbody>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Panel size</guilabel></para></entry>
+<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Size</guilabel></para></entry>
 <entry colname="COLSPEC3" valign="top"><para>Select the size of the drawer.
 </para></entry></row>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Panel window level
-</guilabel></para></entry><entry colname="COLSPEC3" valign="top"><para>Select
-the level or layer at which you want the drawer to appear. Select from one
-of the following options:</para><itemizedlist>
-<listitem><para><guilabel>Default (from global preferences)</guilabel>: Select
-this option to use the default setting that is specified in the <application>
-Desktop Preferences</application>. To view the default setting, choose <menuchoice>
-<guimenu>Applications</guimenu><guisubmenu>Desktop Preferences
-</guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Panel</guimenuitem>
-</menuchoice>.</para></listitem>
-<listitem><para><guilabel>Below other windows</guilabel>: Select this option
-if you want the panel to appear below windows.</para></listitem>
-<listitem><para><guilabel>Normal</guilabel>: Select this option if you want
-the panel to appear at the same level as windows.</para></listitem>
-<listitem><para><guilabel>Above other windows</guilabel>: Select this option
-if you want the panel to appear above windows.</para></listitem>
-</itemizedlist></entry></row>
 <row><entry valign="top"><para><guilabel>Tooltip/Name</guilabel></para></entry>
 <entry valign="top"><para>Use this text box to specify a name for the drawer.
 The name appears as a tooltip when you point at the drawer on the panel.</para></entry>
@@ -1114,8 +1016,8 @@ Background</guilabel> tabbed section, see the step on this topic in <xref
 linkend="gospanel-28"/>. You can also drag a color or image on to a drawer
 to set the color or image as the background of the drawer. For more information,
  see <xref linkend="gospanel-61"/>.</para></listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to apply your changes, then
-close the <guilabel>Panel Properties</guilabel> dialog.</para></listitem>
+<listitem><para>Click <guibutton>Close</guibutton> to close the <guilabel>
+Panel Properties</guilabel> dialog.</para></listitem>
 </orderedlist>
 </sect2>
 </sect1>
@@ -1124,15 +1026,15 @@ close the <guilabel>Panel Properties</guilabel> dialog.</para></listitem>
 <para>Your panels can include other panel objects that you can use to perform
 special tasks. You can add the following panel objects to your panels:</para>
 <itemizedlist>
-<listitem><para>Log Out button</para></listitem>
-<listitem><para>Lock Screen button</para></listitem>
+<listitem><para><guibutton>Log Out</guibutton> button</para></listitem>
+<listitem><para><guibutton>Lock</guibutton> button</para></listitem>
 </itemizedlist>
 <para>To add a panel object to a panel perform the following steps: </para>
 <orderedlist>
 <listitem><para>Right-click on any vacant space on the panel, then choose <menuchoice>
-<guimenuitem>Add to panel</guimenuitem></menuchoice> from the panel popup
-menu.</para></listitem>
-<listitem><para>Choose the object you want to add to the panel. </para></listitem>
+<guimenuitem>Add to Panel</guimenuitem></menuchoice>.</para></listitem>
+<listitem><para>Choose the object that you want to add to the panel. </para>
+</listitem>
 </orderedlist>
 <sect2 id="gospanel-20">
 <title>Log Out Button</title>
@@ -1154,26 +1056,26 @@ a GNOME session. </para>
 Log Out</guibutton> button. </para>
 </sect2>
 <sect2 id="gospanel-21">
-<title>Lock Screen Button</title>
+<title>Lock Button</title>
 <screenshot>
 <mediaobject>
   <imageobject>
     <imagedata fileref="figures/lockscreen_icon.png" format="PNG"/>
   </imageobject>
   <textobject>
-	<phrase>Shows Lock Screen icon.</phrase>
+	<phrase>Shows Lock icon.</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
-<indexterm><primary>panel objects</primary><secondary>Lock Screen button</secondary>
-</indexterm><indexterm><primary>Lock Screen button</primary></indexterm><indexterm>
-<primary>locking screen</primary></indexterm><para>The <guibutton>Lock Screen
-</guibutton> button locks your screen and starts a screensaver. To access
-your session again, you must enter your password. To lock your screen correctly,
-you must have a screensaver enabled.</para>
-<para>Right-click on the <guibutton>Lock Screen</guibutton> button to open
-a popup menu of screensaver-related commands. <xref linkend="gosstartsession-TBL-83"/>
-describes the commands that are available from the popup menu.</para>
+<indexterm><primary>panel objects</primary><secondary>Lock button</secondary>
+</indexterm><indexterm><primary>Lock button</primary></indexterm><indexterm>
+<primary>locking screen</primary></indexterm><para>The <guibutton>Lock</guibutton>
+button locks your screen and activates your screensaver. To access your session
+again, you must enter your password. To lock your screen correctly, you must
+have a screensaver enabled.</para>
+<para>Right-click on the <guibutton>Lock</guibutton> button to open a menu
+of screensaver-related commands. <xref linkend="gosstartsession-TBL-83"/>
+describes the commands that are available from the menu.</para>
 <table frame="topbot" id="gosstartsession-TBL-83">
 <title>Lock Screen Menu Items</title>
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC0" colwidth="43.55*"/>
@@ -1184,23 +1086,22 @@ Function</para></entry></row>
 </thead>
 <tbody>
 <row><entry valign="top"><para><guimenuitem>Activate Screensaver</guimenuitem></para></entry>
-<entry valign="top"><para>Starts the screensaver immediately, but does not
-lock the screen.</para></entry></row>
+<entry valign="top"><para>Activates the screensaver immediately, but does
+not lock the screen.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Lock Screen</guimenuitem></para></entry>
 <entry valign="top"><para>Locks the screen immediately. This command performs
-the same function as when you click on the <guibutton>Lock Screen</guibutton>
-button.</para></entry></row>
+the same function as when you click on the <guibutton>Lock</guibutton> button.
+</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Kill Screensaver Daemon</guimenuitem></para></entry>
-<entry valign="top"><para>Kills the screensaver process. After you kill the
-screensaver process, you can not lock your screen.</para></entry></row>
+<entry valign="top"><para>Terminates the screensaver process. After you terminate
+the screensaver process, you cannot lock your screen.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Restart Screensaver Daemon</guimenuitem></para></entry>
-<entry valign="top"><para>Kills and restarts the screensaver process. Use
-this command after you change your password. When you restart the screensaver
-process, to use your new password with the screensaver.</para></entry></row>
+<entry valign="top"><para>Terminates and restarts the screensaver process.
+Use this command after you change your password. When you restart the screensaver
+process, use your new password with the screensaver.</para></entry></row>
 <row><entry valign="top"><para><guimenuitem>Properties</guimenuitem></para></entry>
 <entry valign="top"><para>Displays an <guilabel>XScreenSaver</guilabel> dialog
-that you can use to configure the screensaver. For information on how to configure
-your screensaver, see <xref linkend="gosstartsession-3"/>.</para></entry></row>
+that you can use to configure the screensaver. </para></entry></row>
 </tbody>
 </tgroup>
 </table>
diff --git a/gnome2-user-guide/C/gosstartsession-C.omf b/gnome2-user-guide/C/gosstartsession-C.omf
index 1a3e009..ad391c0 100644
--- a/gnome2-user-guide/C/gosstartsession-C.omf
+++ b/gnome2-user-guide/C/gosstartsession-C.omf
@@ -16,10 +16,10 @@
       Sessions
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Desktop Sessions chapter from GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/gosstartsession.xml b/gnome2-user-guide/C/gosstartsession.xml
index f82ca5e..2d61883 100644
--- a/gnome2-user-guide/C/gosstartsession.xml
+++ b/gnome2-user-guide/C/gosstartsession.xml
@@ -11,7 +11,7 @@ manage, and end a desktop session.</para></highlights>
 <para>A desktop session occurs between the time that you log in to the desktop
  and the time that you log out. The login screen, displayed by the <application>
 Login Manager</application>, is your gateway to the desktop. The login screen
-provides fields for you to enter your user name and password. The <guimenu>
+provides fields for you to enter your username and password. The <guimenu>
 Options</guimenu> menu on the login screen lists your login options, for example
 you can select the language of your session. </para>
 <para>You start a desktop session when you log in. The session manager starts
@@ -24,10 +24,10 @@ following: </para>
 <listitem><para>The appearance and behavior settings, for example fonts, colors,
 and mouse settings. </para></listitem>
 <listitem><para>The applications that you were running, for example file manager
-and text editor windows. You can not save and restore applications that the
+and text editor windows. You cannot save and restore applications that the
 session manager does not manage. For example, if you start the <application>
 vi</application> editor from the command line in a terminal window, session
-manager can not restore your editing session. </para></listitem>
+manager cannot restore your editing session. </para></listitem>
 </itemizedlist></sect1>
 <sect1 id="gosstartsession-1">
 <title>Locking Your Screen</title>
@@ -41,54 +41,59 @@ to configure your screensaver.</para>
     <imagedata fileref="figures/lockscreen_icon.png" format="PNG"/>
   </imageobject>
   <textobject>
-	<phrase>Shows Lock Screen icon.</phrase>
+	<phrase>Shows Lock icon.</phrase>
   </textobject>
 </mediaobject>
 </screenshot>
 <indexterm><primary>sessions</primary><secondary>locking screen</secondary>
 </indexterm><indexterm><primary>locking screen</primary></indexterm><indexterm>
-<primary>Lock Screen button</primary></indexterm><para>To lock the screen,
-perform one of the following actions:</para>
+<primary>Lock button</primary></indexterm><para>To lock the screen, perform
+one of the following actions:</para>
 <itemizedlist>
 <listitem><para>Choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>
 Lock Display</guimenuitem></menuchoice>.</para></listitem>
-<listitem><para>If the <guibutton>Lock Screen</guibutton> button is present
-on a panel, click on the <guibutton>Lock Screen</guibutton> button. </para>
-<para>To add the <guibutton>Lock Screen</guibutton> button to a panel, right-click
-on the panel. Choose <menuchoice><guimenu>Add to panel</guimenu><guimenuitem>
-Lock button</guimenuitem></menuchoice> from the panel popup menu.</para></listitem>
+<listitem><para>If the <guibutton>Lock</guibutton> button is present on a
+panel, click on the <guibutton>Lock</guibutton> button. </para>
+<para>To add the <guibutton>Lock</guibutton> button to a panel, right-click
+on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>
+Lock button</guimenuitem></menuchoice>.</para></listitem>
 </itemizedlist>
 <para>When you lock your screen, the screensaver starts. To unlock the screen,
 move your mouse to display the locked screen dialog. Enter your username and
-password in the locked screen dialog, then press <keycap>Enter</keycap>.</para>
+password in the locked screen dialog, then press <keycap>Return</keycap>.
+</para>
 <note><para>To lock your screen correctly, you must have a screensaver enabled.
 </para>
 </note>
 </sect2>
 <sect2 id="gosstartsession-3">
-<title>To Set a Screensaver</title>
-<indexterm><primary>sessions</primary><secondary>setting screensaver</secondary>
-</indexterm><indexterm><primary>screensaver, setting</primary></indexterm>
-<indexterm><primary>xscreensaver</primary><see>screensaver</see></indexterm>
-<para>To set your screensaver, perform the following steps:</para>
+<title>To Configure Your Screensaver</title>
+<indexterm><primary>sessions</primary><secondary>configuring screensaver</secondary>
+</indexterm><indexterm><primary>screensaver, configuring</primary></indexterm>
+<indexterm><primary>XScreenSaver</primary><see>screensaver</see></indexterm>
+<para>A screensaver is an application that you can use to replace the image
+on your screen when the screen is not in use. You can use screensavers in
+the following ways:</para>
+<itemizedlist>
+<listitem><para>Activate after a specified period of idle time.</para></listitem>
+<listitem><para>Activate when you lock your screen.</para></listitem>
+<listitem><para>Manage power used by your monitor when your system is idle.
+</para></listitem>
+</itemizedlist>
+<para>To configure your screensaver application, perform the following steps:
+</para>
 <orderedlist>
-<listitem><para>Right-click on the <guibutton>Lock Screen</guibutton> button,
-then choose <guimenuitem>Properties</guimenuitem> from the popup menu. An <guilabel>
+<listitem><para>Right-click on the <guibutton>Lock</guibutton> button, then
+choose <guimenuitem>Properties</guimenuitem> from the popup menu. An <guilabel>
 XScreenSaver</guilabel> dialog is displayed.</para>
-<para>If the <guibutton>Lock Screen</guibutton> button is not present on a
-panel, you can add the button to a panel. To add the <guibutton>Lock Screen
-</guibutton> button to a panel, right-click on the panel. Choose <menuchoice>
-<guimenu>Add to panel</guimenu><guimenuitem>Lock button</guimenuitem>
-</menuchoice> from the panel popup menu. </para></listitem>
-<listitem><para>Choose the screensaver that you require from the list box
-at the left side of the <guilabel>XScreenSaver</guilabel> dialog. </para>
-</listitem>
-<listitem><para>To enable the screensaver, select the <guilabel>Enabled</guilabel>
-option.</para></listitem>
-<listitem><para>To configure your screensaver, click on the <guilabel>Screensaver
-Options</guilabel> tab. Configure your screensaver in the <guilabel>Screensaver
-Options</guilabel> tabbed section. The following table describes the dialog
-elements on the <guilabel>Screensaver Options</guilabel> tabbed section: 
+<para>If the <guibutton>Lock</guibutton> button is not present on a panel,
+you can add the button to a panel. To add the <guibutton>Lock</guibutton>
+button to a panel, right-click on the panel. Choose <menuchoice><guimenu>
+Add to Panel</guimenu><guimenuitem>Lock button</guimenuitem></menuchoice>. 
+</para></listitem>
+<listitem><para>To configure your screensaver application, use the elements
+in the <guilabel>Display Modes</guilabel> tab. The following table describes
+the dialog elements on the <guilabel>Display Modes</guilabel> tabbed section: 
 </para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC2" colwidth="40.38*"/>
@@ -98,69 +103,135 @@ elements on the <guilabel>Screensaver Options</guilabel> tabbed section:
 Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry valign="top"><para><guilabel>Saver Timeout</guilabel></para></entry>
-<entry valign="top"><para>Specify how long to wait to start the screensaver
-after the last use of the mouse or keyboard.</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Mode</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Use the drop-down list box to specify the
+behavior of the screensaver application. Select from the following options:
+</para><itemizedlist>
+<listitem><para><guilabel>Disable Screen Saver</guilabel>: Select this option
+if you do not want to use the screensaver application.</para></listitem>
+<listitem><para><guilabel>Blank Screen Only</guilabel>: Select this option
+if you want your screen to become blank when your screen locks.</para></listitem>
+<listitem><para><guilabel>Only One Screen Saver</guilabel>: Select this option
+if you want to display a single screensaver display from the  display list
+box when your screen locks.</para></listitem>
+<listitem><para><guilabel>Random Screen Saver</guilabel>: Select this option
+if you want to display a random selection of screensaver displays from the
+screensaver display list box when your screen locks. </para></listitem>
+</itemizedlist></entry></row>
+<row><entry colname="COLSPEC2"><para>Display list box</para></entry><entry
+colname="COLSPEC3"><para>Select the screensaver display that you require from
+the list box.</para></entry></row>
+<row><entry valign="top"><para><guilabel>Blank After</guilabel></para></entry>
+<entry valign="top"><para>Specify how long to wait after the last use of the
+mouse or keyboard, to activate the screensaver.</para></entry></row>
 <row>
 
-<entry valign="top"><para><guilabel>Cycle Timeout</guilabel></para></entry>
-<entry valign="top"><para>Specify how long to display a particular screensaver
-before the next screensaver starts.</para></entry></row>
+<entry valign="top"><para><guilabel>Cycle After</guilabel></para></entry>
+<entry valign="top"><para>Specify how long to show a particular screensaver
+display before the next display.</para></entry></row>
+<row><entry valign="top"><para><guilabel>Lock Screen After</guilabel></para></entry>
+<entry valign="top"><para>Select this option if you want the screen to lock
+after the screensaver is activated. Use the spin box to specify the delay
+between the activation of the screensaver and when the screen locks.</para></entry>
+</row>
+<row><entry colname="COLSPEC2" valign="top"><para><guibutton>Preview</guibutton></para></entry>
+<entry colname="COLSPEC3" valign="top"><para>Click on this button to preview
+the screensaver display that is selected in the screensaver display list box.
+To stop the preview, press any key or click a mouse button.</para></entry>
+</row>
+<row><entry colname="COLSPEC2" valign="top"><para><guibutton>Settings</guibutton></para></entry>
+<entry colname="COLSPEC3" valign="top"><para>Click on this button to display
+the options for the screensaver display that is selected in the screensaver
+display list box. </para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</listitem>
+<listitem><para>To configure advanced options, click on the <guilabel>Advanced
+</guilabel> tab. The following table describes the dialog elements on the <guilabel>
+Advanced</guilabel> tabbed section: </para>
+<informaltable frame="topbot">
+<tgroup cols="2" colsep="0" rowsep="0"><colspec colname="COLSPEC2" colwidth="40.38*"/>
+<colspec colname="COLSPEC3" colwidth="59.62*"/>
+<thead>
+<row rowsep="1"><entry valign="top"><para>Setting</para></entry><entry valign="top"><para>
+Function</para></entry></row>
+</thead>
+<tbody>
+<row><entry colname="COLSPEC2"><para><guilabel>Grab Desktop Images</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Some screensavers can take a screenshot of
+your desktop, then manipulate the screenshot to create your screensaver display.
+Select this option to enable screensavers to take a screenshot of your desktop.
+</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Grab Video Frames</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Some screensavers can capture a frame of video,
+then manipulate the captured image to create your screensaver display. If
+your system has a video capture card, select this option to enable screensavers
+to capture a frame of video.</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Choose Random Image</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Select this option to enable screensavers
+to use images from a directory that you select. Type the path for the directory
+in the field. Alternatively, click <guibutton>Browse</guibutton> to display
+a dialog from which you can select a directory.</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Verbose Dialognostics</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Select this option if you want to display
+screensaver diagnostic information.</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Display Subprocess Errors</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Select this option if you want to display
+errors related to screensaver subprocesses on screen.</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Display Splash Screen at Startup
+</guilabel></para></entry><entry colname="COLSPEC3"><para>Select this option
+to if you want <application>Xscreensaver</application> to display a splash
+dialog when <application>Xscreensaver</application> starts.</para></entry>
+</row>
+<row><entry colname="COLSPEC2"><para><guilabel>Power Management Enabled</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Select this option to enable power management
+of your monitor. Power management can reduce energy consumption by your monitor
+when you are not using the monitor.</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Standby After</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Specify how long to wait to put the monitor
+in standby mode. When the monitor is in standby mode, the screen is black.
+</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Suspend After</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Specify how long to wait to put the monitor
+in power-saving mode. </para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Off After</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Specify how long to wait to switch off monitor. 
+</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Install Colormap</guilabel></para></entry>
+<entry colname="COLSPEC3"><para>Select this option to install a private colormap
+when the screensaver is active. Use of a private colormap might improve the
+quality of the color in particular screensaver displays.</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Fade to Black When Blanking
+</guilabel></para></entry><entry colname="COLSPEC3"><para>Select this option
+if you want your display to fade to black when the screensaver activates.
+</para></entry></row>
+<row><entry colname="COLSPEC2"><para><guilabel>Fade from Black When Unblanking
+</guilabel></para></entry><entry colname="COLSPEC3"><para>Select this option
+if you want your display to fade from black to the screen contents when the
+screensaver stops.</para></entry></row>
 <row><entry valign="top"><para><guilabel>Fade Duration</guilabel></para></entry>
 <entry valign="top"><para>Specify how long to take to fade to black when the
-screensaver starts.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Fade Ticks</guilabel></para></entry>
-<entry valign="top"><para>Type how many times per second the colormap changes
-to create a fade effect. Specify a high number for a smooth fade. However,
-a high number in this text box might cause the fade to take longer than the <guilabel>
-Fade Duration</guilabel>.</para></entry></row>
-<row><entry valign="top"><para><guilabel>Lock Timeout</guilabel></para></entry>
-<entry valign="top"><para>Specify the delay between the start of the screensaver
-and when the screen locks.</para></entry></row>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Password Timeout
-</guilabel></para></entry><entry colname="COLSPEC3" valign="top"><para>Specify
-how long to display the password dialog before displaying the screensaver
-again.</para></entry></row>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Verbose</guilabel></para></entry>
-<entry colname="COLSPEC3" valign="top"><para>Select this option if you want
-to display screensaver diagnostic information.</para></entry></row>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Install Colormap
-</guilabel></para></entry><entry colname="COLSPEC3" valign="top"><para>Select
-this option to install a private colormap when the screensaver is active.
-Use of a private colormap might improve the quality of the color in particular
-screensavers.</para></entry></row>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Fade Colormap
-</guilabel></para></entry><entry colname="COLSPEC3" valign="top"><para>Select
-this option if you want your display to fade to black when the screensaver
-starts.</para></entry></row>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Unfade Colormap
-</guilabel></para></entry><entry colname="COLSPEC3" valign="top"><para>Select
-this option if you want your display to fade from black to the screen contents
-when the screensaver ends.</para></entry></row>
-<row><entry colname="COLSPEC2" valign="top"><para><guilabel>Require Password
-</guilabel></para></entry><entry colname="COLSPEC3" valign="top"><para>Select
-this option to require the entry of your password to return to the desktop
-after the screensaver locks.</para></entry></row>
+screensaver activates.</para></entry></row>
 </tbody>
 </tgroup>
 </informaltable>
 </listitem>
-<listitem><para>Click <guibutton>OK</guibutton> to apply your changes, then
-close the <guilabel>XScreenSaver</guilabel> dialog.</para></listitem>
+<listitem><para>Click on the <guibutton>Close Window</guibutton> window frame
+button to close the <guilabel>XScreenSaver</guilabel> dialog.</para></listitem>
 </orderedlist>
 </sect2>
 </sect1>
 <sect1 id="gosstartsession-2">
 <title>Managing the Session</title>
-<indexterm><primary>preference tools</primary><secondary>Session Properties
-&amp; Startup Programs</secondary></indexterm><indexterm><primary>sessions
-</primary><secondary>managing</secondary></indexterm><para>To configure the
-session management of the GNOME desktop, choose <menuchoice><guimenu>Applications
-</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guisubmenu>
-Advanced</guisubmenu><guimenuitem>Session Properties &amp; Startup
-Programs</guimenuitem></menuchoice>. The <application>Session Properties &amp;
-Startup Programs</application> preference tool recognizes the following types
-of application: </para>
+<indexterm><primary>preference tools</primary><secondary>Sessions</secondary>
+</indexterm><indexterm><primary>sessions</primary><secondary>managing</secondary>
+</indexterm><para>To configure the session management of the GNOME desktop,
+choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop
+Preferences</guisubmenu><guisubmenu>Advanced</guisubmenu>
+<guimenuitem>Sessions</guimenuitem></menuchoice>. The <application>Sessions
+</application> preference tool recognizes the following types of application: 
+</para>
 <itemizedlist>
 <listitem><indexterm><primary>startup applications</primary><secondary>session-managed
 </secondary></indexterm><para>Applications that are session-managed. When
@@ -171,10 +242,9 @@ manager automatically starts the session-managed applications. </para></listitem
 settings for your session, the session manager does not save any applications
 that are not session-managed. If you log out, then log in again, the session
 manager does not start non-session-managed applications. You must start the
-application manually. Alternatively, you can use the <application>Session
-Properties &amp; Startup Programs</application> preference tool to specify
-non-session-managed applications that you want to automatically start. For
-more information, see <xref linkend="goscustsession-5"/>.</para></listitem>
+application manually. Alternatively, you can use the <application>Sessions
+</application> preference tool to specify non-session-managed applications
+that you want to automatically start. </para></listitem>
 </itemizedlist>
 <sect2 id="gosstartsession-9">
 <title>Defining Session Behavior When You Log In and Log Out</title>
@@ -183,10 +253,9 @@ more information, see <xref linkend="goscustsession-5"/>.</para></listitem>
 </secondary></indexterm><para>To set how a session behaves when you log in
 and log out, choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>
 Desktop Preferences</guisubmenu><guisubmenu>Advanced</guisubmenu>
-<guimenuitem>Session Properties &amp; Startup Programs</guimenuitem></menuchoice>.
-Make the changes you require in the <guilabel>Session Options</guilabel> tabbed
-section. For example, you can select to display a splash screen when you log
-in. </para>
+<guimenuitem>Sessions</guimenuitem></menuchoice>. Make the changes you require
+in the <guilabel>Session Options</guilabel> tabbed section. For example, you
+can select to display a splash screen when you log in. </para>
 </sect2>
 <sect2 id="gosstartsession-6">
 <title>To Use Startup Applications</title>
@@ -198,7 +267,7 @@ can configure your sessions to start with applications that are not session-mana
 To configure non-session-managed startup applications, choose <menuchoice>
 <guimenu>Applications</guimenu><guisubmenu>Desktop Preferences
 </guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Session
-Properties &amp; Startup Programs</guimenuitem></menuchoice>. Use the <guilabel>
+Properties &amp; Startup Progras</guimenuitem></menuchoice>. Use the <guilabel>
 Startup Programs</guilabel> tabbed section to add, edit, and delete applications.
 If you save your settings and log out, the next time that you log in, the
 startup applications start automatically. </para>
@@ -208,9 +277,9 @@ startup applications start automatically. </para>
 <indexterm><primary>sessions</primary><secondary>browsing applications</secondary>
 </indexterm><para>To browse the applications in the current session, choose <menuchoice>
 <guimenu>Applications</guimenu><guisubmenu>Desktop Preferences
-</guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Session
-Properties &amp; Startup Programs</guimenuitem></menuchoice>. The <guilabel>
-Current Session</guilabel> tabbed section lists the following:</para>
+</guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Sessions
+</guimenuitem></menuchoice>. The <guilabel>Current Session</guilabel> tabbed
+section lists the following:</para>
 <itemizedlist>
 <listitem><para>All GNOME applications that are currently running, that can
 connect to the session manager, and that can save the state of the application.
@@ -221,8 +290,8 @@ manager, and that can save the state of the tool.</para></listitem>
 <para>You can use the <guilabel>Current Session</guilabel> tabbed section
 to perform a limited number of actions on the session properties of an application
 or preference tool. For example, you can edit the startup order, and restart
-style of any GNOME application or desktop preference tool that is in the list.
-For more information, see <xref linkend="goscustlookandfeel-27"/>.</para>
+style of any GNOME application or desktop preference tool that is in the list. 
+</para>
 </sect2>
 <sect2 id="gosgetstarted-74">
 <title>To Save Session Settings</title>
@@ -233,11 +302,10 @@ For more information, see <xref linkend="goscustlookandfeel-27"/>.</para>
 <listitem><para>Configure your session to automatically save settings when
 you end the session. To configure your session, choose <menuchoice><guimenu>
 Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu>
-<guisubmenu>Advanced</guisubmenu><guimenuitem>Session Properties &amp;
-Startup Programs</guimenuitem></menuchoice>. The <application>Session Properties
-&amp; Startup Programs</application> preference tool starts. Select the <guilabel>
-Automatically save changes to session</guilabel> option on the <guilabel>
-Session Options</guilabel> tabbed section.</para></listitem>
+<guisubmenu>Advanced</guisubmenu><guimenuitem>Sessions</guimenuitem>
+</menuchoice>. The <application>Sessions</application> preference tool starts.
+Select the <guilabel>Automatically save changes to session</guilabel> option
+on the <guilabel>Session Options</guilabel> tabbed section.</para></listitem>
 <listitem><para>End your session. </para></listitem>
 </orderedlist>
 <para>If you do not select the <guilabel>Automatically save changes to session
@@ -267,15 +335,15 @@ perform one of the following actions:</para>
 <listitem><para>Click on the <guibutton>Log Out</guibutton> button.</para>
 </listitem>
 <listitem><para>Choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>
-Log out</guimenuitem></menuchoice>.</para></listitem>
+Log Out</guimenuitem></menuchoice>.</para></listitem>
 <listitem><para>Open the <guimenu>GNOME Menu</guimenu>, then choose <guimenuitem>
-Log out</guimenuitem>.</para></listitem>
+Log Out</guimenuitem>.</para></listitem>
 </itemizedlist>
-<para>Before you end a desktop session you might want to save your current
-settings so that you can restore the session later. During the log out process,
+<para>Before you end a desktop session, you might want to save your current
+settings so that you can restore the session later. During the logout process,
 a dialog asks if you want to save your current settings. In the <application>
-Session Properties &amp; Startup Programs</application> preference tool, you
-can select an option to automatically save your current settings.</para>
+Sessions</application> preference tool, you can select an option to automatically
+save your current settings.</para>
 </sect1>
 </chapter>
 
diff --git a/gnome2-user-guide/C/part1-C.omf b/gnome2-user-guide/C/part1-C.omf
index 9195d37..33f715c 100644
--- a/gnome2-user-guide/C/part1-C.omf
+++ b/gnome2-user-guide/C/part1-C.omf
@@ -16,10 +16,10 @@
       Part I: GNOME Components
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Part I of GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/part1.xml b/gnome2-user-guide/C/part1.xml
index 1e4a395..9f4cc48 100644
--- a/gnome2-user-guide/C/part1.xml
+++ b/gnome2-user-guide/C/part1.xml
@@ -8,44 +8,43 @@ also provides information that helps you to start working with the desktop.
 The desktop is very configurable, therefore this section covers the main functional
 possibilities of the desktop features. If you want to find out how to implement
 the various configuration possibilities that are mentioned in this section,
-see <xref linkend="part2-1"/>. The chapters in this section are as follows: 
-</para>
+see Customizing Your GNOME Desktop. The chapters in this section
+are as follows: </para>
 <itemizedlist>
-<listitem><para><xref linkend="gosbasic-1"/></para>
+<listitem><para>Basic Skills</para>
 <para>Read this chapter to find out about mouse usage, shortcut keys, basic
 window skills, and basic dialog skills. </para></listitem>
-<listitem><para><xref linkend="gosoverview-1"/></para>
+<listitem><para>Overview of the Desktop</para>
 <para>Read this chapter for an introduction to the major components and functions
  of the desktop. If you do not read anything else in this manual, read this
 chapter.</para></listitem>
-<listitem><para><xref linkend="gosgetstarted-1"/></para>
+<listitem><para>Desktop Sessions</para>
 <para>Read this chapter for information about how to start, manage, and end
 desktop sessions. </para></listitem>
-<listitem><para><xref linkend="gospanel-1"/></para>
+<listitem><para>Working With Panels</para>
 <para>Read this chapter to find out more about using panels in the desktop.
 Panels are a key component of the desktop. This chapter tells you how to use
 the different parts of your panels, and how to invoke the available functions
 of the desktop using panels.</para></listitem>
-<listitem><para><xref linkend="goseditmainmenu-1"/></para>
+<listitem><para>Working With Menus</para>
 <para>Read this chapter to find out more about using menus in the desktop. 
 </para></listitem>
-<listitem><para><xref linkend="gosmetacity-1"/></para>
+<listitem><para>Working With Windows</para>
 <para>Read this chapter to find out more about using windows in the desktop.
 This chapter describes basic windows functions such as moving and resizing.
  This chapter also describes the controls that you use with windows. </para>
 </listitem>
-<listitem><para><xref linkend="gosnautilus-1"/></para>
+<listitem><para>Nautilus File Manager</para>
 <para>Read this chapter to find out more about the <application>Nautilus</application>
 file manager. This chapter describes how to use <application>Nautilus</application>
 to work with your file system. This chapter also describes how to customize <application>
 Nautilus</application>.</para></listitem>
-<listitem><para><xref linkend="gosdeskback-1"/></para>
+<listitem><para>Using the Desktop Background</para>
 <para>Read this chapter to find out more about using the desktop background.
 This chapter describes how to use the desktop background to start applications,
 and open your files and folders. The chapter also describes how to use <guilabel>
-Trash</guilabel> from the desktop, how to use the <guimenu>Desktop
-Background</guimenu> menu, and how to customize the desktop background.</para>
-</listitem>
+Trash</guilabel> from the desktop, how to use the <guimenu>Desktop Background
+</guimenu> menu, and how to customize the desktop background.</para></listitem>
 </itemizedlist>
 </partintro>&gosbasic;
 &gosoverview;
diff --git a/gnome2-user-guide/C/part2-C.omf b/gnome2-user-guide/C/part2-C.omf
index 3382201..c7dd9b3 100644
--- a/gnome2-user-guide/C/part2-C.omf
+++ b/gnome2-user-guide/C/part2-C.omf
@@ -16,10 +16,10 @@
       Part II: Preferences
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       Part II of GNOME Desktop 2.0 User Guide. 
diff --git a/gnome2-user-guide/C/part2.xml b/gnome2-user-guide/C/part2.xml
index 45e5d65..fb282d8 100644
--- a/gnome2-user-guide/C/part2.xml
+++ b/gnome2-user-guide/C/part2.xml
@@ -5,8 +5,8 @@
 <title>Customizing Your GNOME Desktop</title>
 <partintro><para>You can customize many of the characteristics of your desktop.
 The customization of each aspect of the desktop is controlled by a dedicated
-software tool that is called a desktop preference tool. For convenience, the preference
-tools are grouped under the following headings:</para>
+software tool that is called a desktop preference tool. For convenience, the
+preference tools are grouped under the following headings:</para>
 <itemizedlist>
 <listitem><para>Basic</para></listitem>
 <listitem><para><guilabel>Accessibility</guilabel></para></listitem>
@@ -28,18 +28,20 @@ to display your preference tools. Double-click on the tool that you require.
 <para>This section describes how to configure the desktop in the following
 chapters. </para>
 <itemizedlist>
-<listitem><para><xref linkend="goscustdesk-6"/></para>
+<listitem><para>Using the Basic Preference Tools</para>
 <para>Read this chapter to find out how to customize your desktop background.
 This chapter also contains information on how to configure your keyboard settings
 and your mouse settings. This chapter also describes how to configure shortcut
-keys, and how to set your sound preferences. This chapter also contains information
-on how to choose a theme and fonts for your desktop,
-and how to customize your application menubars and toolbars. This chapter also describes how to customize window focus behavior. </para></listitem>
-<listitem><para><xref linkend="goscustuserinter-1"/></para>
+keys, how to set your sound preferences, and how to configure your network
+proxy. This chapter also contains information on how to choose a theme and
+fonts for your desktop, and how to customize your application menubars and
+toolbars. This chapter also describes how to customize window focus behavior.
+</para></listitem>
+<listitem><para>Using the Advanced Preference Tools</para>
 <para>This chapter describes how to configure file types, your preferred applications,
 and your panels. This chapter also contains information on how to customize
 your sessions and startup programs. </para></listitem>
-<listitem><para><xref linkend="goscustaccess-1"/></para>
+<listitem><para>Using the Accessibility Preference Tools</para>
 <para>Read this chapter to find out how to use the accessibility features
 of the desktop. This chapter describes how to use the keyboard accessibility
 features.</para></listitem>
diff --git a/gnome2-user-guide/C/user-guide-C.omf b/gnome2-user-guide/C/user-guide-C.omf
index f874e63..2af3c9e 100644
--- a/gnome2-user-guide/C/user-guide-C.omf
+++ b/gnome2-user-guide/C/user-guide-C.omf
@@ -16,10 +16,10 @@
       User Guide
     </title>
     <date>
-      2002-05-29
+      2002-08-02
     </date>
-    <version identifier="2.0" date="2002-05-29" 
-    description="Updated for GNOME 2.0"/>
+    <version identifier="2.0.1" date="2002-08-02" 
+    description="Updated for GNOME 2.0.1"/>
     <subject category="GNOME|Desktop"/>
     <description>
       User Guide for GNOME 2.0. 
diff --git a/gnome2-user-guide/C/user-guide.xml b/gnome2-user-guide/C/user-guide.xml
index cfde4cf..4e7e487 100644
--- a/gnome2-user-guide/C/user-guide.xml
+++ b/gnome2-user-guide/C/user-guide.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY gnomeversion "2.0">
-  <!ENTITY manrevision "1.0">
-  <!ENTITY date "May 2002">
+  <!ENTITY manrevision "2.1">
+  <!ENTITY date "August 2002">
   <!ENTITY LEGAL SYSTEM "legal.xml">
   <!ENTITY PART1 SYSTEM "part1.xml">
   <!ENTITY gosbasic SYSTEM "gosbasic.xml">
author	Eugene O'Connor <eoconnor@src.gnome.org>	2002-08-02 17:25:04 +0000
committer	Eugene O'Connor <eoconnor@src.gnome.org>	2002-08-02 17:25:04 +0000
commit	0845de90db8371f79fd415dc7f0f1a03b83329a3 (patch)
tree	391b81cd6c6067d72fc4fd7b4bf5e1057787f3b5
parent	203c753eb772dd3c5e9e97f1b1b1c2608b1b1a14 (diff)
download	gnome-user-docs-0845de90db8371f79fd415dc7f0f1a03b83329a3.tar.gz gnome-user-docs-0845de90db8371f79fd415dc7f0f1a03b83329a3.tar.xz gnome-user-docs-0845de90db8371f79fd415dc7f0f1a03b83329a3.zip