Updates to User Guide for GNOME 2.6.

21 files changed, 5411 insertions, 3186 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 3086c2d..bc92cba 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-09  Brian Casey <brian.casey@sun.com>
+
+   * Updated User Guide for GNOME 2.6.
+
 2004-01-30  Shaun McCance  <shaunm@gnome.org>
 
 	* Makefile.am:
diff --git a/gnome2-user-guide/C/figures/gnome-logo-icon.png b/gnome2-user-guide/C/figures/gnome-logo-icon.png
index 46457dd..06721a9 100644
--- a/gnome2-user-guide/C/figures/gnome-logo-icon.png
+++ b/gnome2-user-guide/C/figures/gnome-logo-icon.png
diff --git a/gnome2-user-guide/C/figures/titlebar_anno_window.png b/gnome2-user-guide/C/figures/titlebar_anno_window.png
index 845eb99..db03e36 100644
--- a/gnome2-user-guide/C/figures/titlebar_anno_window.png
+++ b/gnome2-user-guide/C/figures/titlebar_anno_window.png
diff --git a/gnome2-user-guide/C/figures/titlebar_anno_window.xcf b/gnome2-user-guide/C/figures/titlebar_anno_window.xcf
index c4b6193..0f82447 100644
--- a/gnome2-user-guide/C/figures/titlebar_anno_window.xcf
+++ b/gnome2-user-guide/C/figures/titlebar_anno_window.xcf
diff --git a/gnome2-user-guide/C/glossary.xml b/gnome2-user-guide/C/glossary.xml
index dcd445b..678a4f7 100644
--- a/gnome2-user-guide/C/glossary.xml
+++ b/gnome2-user-guide/C/glossary.xml
@@ -12,7 +12,7 @@ keyboard. </para>
   <glossentry id="glossary-40">
     <glossterm>desktop</glossterm>
     <glossdef>
-      <para>The part of the desktop environment where there are no interface
+      <para>The part of the GNOME Desktop where there are no interface
 graphical items, such as panels and windows.</para>
     </glossdef>
   </glossentry>
@@ -30,14 +30,6 @@ folders, and applications. You can use desktop objects to provide convenient
 access to files, folders, and applications that you use frequently.</para>
     </glossdef>
   </glossentry>
-  <glossentry id="glossary-30">
-    <glossterm>desktop environment</glossterm>
-    <glossdef>
-      <para>A windows-based environment for users. The desktop environment
-is the sum of all the parts of your working environment. The desktop environment
-includes all of your panels and windows, the desktop, and all of your workspaces. </para>
-    </glossdef>
-  </glossentry>
   <glossentry id="glossary-20">
     <glossterm>DNS name</glossterm>
     <glossdef>
@@ -63,7 +55,8 @@ on the media. </para>
     <glossterm>GNOME-compliant application</glossterm>
     <glossdef>
       <para>An application that uses the standard GNOME programming libraries
-is called a GNOME-compliant application. For example, <application>Nautilus</application> and <application>gedit</application> are GNOME-compliant applications.</para>
+is called a GNOME-compliant application. For example, <application>Nautilus</application> file manager and <application>gedit</application> text editor
+are GNOME-compliant applications.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-21">
@@ -106,9 +99,9 @@ to an email.</para>
   <glossentry id="glossary-24">
     <glossterm>mount</glossterm>
     <glossdef>
-      <para>To <firstterm>mount</firstterm> is to make a file system available
-for access. When you mount a file system, the file system is attached as a
-subdirectory to your file system. </para>
+      <para>To mount is to make a file system available for access. When
+you mount a file system, the file system is attached as a subdirectory to
+your file system. </para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-4">
@@ -121,7 +114,7 @@ subdirectory to your file system. </para>
     <glossterm>preference tool</glossterm>
     <glossdef>
       <para>A dedicated software tool that controls a particular part
-of the behavior of the desktop environment.</para>
+of the behavior of the GNOME Desktop.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-5">
@@ -189,15 +182,15 @@ list view which enables you to display the contents of a folder as a list. </par
     <glossdef>
       <para>A <application>Nautilus</application> component that enables
 you to display a particular type of file in the view pane. A viewer component
-might add menu items that are relevant to the file type to the Nautilus menus.
-A viewer component might also enable you to use the <application>Nautilus</application> zoom buttons to change the size of the item in the view pane.</para>
+might add menu items that are relevant to the file type to the file manager
+menus. A viewer component might also enable you to use the <application>Nautilus</application> zoom buttons to change the size of the item in the view pane.</para>
     </glossdef>
   </glossentry>
   <glossentry id="glossary-7">
     <glossterm>workspace</glossterm>
     <glossdef>
-      <para>A workspace is a discrete area in the desktop environment
-in which you can work. </para>
+      <para>A workspace is a discrete area in the GNOME Desktop in which
+you can work. </para>
     </glossdef>
   </glossentry>
 </glossary>
diff --git a/gnome2-user-guide/C/gosbasic.xml b/gnome2-user-guide/C/gosbasic.xml
index f8cb208..0dc3cde 100644
--- a/gnome2-user-guide/C/gosbasic.xml
+++ b/gnome2-user-guide/C/gosbasic.xml
@@ -42,10 +42,10 @@ middle mouse button. </para>
           <colspec colname="colspec1" colwidth="63.64*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Mouse Button</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Definition </para>
               </entry>
             </row>
@@ -81,9 +81,9 @@ of a mouse device configured for normal right-hand use. </para>
           </tbody>
         </tgroup>
       </informaltable>
-      <para>To reverse the handedness of your mouse device, open the , then select
-the options that you require. If you do reverse the handedness of your mouse
-device, then you must reverse the mouse button conventions used in this manual.</para>
+      <para>To reverse the handedness of your mouse device, start the <application>Mouse</application> preference tool, then select the options that you require.
+If you do reverse the handedness of your mouse device, then you must reverse
+the mouse button conventions used in this manual.</para>
     </sect2>
     <sect2 id="gosgetstarted-45">
       <title>Mouse Actions</title>
@@ -99,10 +99,10 @@ the mouse:</para>
           <colspec colname="colspec1" colwidth="63.64*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Mouse Button</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Usage</para>
               </entry>
             </row>
@@ -166,10 +166,10 @@ that you take with the mouse are as follows: </para>
           <colspec colname="colspec1" colwidth="63.64*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Action</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Definition </para>
               </entry>
             </row>
@@ -284,13 +284,13 @@ pointers.</para>
           <colspec colname="colspec1" colwidth="63.64*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Pointer</para>
               </entry>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec2">
                 <para>Associated Action</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Description</para>
               </entry>
             </row>
@@ -545,123 +545,119 @@ pointer. Indicates that you have selected a column in a table to resize.</para>
     <para>For almost every task that you can perform with
 the mouse, you can use the keyboard to perform the same task. <firstterm>Shortcut keys</firstterm> are keys that provide you with a quick way to perform
 a task. </para>
-    <para>You can use shortcut keys to perform desktop environment tasks and to
-work with interface items such as panels and windows. You can also use shortcut
-keys in applications. To customize your shortcut keys, use the <application>Keyboard Shortcuts</application> preference tool.</para>
-    <para>You can also modify your desktop environment preferences to use keyboard
-accessibility features. </para>
+    <para>You can use shortcut keys to perform general GNOME Desktop tasks and
+to work with interface items such as panels and windows. You can also use
+shortcut keys in applications. To customize your shortcut keys, use the <application>Keyboard Shortcuts</application> preference tool.</para>
+    <para>You can also modify the GNOME Desktop preferences to use keyboard accessibility
+features. </para>
     <para>The following sections describe the shortcut keys that you can use.</para>
     <sect2 id="gosbasic-62">
-      <title>Desktop Environment Shortcut Keys</title>
+      <title>General Shortcut Keys</title>
       <indexterm>
         <primary>shortcut keys</primary>
-        <secondary>desktop environment</secondary>
+        <secondary>general</secondary>
       </indexterm>
-      <para>Desktop environment shortcut keys enable you
-to use the keyboard to perform desktop environment tasks. The following table
-lists some desktop environment shortcut keys:</para>
+      <para>General shortcut keys enable you to use the keyboard to
+perform general GNOME Desktop tasks. The following table lists some general
+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">
+              <entry>
                 <para>Default Shortcut Keys</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Function</para>
               </entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Opens the <guimenu>Main Menu</guimenu>.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
-                <para>Displays the <guilabel>Run Application</guilabel>
-dialog.</para>
+              <entry colname="colspec1" valign="top">
+                <para>Displays the <guilabel>Run Application</guilabel> dialog.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>Print Screen</keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Takes a screenshot. </para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
-                <para><keycombo><keycap>Alt</keycap><keycap>Print
-Screen</keycap></keycombo></para>
+              <entry colname="colspec0" valign="top">
+                <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 colname="colspec1" valign="top">
+                <para>Takes a screenshot of the window that has focus. </para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Switches to the workspace to the right of the current workspace.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Switches to the workspace to the left of the current workspace.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>up arrow</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Switches to the workspace above the current workspace.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>down arrow</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Switches to the workspace below the current workspace.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <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.</para>
+              <entry colname="colspec1" valign="top">
+                <para>Minimizes all windows, and gives focus to the desktop.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>F1</keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
-                <para>Starts the online help browser, and displays appropriate
-online help.</para>
+              <entry colname="colspec1" valign="top">
+                <para>Starts the online help browser,
+and displays appropriate online Help.</para>
               </entry>
             </row>
           </tbody>
@@ -682,101 +678,103 @@ tasks. The following table lists some window shortcut keys:</para>
           <colspec colname="colspec1" colwidth="64.33*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Default Shortcut Keys</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Function</para>
               </entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Alt</keycap><keycap>Tab</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
-                <para>Switches between windows. When you use these
-shortcut keys, a list of windows that you can select is displayed. Release
-the keys to select a window.</para>
+              <entry colname="colspec1" valign="top">
+                <para>Switches
+between windows. When you use these shortcut keys, a list of windows that
+you can select is displayed. Release the keys to select a window.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <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 colname="colspec1" valign="top">
+                <para>Switches
+between windows in reverse order. Release the keys to select a window.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>F10</keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
-                <para>Opens the first menu on the left side of the menubar. </para>
+              <entry colname="colspec1" valign="top">
+                <para>Opens the first menu on the left
+side of the menubar. </para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Alt</keycap><keycap>spacebar</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Opens the <guilabel>Window Menu</guilabel>. </para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>Arrow keys</para>
               </entry>
-              <entry colname="colspec1">
-                <para>Moves the focus between items in a menu.</para>
+              <entry colname="colspec1" valign="top">
+                <para>Moves the focus between items
+in a menu.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>Return</keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Chooses a menu item. </para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>Esc</keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Closes an open menu.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Switches to the workspace to the right of the current workspace.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Switches to the workspace to the left of the current workspace.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>up arrow</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Switches to the workspace above the current workspace.</para>
               </entry>
             </row>
@@ -784,7 +782,7 @@ Release the keys to select a window.</para>
               <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>down arrow</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Switches to the workspace below the current workspace.</para>
               </entry>
             </row>
@@ -792,7 +790,7 @@ Release the keys to select a window.</para>
               <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>d</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Minimizes all windows, and gives focus to the desktop.</para>
               </entry>
             </row>
@@ -814,10 +812,10 @@ tasks. The following table lists panel shortcut keys:</para>
           <colspec colname="colspec1" colwidth="68.64*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Default Shortcut Keys</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Function</para>
               </entry>
             </row>
@@ -843,72 +841,72 @@ Release the keys to select an item.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para><keycombo><keycap>Ctrl</keycap><keycap>F10</keycap></keycombo></para>
               </entry>
-              <entry colname="colspec1">
-                <para>Opens the popup menu for the selected panel.</para>
+              <entry colname="colspec1" valign="top">
+                <para>Opens
+the popup menu for the selected panel.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>Tab</keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
-                <para>Switches the focus between objects on a panel.</para>
+              <entry colname="colspec1" valign="top">
+                <para>Switches the focus between objects
+on a panel.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>Return </keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
-                <para>Chooses the selected panel object or menu
-item.</para>
+              <entry colname="colspec1" valign="top">
+                <para>Chooses the selected panel object
+or menu item.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <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 colname="colspec1" valign="top">
+                <para>Opens
+the popup menu for the selected panel object.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>Arrow keys</para>
               </entry>
-              <entry colname="colspec1">
-                <para>Moves the focus between items in a menu. Moves the focus between interface
-items in an applet also.</para>
+              <entry colname="colspec1" valign="top">
+                <para>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">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>Esc</keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
+              <entry colname="colspec1" valign="top">
                 <para>Closes an open menu.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec0">
+              <entry colname="colspec0" valign="top">
                 <para>
                   <keycap>F10</keycap>
                 </para>
               </entry>
-              <entry colname="colspec1">
-                <para>Opens the <guimenu>Applications</guimenu> menu from
-the <application>Menu Bar</application>, if the <application>Menu Bar</application>
-is in a panel. </para>
+              <entry colname="colspec1" valign="top">
+                <para>Opens the <guimenu>Applications</guimenu> menu from the <application>Menu Bar</application>, if the <application>Menu Bar</application> is in a panel. </para>
               </entry>
             </row>
           </tbody>
@@ -931,10 +929,10 @@ keys:</para>
           <colspec colname="colspec1" colwidth="55.00*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Shortcut Keys</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Command</para>
               </entry>
             </row>
@@ -1019,10 +1017,10 @@ example access keys from the <application>Text Editor</application> application:
           <colspec colwidth="58.56*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Access Keys</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Function</para>
               </entry>
             </row>
@@ -1061,10 +1059,10 @@ dialog in the <application>Text Editor</application> application:</para>
           <colspec colwidth="58.59*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Access Key</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Function</para>
               </entry>
             </row>
@@ -1088,10 +1086,10 @@ dialog in the <application>Text Editor</application> application:</para>
           <colspec colwidth="63.64*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Key</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Function</para>
               </entry>
             </row>
@@ -1151,10 +1149,10 @@ your selection, for example, within a group of radio buttons in a dialog.</para>
         <secondary>resizing</secondary>
       </indexterm>
       <para>Some windows contain more than one <firstterm>pane</firstterm>.
-A pane is a subdivision of a window. For example, the <application>Nautilus</application> file manager window contains a side pane and a
-view pane. A window that contains panes has a resize handle on the edge between
-the panes. To resize the pane, grab the resize handle, then drag the edge
-to the size you require.</para>
+A pane is a subdivision of a window. For example, the <application>Nautilus</application> file manager window contains a side pane and a view pane. A
+window that contains panes has a resize handle on the edge between the panes.
+To resize the pane, grab the resize handle, then drag the edge to the size
+you require.</para>
     </sect2>
     <sect2 id="gosbasic-49">
       <title>Using Tables</title>
@@ -1196,10 +1194,10 @@ how to select items in tables.</para>
           <colspec colname="colspec2" colwidth="63.64*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Task</para>
               </entry>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec2">
                 <para>Action</para>
               </entry>
             </row>
diff --git a/gnome2-user-guide/C/goscustaccess.xml b/gnome2-user-guide/C/goscustaccess.xml
index 8a4263a..6fde7c8 100644
--- a/gnome2-user-guide/C/goscustaccess.xml
+++ b/gnome2-user-guide/C/goscustaccess.xml
@@ -300,9 +300,7 @@ of your settings.</para>
           </tbody>
         </tgroup>
       </table>
-      <para>For more information
-on configuring keyboard accessibility preferences, see <citetitle>GNOME 2.2
-Desktop Accessibility Guide</citetitle>.</para>
+      <para>For more information on configuring keyboard accessibility preferences, see <citetitle>GNOME 2.2 Desktop Accessibility Guide</citetitle>.</para>
     </sect2>
     <sect2 id="goscustaccess-9">
       <title>Filter Settings</title>
@@ -423,9 +421,7 @@ of your settings.</para>
           </tbody>
         </tgroup>
       </table>
-      <para>For more information
-on configuring keyboard accessibility preferences, see <citetitle>GNOME 2.2
-Desktop Accessibility Guide</citetitle>.</para>
+      <para>For more information on configuring keyboard accessibility preferences, see <citetitle>GNOME 2.2 Desktop Accessibility Guide</citetitle>.</para>
     </sect2>
     <sect2 id="goscustaccess-10">
       <title>Mouse Settings</title>
@@ -503,9 +499,7 @@ before the pointer moves. </para>
           </tbody>
         </tgroup>
       </table>
-      <para>For more information
-on configuring keyboard accessibility preferences, see <citetitle>GNOME 2.2
-Desktop Accessibility Guide</citetitle>.</para>
+      <para>For more information on configuring keyboard accessibility preferences, see <citetitle>GNOME 2.2 Desktop Accessibility Guide</citetitle>.</para>
     </sect2>
   </sect1>
 </chapter>
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 4f271a0..8cd0e24 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -1,37 +1,86 @@
 <chapter id="goscustdesk-6">
-  <title>Using the Basic Preference Tools</title>
+  <title>Using Preference Tools</title>
   <highlights>
-    <para>The basic preference tools enable you to customize your
-desktop background, and to configure your 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 customize your screensaver, choose
-a theme and fonts for your desktop environment, 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 environment.</para>
+    <para>This chapter describes how to use the preference tools to
+customize the GNOME 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
-ways:</para>
-    <itemizedlist>
-      <listitem>
-        <para>From the <guimenu>Desktop Preferences</guimenu> menu</para>
-        <para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the preference tool
-that you require from the submenu. The dialog for the tool is displayed.</para>
-      </listitem>
-      <listitem>
-        <para>From the <guilabel>Start Here</guilabel> location</para>
-        <para>Open a <application>Nautilus</application> file manager window, then
-choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Start Here</guimenuitem></menuchoice>. Alternatively, double-click on the <guilabel>Start Here</guilabel>
-object on the desktop. The <guilabel>Start Here</guilabel> location is displayed.
-Double-click on the <guilabel>Desktop Preferences</guilabel> object in the
-file manager window to display your preference tools.</para>
-        <para>Double-click on the tool that you require. The dialog for the tool is
-displayed.</para>
-      </listitem>
-    </itemizedlist>
+  <sect1 id="goscustaccess-11">
+    <title>Setting Assistive Technology Preferences</title>
+    <indexterm>
+      <primary>accessibility</primary>
+      <secondary>setting assistive technology
+preferences</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>preference tools</primary>
+      <secondary>Assistive Technology</secondary>
+    </indexterm>
+    <para>Use the <application>Assistive Technology</application> preference tool to enable assistive technologies
+in the GNOME Desktop. You can also use the <application>Assistive Technology</application> preference tool to specify assistive technology applications
+to start automatically when you log in.</para>
+    <para><xref linkend="goscustaccess-TBL-14"/> lists the assistive technology
+preferences that you can modify.</para>
+    <table frame="topbot" id="goscustaccess-TBL-14">
+      <title>Assistive Technology Preferences</title>
+      <tgroup cols="2" colsep="0" rowsep="0">
+        <colspec colwidth="50*"/>
+        <colspec colwidth="50*"/>
+        <thead>
+          <row rowsep="1">
+            <entry>
+              <para>Dialog Element</para>
+            </entry>
+            <entry>
+              <para>Description</para>
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry valign="top">
+              <para>
+                <guilabel>Enable assistive technologies</guilabel>
+              </para>
+            </entry>
+            <entry valign="top">
+              <para>Select this option to enable assistive technologies
+in the GNOME Desktop. </para>
+            </entry>
+          </row>
+          <row>
+            <entry valign="top">
+              <para>
+                <guilabel>Screenreader</guilabel>
+              </para>
+            </entry>
+            <entry valign="top">
+              <para>Select this option to start the <application>Screenreader</application> application automatically when you log in.</para>
+            </entry>
+          </row>
+          <row>
+            <entry valign="top">
+              <para>
+                <guilabel>Magnifier</guilabel>
+              </para>
+            </entry>
+            <entry valign="top">
+              <para>Select this option to start the <application>Magnifier</application> application automatically when you log in.</para>
+            </entry>
+          </row>
+          <row>
+            <entry valign="top">
+              <para>
+                <guilabel>On-screen keyboard</guilabel>
+              </para>
+            </entry>
+            <entry valign="top">
+              <para>Select this option to start the <application>On-screen
+keyboard</application> application automatically when you log in.</para>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
   </sect1>
   <sect1 id="goscustdesk-7">
     <title>Customizing the Desktop Background</title>
@@ -40,7 +89,7 @@ displayed.</para>
       <secondary>customizing background</secondary>
     </indexterm>
     <indexterm>
-      <primary>desktop environment preference tools</primary>
+      <primary>GNOME Desktop preference tools</primary>
       <see>preference tools</see>
     </indexterm>
     <indexterm>
@@ -51,9 +100,8 @@ displayed.</para>
       <primary>backgrounds</primary>
       <secondary>customizing desktop background</secondary>
     </indexterm>
-    <para>The desktop background is the image or color that is applied
-to your desktop. You can customize the desktop background in the following
-ways:</para>
+    <para>The desktop background is the image or color that is applied to your
+desktop. You can customize the desktop background in the following ways:</para>
     <itemizedlist>
       <listitem>
         <para>Select an image for the desktop background. The image is superimposed
@@ -69,20 +117,20 @@ 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>
-    <para><xref linkend="goscustdesk-TBL-14"/> lists the background settings that
-you can configure.</para>
+    <para><xref linkend="goscustdesk-TBL-14"/> lists the background preferences
+that you can modify.</para>
     <table frame="topbot" id="goscustdesk-TBL-14">
-      <title>Settings for Desktop Background</title>
+      <title>Desktop Background Preferences</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 colsep="0" rowsep="1">
+              <para>Dialog Element</para>
             </entry>
-            <entry colsep="0" rowsep="1" valign="top">
-              <para>Function</para>
+            <entry colsep="0" rowsep="1">
+              <para>Description</para>
             </entry>
           </row>
         </thead>
@@ -90,45 +138,41 @@ you can configure.</para>
           <row>
             <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
               <para>
-                <guibutton>Select picture</guibutton>
+                <guibutton>Add Wallpaper</guibutton>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
               <para>Choose an image to display on the desktop. To
-choose an image, click on the <guibutton>Select picture</guibutton> button.
-An image selector dialog is displayed. Use the dialog to choose an image.
-When you choose an image, click <guibutton>OK</guibutton>. </para>
+choose an image, click on the <guibutton>Select picture</guibutton> button. An image selector dialog is displayed.
+Use the dialog to choose an image. When you choose an image, click <guibutton>OK</guibutton>. </para>
             </entry>
           </row>
           <row>
             <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
               <para>
-                <guilabel>Picture Options</guilabel>
+                <guilabel>Style</guilabel>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-              <para>To specify how to display the image, select
-one of the following options:</para>
+              <para>To specify how to display the image, select one of the following
+options from the <guilabel>Style</guilabel> drop-down list:</para>
               <itemizedlist>
                 <listitem>
-                  <para><guilabel>Wallpaper</guilabel>: Repeats the image to cover
-the desktop.</para>
-                </listitem>
-                <listitem>
                   <para><guilabel>Centered</guilabel>: Displays the image in the middle
 of the desktop.</para>
                 </listitem>
                 <listitem>
+                  <para><guilabel>Fill Screen</guilabel>: Enlarges the image to cover
+the desktop and maintains the relative dimensions of the image.</para>
+                </listitem>
+                <listitem>
                   <para><guilabel>Scaled</guilabel>: Enlarges the image until the
 image meets the screen edges, and maintains the relative dimensions of the
 image.</para>
                 </listitem>
                 <listitem>
-                  <para><guilabel>Stretched</guilabel>: Enlarges the image to cover
-the desktop,  and does not maintain the relative dimensions of the image.</para>
-                </listitem>
-                <listitem>
-                  <para><guilabel>No Picture</guilabel>: Displays no image.</para>
+                  <para><guilabel>Tiled</guilabel>: Enlarges the image until the image
+meets the screen edges, and maintains the relative dimensions of the image.</para>
                 </listitem>
               </itemizedlist>
             </entry>
@@ -136,7 +180,7 @@ the desktop,  and does not maintain the relative dimensions of the image.</para>
           <row>
             <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
               <para>
-                <guilabel>Background Style</guilabel>
+                <guilabel>Desktop Colors</guilabel>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
@@ -175,6 +219,119 @@ color that you want to appear at the bottom edge.</para>
       </tgroup>
     </table>
   </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 preferences in the <application>CD Database</application> preference tool.</para>
+    <table frame="topbot" id="goscustlookandfeel-TBL-40">
+      <title>CD Database Preferences</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">
+              <para>Dialog Element</para>
+            </entry>
+            <entry colsep="0" rowsep="1">
+              <para>Description</para>
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
+              <para>
+                <guilabel>Send no information</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 information</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 information</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" valign="top">
+              <para>
+                <guilabel>FreeDB round robin server</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+              <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" valign="top">
+              <para>
+                <guilabel>Other FreeDB server</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+              <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" valign="top">
+              <para>
+                <guibutton>Update Server List</guibutton>
+              </para>
+            </entry>
+            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+              <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" valign="top">
+              <para>
+                <guilabel>Other server</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+              <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="goscustdesk-84">
     <title>Setting File Management Preferences</title>
     <indexterm>
@@ -182,15 +339,406 @@ color that you want to appear at the bottom edge.</para>
       <secondary>File Management</secondary>
     </indexterm>
     <indexterm>
-      <primary>file manager</primary>
+      <primary>file
+manager</primary>
       <secondary>preferences</secondary>
       <tertiary>preference tool</tertiary>
     </indexterm>
-    <para>Use the <application>File Management</application> preference tool to set your <application>Nautilus</application> file manager preferences. You can also set your file manager
-preferences in the <guilabel>File Management</guilabel> preferences dialog,
-which you can open from the file manager application. For information on the
-settings in the <guilabel>File Management</guilabel> preferences dialog and <application>File Management</application> preference tool, see <citetitle>Nautilus File
-Manager</citetitle>.</para>
+    <para>Use the <application>File
+Management</application> preference tool to set your <application>Nautilus</application>
+file manager preferences. You can also set your file manager preferences in
+the <guilabel>File Management</guilabel>  preferences
+dialog, which you can open from the file manager application. For information
+on the preferences in the <guilabel>File Management</guilabel> preferences dialog and <application>File Management</application>  preference tool, see <citetitle>Nautilus File Manager</citetitle>.</para>
+  </sect1>
+<!--
+<sect1 id="goscustdesk-79">
+<title>Customizing PalmOS Devices</title>
+<indexterm><primary>preference tools</primary><secondary>PalmOS devices</secondary>
+</indexterm><para>Information to be supplied in a future release.</para>
+</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>
+    <indexterm>
+      <primary>services</primary>
+      <secondary>configuring</secondary>
+    </indexterm>
+    <para>Use the <application>File Types and Programs</application> preference tool to configure the following:</para>
+    <variablelist>
+      <varlistentry>
+        <term>File types</term>
+        <listitem>
+          <para>You can specify how files
+of various types are displayed and edited. For example, you can specify an
+icon to represent a particular type of file. For another example, you can
+specify that if a file is a plain text file, the file is launched in a text
+editor.</para>
+          <para>The file manager 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 filename.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Services</term>
+        <listitem>
+          <para>A <firstterm>Uniform Resource
+Identifier</firstterm> (URI) is a string that identifies a particular location
+in a file system or on the Web. For example, the web address of a web page
+is a URI. A <firstterm>service</firstterm> is a protocol or task that a URI
+requests. For example, the <literal>http://www.gnome.org</literal> URI requests
+the <literal>http</literal> service. </para>
+          <para>You can associate an application with a service, so that the application
+performs the task required by the service. For example, you can associate
+your preferred web browser with the <literal>http</literal> service.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <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">
+        <colspec colname="colspec0" colwidth="18.86*"/>
+        <colspec colname="colspec1" colwidth="47.14*"/>
+        <thead>
+          <row>
+            <entry colsep="0" rowsep="1">
+              <para>Element</para>
+            </entry>
+            <entry colsep="0" rowsep="1">
+              <para>Description</para>
+            </entry>
+          </row>
+        </thead>
+        <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 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"/>.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
+              <para>
+                <guibutton>Add Service</guibutton>
+              </para>
+            </entry>
+            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+              <para>Click on this button to add a service. For more
+information, see <xref linkend="goscustlookandfeel-30"/>.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
+              <para>
+                <guibutton>Edit</guibutton>
+              </para>
+            </entry>
+            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+              <indexterm>
+                <primary>file types</primary>
+                <secondary>editing</secondary>
+              </indexterm>
+              <indexterm>
+                <primary>services</primary>
+                <secondary>editing</secondary>
+              </indexterm>
+              <para>To edit a file type, a service, or a file type category,
+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" valign="top">
+              <para>To delete a file type or a service, select the item that
+you want to delete, then click <guibutton>Remove</guibutton>. </para>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    <sect2 id="goscustlookandfeel-28">
+      <title>To Add a File Type</title>
+      <indexterm>
+        <primary>file types</primary>
+        <secondary>adding</secondary>
+      </indexterm>
+      <para>To add a file type, perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Start the <application>File Types and
+Programs</application> preference 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>
+          <informaltable frame="topbot">
+            <tgroup cols="2" colsep="0" rowsep="0">
+              <colspec colname="colspec0" colwidth="37.42*"/>
+              <colspec colname="colspec1" colwidth="62.58*"/>
+              <thead>
+                <row rowsep="1">
+                  <entry>
+                    <para>Dialog Element</para>
+                  </entry>
+                  <entry>
+                    <para>Description</para>
+                  </entry>
+                </row>
+              </thead>
+              <tbody>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>No Icon</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Choose an icon to represent the file type. To choose
+an icon, click on the <guibutton>No Icon</guibutton> button. An icon selector
+dialog is displayed. Choose an icon from the dialog. Alternatively, to choose
+an icon from another directory, click <guibutton>Browse</guibutton>. When
+you choose an icon, click <guibutton>OK</guibutton>. </para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Description</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Type a description of the file type.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>MIME type</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Enter the MIME type for this type of file. </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 this preference 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 file extensions to associate with the
+file type. Enter a file extension in the field on the left side, then press <keycap>Return</keycap>. To delete a file extension, select the file 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>Select the viewer component to use to display files
+of this type in the file manager.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Default action</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Select the default application to use to open files
+of this type.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Program to run</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>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>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>
+              </tbody>
+            </tgroup>
+          </informaltable>
+        </listitem>
+        <listitem>
+          <para>Click <guibutton>OK</guibutton>.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="goscustlookandfeel-30">
+      <title>To Add a Service</title>
+      <indexterm>
+        <primary>services</primary>
+        <secondary>adding</secondary>
+      </indexterm>
+      <para>To add a service, perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Start the <application>File Types and
+Programs</application> preference 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>
+          <informaltable frame="topbot">
+            <tgroup cols="2" colsep="0" rowsep="0">
+              <colspec colname="colspec0" colwidth="41.22*"/>
+              <colspec colname="colspec1" colwidth="58.78*"/>
+              <thead>
+                <row rowsep="1">
+                  <entry>
+                    <para>Dialog Element</para>
+                  </entry>
+                  <entry>
+                    <para>Description</para>
+                  </entry>
+                </row>
+              </thead>
+              <tbody>
+                <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 </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>
+                    </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 service.
+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>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>
+              </tbody>
+            </tgroup>
+          </informaltable>
+        </listitem>
+        <listitem>
+          <para>Click <guibutton>OK</guibutton>.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
   </sect1>
   <sect1 id="goscustdesk-38">
     <title>Choosing Default Fonts</title>
@@ -220,20 +768,20 @@ Manager</citetitle>.</para>
     </indexterm>
     <para>Use the <application>Font</application> preference tool
 to select the fonts to use in your applications, windows, terminals, and desktop.</para>
-    <para><xref linkend="goscustdesk-TBL-26"/> lists the font settings that you
-can configure.</para>
+    <para><xref linkend="goscustdesk-TBL-26"/> lists the font preferences that
+you can modify.</para>
     <table frame="topbot" id="goscustdesk-TBL-26">
-      <title>Settings for Fonts</title>
+      <title>Font Preferences</title>
       <tgroup cols="2" colsep="1" rowsep="1">
         <colspec colname="colspec18" colwidth="19.21*"/>
         <colspec colname="colspec19" colwidth="46.79*"/>
         <thead>
           <row>
-            <entry colsep="0" rowsep="1" valign="top">
-              <para>Option</para>
+            <entry colsep="0" rowsep="1">
+              <para>Dialog Element</para>
             </entry>
-            <entry colsep="0" rowsep="1" valign="top">
-              <para>Function</para>
+            <entry colsep="0" rowsep="1">
+              <para>Description</para>
             </entry>
           </row>
         </thead>
@@ -306,8 +854,8 @@ possible. Use this option for standard Cathode Ray Tube (CRT) monitors.</para>
                 <listitem>
                   <para><guilabel>Best contrast</guilabel>: Adjusts fonts to give
 the sharpest possible contrast, and also antialiases fonts, so that characters
-have smooth edges. This option might enhance the accessibility of the desktop
-environment to  users with visual impairments.</para>
+have smooth edges. This option might enhance the accessibility of the GNOME
+Desktop to  users with visual impairments.</para>
                 </listitem>
                 <listitem>
                   <para><guilabel>Subpixel smoothing (LCDs)</guilabel>: Uses techniques
@@ -353,12 +901,12 @@ or flat-screen displays.</para>
       </tgroup>
     </table>
     <sect2 id="goscustdesk-83">
-      <title>Previewing Fonts</title>
+      <title>To Preview a Font</title>
       <indexterm>
         <primary>fonts</primary>
         <secondary>previewing</secondary>
       </indexterm>
-      <para>You can use the file manager to preview fonts. To preview fonts, perform
+      <para>You can use the file manager to preview a font. To preview a font, perform
 the following steps:</para>
       <orderedlist>
         <listitem>
@@ -373,22 +921,624 @@ bar. The fonts are displayed as icons in the view pane.</para>
         </listitem>
       </orderedlist>
     </sect2>
+    <sect2 id="goscustdesk-94">
+      <title>To Add a TrueType Font</title>
+      <para>You can use the file manager to add a TrueType font. To add a TrueType
+font, perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Open a file manager window and select the TrueType font that
+you want to add.</para>
+        </listitem>
+        <listitem>
+          <para>Navigate to the <guilabel>fonts:///</guilabel> location. The
+fonts are displayed as icons.</para>
+        </listitem>
+        <listitem>
+          <para>Drag the TrueType font file that you want to add to the <guilabel>fonts:///</guilabel> location.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+  </sect1>
+  <sect1 id="goscustdesk-95">
+    <title>Setting Your Login Photo</title>
+    <indexterm>
+      <primary>desktop</primary>
+      <secondary>login photo</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>GNOME Desktop preference tools</primary>
+      <see>preference
+tools</see>
+    </indexterm>
+    <indexterm>
+      <primary>preference tools</primary>
+      <secondary>Login Photo</secondary>
+    </indexterm>
+    <para>The <application>Login Photo </application>
+preference tool enables you to change the picture that is displayed in your
+login window. </para>
+    <para>From the <guilabel>Login Photo</guilabel> preference tool, select an
+image to display in your login window. Type the path for the folder from where
+you want to select your image. Alternatively, click <guibutton>Browse</guibutton>
+to display a dialog from which you can select an image to display as your
+photograph and click <guibutton>OK</guibutton>.</para>
+  </sect1>
+  <sect1 id="goscustdesk-50">
+    <title>Configuring Your Network
+Proxy Connection</title>
+    <indexterm>
+      <primary>preference
+tools</primary>
+      <secondary>Network Proxy</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>network proxy</primary>
+      <secondary>setting preferences</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>Internet</primary>
+      <secondary>configuring connection</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 the Internet.
+You can configure the GNOME Desktop to connect to a <firstterm>proxy server</firstterm>, 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 (DNS) name or the
+Internet Protocol (IP) address of the proxy server. A <firstterm>DNS name</firstterm> is a unique alphabetic identifier for a computer on a network.
+An <firstterm>IP address</firstterm> is a unique numeric identifier for a
+computer on a network. </para>
+    <para><xref linkend="goscustdesk-TBL-52"/> lists the Internet connection preferences
+that you can modify.</para>
+    <table frame="topbot" id="goscustdesk-TBL-52">
+      <title>Internet Connection 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>
+              <para>Dialog Element</para>
+            </entry>
+            <entry>
+              <para>Description</para>
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry colname="colspec2" valign="top">
+              <para>
+                <guilabel>Direct internet
+connection</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec3" valign="top">
+              <para>Select this option if you want to connect directly to the Internet, without
+a proxy server.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec2">
+              <para>
+                <guilabel>Manual proxy configuration</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec3" valign="top">
+              <para>Select
+this option if you want to connect to the Internet through a proxy server,
+and you want to configure the proxy server manually.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec2" valign="top">
+              <para>
+                <guilabel>HTTP proxy</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec3" valign="top">
+              <para>Enter the DNS name, or the IP
+address of the proxy server to use when you request a HTTP service. Enter
+the port number of the HTTP service on the proxy server in the <guilabel>Port</guilabel> spin box.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec2" valign="top">
+              <para>
+                <guilabel>Secure HTTP proxy</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec3" valign="top">
+              <para>Enter
+the DNS name, or the IP address of the proxy server to use when you request
+a Secure HTTP service. Enter the port number of the Secure HTTP service on
+the proxy server in the <guilabel>Port</guilabel> spin box.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec2" valign="top">
+              <para>
+                <guilabel>FTP proxy</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec3" valign="top">
+              <para>Enter the DNS name, or the IP
+address of the proxy server to use when you request a FTP service. Enter the
+port number of the FTP service on the proxy server in the <guilabel>Port</guilabel>
+spin box.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec2" valign="top">
+              <para>
+                <guilabel>Socks host</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec3" valign="top">
+              <para>Enter the DNS name, or the IP
+address of the Socks host to use. Enter the port number for the Socks protocol
+on the proxy server in the <guilabel>Port</guilabel> spin box.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec2" valign="top">
+              <para>
+                <guilabel>Automatic proxy
+configuration</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec3" valign="top">
+              <para>Select this option if you want to connect to the Internet through a proxy
+server, and you want to configure the proxy server automatically.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec2" valign="top">
+              <para>
+                <guilabel>Autoconfiguration
+URL</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec3" valign="top">
+              <para>Enter the URL that contains the information required to configure the proxy
+server automatically. </para>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </sect1>
+  <sect1 id="goscustaccess-6">
+    <title>Configuring Keyboard Accessibility Options</title>
+    <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>
+    <para>You can customize the preferences for the keyboard accessibility in
+the following functional areas:</para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <guilabel>Basic</guilabel>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <guilabel>Filters</guilabel>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <guilabel>Mouse</guilabel>
+        </para>
+      </listitem>
+    </itemizedlist>
+    <sect2 id="goscustaccess-8">
+      <title>Basic Preferences</title>
+      <para><xref linkend="goscustaccess-TBL-1"/> lists the basic keyboard accessibility
+preferences that you can modify.</para>
+      <table frame="topbot" id="goscustaccess-TBL-1">
+        <title>Keyboard Accessibility Preferences</title>
+        <tgroup cols="2" colsep="0" rowsep="0">
+          <colspec colname="colspec0" colwidth="25.64*"/>
+          <colspec colname="colspec1" colwidth="74.36*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>Dialog Element</para>
+              </entry>
+              <entry>
+                <para>Description</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Enable keyboard
+accessibility features</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to enable keyboard accessibility features.
+When you select this option, the other options in the preference tool become
+available.</para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Disable if unused
+for</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to deactivate keyboard accessibility preferences if the
+keyboard is not used for a specified period of time. Use the slider to specify
+the number of seconds of keyboard idle time required before the system disables
+the keyboard accessibility preferences.  When the specified number of seconds
+elapses, the following keyboard accessibility preferences are disabled:</para>
+                <itemizedlist>
+                  <listitem>
+                    <para>Bounce keys</para>
+                  </listitem>
+                  <listitem>
+                    <para>Mouse keys</para>
+                  </listitem>
+                  <listitem>
+                    <para>Slow keys</para>
+                  </listitem>
+                  <listitem>
+                    <para>Sticky keys</para>
+                  </listitem>
+                  <listitem>
+                    <para>Toggle keys</para>
+                  </listitem>
+                </itemizedlist>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Beep when features
+turned on or off from keyboard</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" 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 colname="colspec0" valign="top">
+                <para>
+                  <guibutton>Import Feature
+Settings</guibutton>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Click on this button to import an <application>AccessX</application> configuration
+file. </para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Enable Sticky
+Keys</guilabel>
+                </para>
+                <indexterm>
+                  <primary>accessibility</primary>
+                  <secondary>sticky keys</secondary>
+                </indexterm>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to perform multiple simultaneous keypress operations by
+pressing the keys in sequence. Alternatively, to enable the sticky keys feature,
+press <keycap>Shift</keycap> five times.</para>
+                <para>You can set the following
+sticky keys preferences:</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>Disable if two keys pressed together</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" valign="top">
+                <para>
+                  <guilabel>Repeat Keys</guilabel>
+                </para>
+                <indexterm>
+                  <primary>accessibility</primary>
+                  <secondary>repeat keys</secondary>
+                </indexterm>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to enable
+the autorepeat settings for your keyboard. You can set the following autorepeat
+preferences:</para>
+                <itemizedlist>
+                  <listitem>
+                    <para><guilabel>Delay</guilabel>: Use the slider or the spin box
+to specify the interval to wait after the first keypress before the automatic
+repeat of a pressed key. </para>
+                  </listitem>
+                  <listitem>
+                    <para><guilabel>Speed</guilabel>: Use the slider or the spin box
+to specify the number of characters per second to enter. </para>
+                  </listitem>
+                </itemizedlist>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Type to test settings</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <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>
+          </tbody>
+        </tgroup>
+      </table>
+      <para>For more information on configuring keyboard accessibility preferences,
+see <citetitle>GNOME 2.6 Desktop Accessibility Guide</citetitle>.</para>
+    </sect2>
+    <sect2 id="goscustaccess-9">
+      <title>Filter Preferences</title>
+      <para><xref linkend="goscustaccess-TBL-11"/> lists the filter preferences that
+you can modify.</para>
+      <table frame="topbot" id="goscustaccess-TBL-11">
+        <title>Filter Preferences</title>
+        <tgroup cols="2" colsep="0" rowsep="0">
+          <colspec colname="colspec0" colwidth="25.64*"/>
+          <colspec colname="colspec1" colwidth="74.36*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>Dialog Element</para>
+              </entry>
+              <entry>
+                <para>Description</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Enable keyboard
+accessibility features</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to enable keyboard accessibility features.
+When you select this option, the other options in the preference tool become
+available.</para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Enable Slow Keys</guilabel>
+                </para>
+                <indexterm>
+                  <primary>accessibility</primary>
+                  <secondary>slow keys</secondary>
+                </indexterm>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to control the period of time that you must press-and-hold
+a key before acceptance. Alternatively, to enable the slow keys feature, press-and-hold <keycap>Shift</keycap> for eight seconds.</para>
+                <para>You can set the following slow
+keys preferences: </para>
+                <itemizedlist>
+                  <listitem>
+                    <para><guilabel>Only accept keys held for</guilabel>: Use the slider
+or the spin box to specify the period of time that you must press-and-hold
+a key before acceptance. </para>
+                  </listitem>
+                  <listitem>
+                    <para><guilabel>Beep when key is</guilabel>: Select the appropriate
+option or options for an audible indication  when a key is pressed, accepted,
+or rejected. </para>
+                  </listitem>
+                </itemizedlist>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Enable Bounce
+Keys</guilabel>
+                </para>
+                <indexterm>
+                  <primary>accessibility</primary>
+                  <secondary>bounce keys</secondary>
+                </indexterm>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to accept a key input and to control the key repeat characteristics
+of the keyboard. You can set the following bounce keys preferences:  </para>
+                <itemizedlist>
+                  <listitem>
+                    <para><guilabel>Ignore duplicate keypresses within</guilabel>: Use
+the slider or the spin box to specify the interval to wait after the first
+keypress before the automatic repeat of a pressed key. </para>
+                  </listitem>
+                  <listitem>
+                    <para><guilabel>Beep if key is rejected</guilabel>: Select this
+option for an audible indication of key rejection. </para>
+                  </listitem>
+                </itemizedlist>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Enable Toggle
+Keys</guilabel>
+                </para>
+                <indexterm>
+                  <primary>accessibility</primary>
+                  <secondary>toggle keys</secondary>
+                </indexterm>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <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>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Type to test settings</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <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>
+          </tbody>
+        </tgroup>
+      </table>
+      <para>For more information on configuring keyboard accessibility preferences,
+see <citetitle>GNOME 2.6 Desktop Accessibility Guide</citetitle>.</para>
+    </sect2>
+    <sect2 id="goscustaccess-10">
+      <title>Mouse Preferences</title>
+      <para><xref linkend="goscustaccess-TBL-12"/> lists the mouse preferences that
+you can modify.</para>
+      <table frame="topbot" id="goscustaccess-TBL-12">
+        <title>Mouse Preferences</title>
+        <tgroup cols="2" colsep="0" rowsep="0">
+          <colspec colname="colspec0" colwidth="25.64*"/>
+          <colspec colname="colspec1" colwidth="74.36*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>Dialog Element</para>
+              </entry>
+              <entry>
+                <para>Description</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Enable keyboard
+accessibility features</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to enable keyboard accessibility features.
+When you select this option, the other options in the preference tool become
+available.</para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>
+                  <guilabel>Enable Mouse Keys</guilabel>
+                </para>
+                <indexterm>
+                  <primary>accessibility</primary>
+                  <secondary>mouse keys</secondary>
+                </indexterm>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Select this option to make the numeric keypad emulate mouse actions. You can
+set the following mouse key preferences: </para>
+                <itemizedlist>
+                  <listitem>
+                    <para><guilabel>Maximum pointer speed</guilabel>: Use the slider
+or the spin box to specify the maximum speed that the pointer moves across
+the screen.</para>
+                  </listitem>
+                  <listitem>
+                    <para><guilabel>Time to accelerate to maximum speed</guilabel>:
+Use the slider or the spin box to specify the duration of the acceleration
+time of the pointer. </para>
+                  </listitem>
+                  <listitem>
+                    <para><guilabel>Delay between keypress and pointer movement</guilabel>:
+Use the slider or the spin box to specify the period of time that must pass
+after a keypress before the pointer moves. </para>
+                  </listitem>
+                </itemizedlist>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0">
+                <para>
+                  <guibutton>Mouse Preferences</guibutton>
+                </para>
+              </entry>
+              <entry colname="colspec1">
+                <para>Click on this button to open the <application>Mouse</application> preference tool.</para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+      <para>For more information on configuring keyboard accessibility preferences,
+see <citetitle>GNOME 2.6 Desktop Accessibility Guide</citetitle>.</para>
+    </sect2>
   </sect1>
   <sect1 id="goscustperiph-2">
-    <title>Configuring Keyboard Settings</title>
+    <title>Configuring Keyboard Preferences</title>
     <indexterm>
       <primary>preference tools</primary>
       <secondary>Keyboard</secondary>
     </indexterm>
     <indexterm>
       <primary>keyboard</primary>
-      <secondary>configuring general
-preferences</secondary>
+      <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 typing break settings. </para>
-    <para>You can customize the settings for the <application>Keyboard</application>
+    <para>Use the <application>Keyboard</application> preference tool to modify the autorepeat preferences for
+your keyboard, and to configure typing break settings. </para>
+    <para>You can set the preferences for the <application>Keyboard</application>
 preference tool in the following functional areas:</para>
     <itemizedlist>
       <listitem>
@@ -401,26 +1551,36 @@ preference tool in the following functional areas:</para>
           <guilabel>Typing Break</guilabel>
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <guilabel>Layouts</guilabel>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <guilabel>Layout Options</guilabel>
+        </para>
+      </listitem>
     </itemizedlist>
     <sect2 id="goscustdesk-40">
-      <title>Keyboard Settings</title>
+      <title>Keyboard Preferences</title>
       <para>Use the <guilabel>Keyboard</guilabel> tabbed section to set general
 keyboard preferences. To start the <application>Keyboard</application><emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
 click on the <guibutton>Accessibility</guibutton> button.</para>
-      <para><xref linkend="goscustperiph-TBL-3"/> lists the keyboard settings that
-you can configure.</para>
+      <para><xref linkend="goscustperiph-TBL-3"/> lists the keyboard preferences
+that you can modify.</para>
       <table frame="topbot" id="goscustperiph-TBL-3">
-        <title>Settings for Keyboard</title>
+        <title>Keyboard Preferences</title>
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="colspec18" colwidth="19.21*"/>
           <colspec colname="colspec19" colwidth="46.79*"/>
           <thead>
             <row>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Option</para>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Function</para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
           </thead>
@@ -487,24 +1647,24 @@ blinks in fields and text boxes.</para>
       </table>
     </sect2>
     <sect2 id="goscustdesk-86">
-      <title>Typing Break Settings</title>
+      <title>Typing Break Preferences</title>
       <para>Use the <guilabel>Typing Break</guilabel> tabbed section to set typing
 break preferences. To start the <application>Keyboard</application><emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
 click on the <guibutton>Accessibility</guibutton> button.</para>
-      <para><xref linkend="goscustdesk-TBL-87"/> lists the typing break settings
-that you can configure.</para>
+      <para><xref linkend="goscustdesk-TBL-87"/> lists the typing break preferences
+ that you can modify.</para>
       <table frame="topbot" id="goscustdesk-TBL-87">
-        <title>Typing Break Settings</title>
+        <title>Typing Break Preferences</title>
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colwidth="50*"/>
           <colspec colwidth="50*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
-                <para>Option</para>
+              <entry>
+                <para>Dialog Element</para>
               </entry>
-              <entry valign="top">
-                <para>Function</para>
+              <entry>
+                <para>Description</para>
               </entry>
             </row>
           </thead>
@@ -557,88 +1717,26 @@ typing breaks.</para>
         </tgroup>
       </table>
     </sect2>
-  </sect1>
-  <sect1 id="goscustdesk-39">
-    <title>Customizing Keyboard Shortcuts</title>
-    <indexterm>
-      <primary>preference tools</primary>
-      <secondary>Keyboard Shortcuts</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>shortcut keys</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>keyboard shortcuts</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>hot keys</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-    <para>A <firstterm>keyboard shortcut</firstterm> is a key or combination of keys that provides
-an alternative to standard ways of performing an action. </para>
-    <para>Use the <application>Keyboard Shortcuts</application> preference tool
-to display the default keyboard shortcuts. You can customize the default keyboard
-shortcuts to your requirements. </para>
-    <para><xref linkend="goscustdesk-TBL-5"/> lists the keyboard shortcut settings that you
-can customize.</para>
-    <table frame="topbot" id="goscustdesk-TBL-5">
-      <title>Default Settings for Keyboard Shortcuts</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="36.11*"/>
-        <colspec colname="colspec1" colwidth="63.89*"/>
-        <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" valign="top">
-              <para>
-                <guilabel>Text editing shortcuts</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <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 <application>Emacs</application> shortcut keys.</para>
-                </listitem>
-              </itemizedlist>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <guilabel>Desktop shortcuts</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <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, click on the action
-to select the action, then click on the shortcut for the action. Press the
-keys that you want to associate with the action.</para>
-              <para>To disable the
-shortcut keys for an action, click on the action to select the action, then
-click on the shortcut for the action. Press <keycap>Back Space</keycap>.</para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
+    <sect2 id="goscustdesk-100">
+      <title>Keyboard Layout</title>
+      <para>Use the <guilabel>Layouts</guilabel> tabbed section to set your keyboard
+layout. Select your keyboard model from the drop-down list. Use the navigational
+buttons to add or remove a selected layout from the list of available layouts. </para>
+      <para>You can choose different layouts to suit different locales. For more
+information on keyboard layouts, see the <citetitle>Keyboard Layout Switcher</citetitle> manual.</para>
+      <para>To start the <application>Keyboard</application><emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
+click on the <guibutton>Accessibility</guibutton> button.</para>
+    </sect2>
+    <sect2 id="goscustdesk-101">
+      <title>Keyboard Layout Options</title>
+      <para>Use the <guilabel>Layout Options</guilabel> tabbed section to set your
+keyboard layout options. Select an option from the list of available layout
+options and click <guibutton>Add</guibutton> to select an option. Use <guibutton>Remove</guibutton> to remove a selected option. </para>
+      <para>For more information on the layout options, see the <citetitle>Keyboard
+Layout Switcher</citetitle> manual.</para>
+      <para>To start the <application>Keyboard</application><emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
+click on the <guibutton>Accessibility</guibutton> button.</para>
+    </sect2>
   </sect1>
   <sect1 id="goscustuserinter-2">
     <title>Customizing Menus and Toolbars in Applications</title>
@@ -656,20 +1754,20 @@ 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>
+    <para><xref linkend="goscustuserinter-TBL-8"/> lists the menu and toolbar preferences that
+you can modify for GNOME-compliant applications.</para>
     <table frame="topbot" id="goscustuserinter-TBL-8">
-      <title>Settings for Customizing Applications</title>
+      <title>Menu and Toolbar Preferences</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 colsep="0" rowsep="1">
+              <para>Dialog Element</para>
             </entry>
-            <entry colsep="0" rowsep="1" valign="top">
-              <para>Function</para>
+            <entry colsep="0" rowsep="1">
+              <para>Description</para>
             </entry>
           </row>
         </thead>
@@ -697,7 +1795,6 @@ from application windows to any location on the screen. 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.</para>
-              <para/>
             </entry>
           </row>
           <row>
@@ -735,7 +1832,7 @@ toolbars with text only on each button.</para>
     </table>
   </sect1>
   <sect1 id="goscustperiph-5">
-    <title>Configuring Mouse Settings</title>
+    <title>Setting Mouse Preferences</title>
     <indexterm>
       <primary>preference tools</primary>
       <secondary>Mouse</secondary>
@@ -767,24 +1864,24 @@ preference tool in the following functional areas:</para>
       </listitem>
     </itemizedlist>
     <sect2 id="goscustdesk-55">
-      <title>Buttons Settings</title>
+      <title>Buttons Preferences</title>
       <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>
-      <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 preferences
+that you can modify.</para>
       <table frame="topbot" id="goscustperiph-TBL-6">
-        <title>Settings for Mouse Buttons</title>
+        <title>Mouse Button Preferences</title>
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="colspec18" colwidth="19.21*"/>
           <colspec colname="colspec19" colwidth="46.79*"/>
           <thead>
             <row>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Option</para>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Function</para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
           </thead>
@@ -805,7 +1902,7 @@ right mouse button are swapped.</para>
             <row>
               <entry colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Delay</guilabel>
+                  <guilabel>Timeout</guilabel>
                 </para>
               </entry>
               <entry colsep="0" rowsep="0" valign="top">
@@ -820,49 +1917,70 @@ specified here, the action is not interpreted as a double-click. </para>
       </table>
     </sect2>
     <sect2 id="goscustdesk-54">
-      <title>Pointer Settings</title>
+      <title>Pointer Preferences</title>
       <para>Use the <guilabel>Cursors</guilabel> tabbed section to set your mouse
 pointer preferences.</para>
-      <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 preferences
+that you can modify:</para>
       <table frame="topbot" id="goscustdesk-TBL-45">
-        <title>Settings for Mouse Pointers</title>
+        <title>Mouse Pointer Preferences</title>
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colname="colspec0" colwidth="50*"/>
           <colspec colname="colspec1" colwidth="50*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
-                <para>Option</para>
+              <entry>
+                <para>Dialog Element</para>
               </entry>
-              <entry valign="top">
-                <para>Function</para>
+              <entry>
+                <para>Description</para>
               </entry>
             </row>
           </thead>
           <tbody>
             <row>
+              <entry colname="colspec0">
+                <para>
+                  <guilabel>Small</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1">
+                <para>Select this option to display a small mouse
+pointer.</para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0">
+                <para>
+                  <guilabel>Medium</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1">
+                <para>Select this option to display a medium mouse
+pointer.</para>
+              </entry>
+            </row>
+            <row>
               <entry valign="top">
                 <para>
-                  <guilabel>Cursor Theme</guilabel>
+                  <guilabel>Large</guilabel>
                 </para>
               </entry>
               <entry valign="top">
-                <para>Select the mouse pointer theme that you require
-from the list box. </para>
+                <para>Select this option to display a large mouse pointer.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
                 <para>
-                  <guilabel>Show position
-of cursor when the Control key is pressed</guilabel>
+                  <guilabel>Highlight the
+pointer when you press Ctrl</guilabel>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Select this option to enable a mouse
-pointer animation when you press and release <keycap>Ctrl</keycap>. This feature
-can assist you to locate the mouse pointer.</para>
+                <para>Select this option to enable a mouse pointer animation
+when you press and release <keycap>Ctrl</keycap>. This feature can assist
+you to locate the mouse pointer.</para>
               </entry>
             </row>
           </tbody>
@@ -870,23 +1988,23 @@ can assist you to locate the mouse pointer.</para>
       </table>
     </sect2>
     <sect2 id="goscustdesk-53">
-      <title>Motion Settings</title>
+      <title>Motion Preferences</title>
       <para>Use the <guilabel>Motion</guilabel> tabbed section to set your preferences
 for mouse movement.</para>
-      <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 preferences
+that you can modify:</para>
       <table frame="topbot" id="goscustdesk-TBL-47">
-        <title>Settings for Mouse Motion</title>
+        <title>Mouse Motion Preferences</title>
         <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>
+                <para>Dialog Element</para>
               </entry>
-              <entry valign="top">
-                <para>Function</para>
+              <entry>
+                <para>Description</para>
               </entry>
             </row>
           </thead>
@@ -930,507 +2048,488 @@ action.</para>
       </table>
     </sect2>
   </sect1>
-  <sect1 id="goscustdesk-50">
-    <title>Configuring Network Proxy Settings</title>
+  <sect1 id="goscustdesk-67">
+    <title>Configuring Multimedia Keys</title>
     <indexterm>
       <primary>preference tools</primary>
-      <secondary>Network Proxy</secondary>
+      <secondary>Multimedia Keys</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 environment to connect
-to a <firstterm>proxy server</firstterm>, 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 (DNS) name or the Internet Protocol (IP) address of the proxy server.
-A <firstterm>DNS name</firstterm> is a unique alphabetic identifier for a
-computer on a network. An <firstterm>IP address</firstterm> 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 Proxy Settings</title>
+    <para>Use the <application>Multimedia Keys</application> preference
+tool to assign shortcut keys to an action. </para>
+    <para><xref linkend="goscustdesk-TBL-69"/> lists the shortcut key preferences
+that you can set for multimedia functions.</para>
+    <table frame="topbot" id="goscustdesk-TBL-69">
+      <title>Multimedia Keys Preferences</title>
       <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec2" colwidth="35.09*"/>
-        <colspec colname="colspec3" colwidth="64.91*"/>
+        <colspec colwidth="50*"/>
+        <colspec colwidth="50*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
-              <para>Option</para>
+            <entry>
+              <para>Dialog Element</para>
             </entry>
-            <entry valign="top">
-              <para>Function </para>
+            <entry>
+              <para>Description</para>
             </entry>
           </row>
         </thead>
         <tbody>
           <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Direct internet
-connection</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Select this option if you want to connect directly to the Internet, without
-a proxy server.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2">
-              <para>
-                <guilabel>Manual proxy configuration</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Select
-this option if you want to connect to the Internet through a proxy server,
-and you want to configure the proxy server manually.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>HTTP proxy</guilabel>
-              </para>
+            <entry valign="top">
+              <para>Multimedia keys table</para>
             </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the proxy server to use when you request a HTTP service. Enter
-the port number of the HTTP service on the proxy server in the <guilabel>Port</guilabel> spin box.</para>
+            <entry>
+              <para>To add the shortcut keys for an action, click on the action to select the
+action, then press the keys that you want to associate with the action.</para>
+              <para>To disable the shortcut keys for an action, click on the action to select
+the action, then press <keycap>Back Space</keycap>.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec2" valign="top">
+            <entry valign="top">
               <para>
-                <guilabel>Secure HTTP proxy</guilabel>
+                <guilabel>Use PCM volume instead of Master
+volume</guilabel>
               </para>
             </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter
-the DNS name, or the IP address of the proxy server to use when you request
-a Secure HTTP service. Enter the port number of the Secure HTTP service on
-the proxy server in the <guilabel>Port</guilabel> spin box.</para>
+            <entry>
+              <para>Select this option if you want
+to use Pulse Code Modulation (PCM) volume instead of Master volume.</para>
             </entry>
           </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>FTP proxy</guilabel>
-              </para>
+        </tbody>
+      </tgroup>
+    </table>
+  </sect1>
+  <sect1 id="goscustdesk-10">
+    <title>Customizing Your Panels</title>
+    <indexterm>
+      <primary>preference tools</primary>
+      <secondary>Panel Preferences</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>panels</primary>
+      <secondary>customizing
+behavior and appearance</secondary>
+    </indexterm>
+    <para>The <application>Panel
+Preferences</application> preference tool enables you to configure the behavior
+of panels. Any changes that you make with the <application>Panel Preferences</application> preference tool affect all of your panels.</para>
+    <para><xref linkend="goscustlookandfeel-TBL-22"/> lists the panel preferences
+that you can modify:</para>
+    <table frame="topbot" id="goscustlookandfeel-TBL-22">
+      <title>Panel Preferences</title>
+      <tgroup cols="2" colsep="0" rowsep="0">
+        <colspec colwidth="50*"/>
+        <colspec colwidth="50*"/>
+        <thead>
+          <row rowsep="1">
+            <entry>
+              <para>Dialog Element</para>
             </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the proxy server to use when you request a FTP service. Enter the
-port number of the FTP service on the proxy server in the <guilabel>Port</guilabel>
-spin box.</para>
+            <entry>
+              <para>Description</para>
             </entry>
           </row>
+        </thead>
+        <tbody>
           <row>
-            <entry colname="colspec2" valign="top">
+            <entry valign="top">
               <para>
-                <guilabel>Socks host</guilabel>
+                <guilabel>Close drawer when launcher is clicked</guilabel>
               </para>
             </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the Socks host to use. Enter the port number for the Socks protocol
-on the proxy server in the <guilabel>Port</guilabel> spin box.</para>
+            <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 colname="colspec2" valign="top">
+            <entry valign="top">
               <para>
-                <guilabel>Automatic proxy
-configuration</guilabel>
+                <guilabel>Drawer and panel animation</guilabel>
               </para>
             </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Select this option if you want to connect to the Internet through a proxy
-server, and you want to configure the proxy server automatically.</para>
+            <entry valign="top">
+              <para>Select this option if you want your panels and drawers
+to show and to hide in an animated style.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec2" valign="top">
+            <entry valign="top">
               <para>
-                <guilabel>Autoconfiguration
-URL</guilabel>
+                <guilabel>Animation speed</guilabel>
               </para>
             </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the URL that contains the information required to configure the proxy
-server automatically. </para>
+            <entry valign="top">
+              <para>Select the speed of the panel animation from the
+drop-down list.</para>
             </entry>
           </row>
         </tbody>
       </tgroup>
     </table>
   </sect1>
-  <sect1 id="goscustdesk-65">
-    <title>Setting Screensaver Preferences</title>
+  <sect1 id="goscustdoc-2">
+    <title>Choosing Your Preferred Applications</title>
     <indexterm>
       <primary>preference tools</primary>
-      <secondary>Screensaver</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>sessions</primary>
-      <secondary>configuring screensaver</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>screensaver, setting preferences</primary>
+      <secondary>Preferred Applications</secondary>
     </indexterm>
     <indexterm>
-      <primary>XScreenSaver</primary>
-      <see>screensaver</see>
+      <primary>default applications</primary>
+      <see>preferred applications</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>
+    <para>Use the <application>Preferred
+Applications</application> preference tool to specify the applications that
+you want the GNOME Desktop to use when the GNOME Desktop starts an application
+for you. For example, you can specify <application>Xterm</application> as
+your preferred terminal application. When you open the <guimenu>Desktop</guimenu>
+menu then choose <guimenuitem>New Terminal</guimenuitem>, <application>Xterm</application> starts.</para>
+    <para>You can customize the preferences for the <application>Preferred Applications</application> preference tool in the following functional areas.</para>
     <itemizedlist>
       <listitem>
-        <para>Activate after a specified period of idle time.</para>
-      </listitem>
-      <listitem>
-        <para>Activate when you lock your screen.</para>
+        <para>
+          <guilabel>Web Browser</guilabel>
+        </para>
       </listitem>
       <listitem>
-        <para>Manage power used by your monitor when your system is idle.</para>
+        <para>
+          <guilabel>Mail Reader</guilabel>
+        </para>
       </listitem>
-    </itemizedlist>
-    <para>You can customize the settings for the <application>Mouse</application>
-preference tool in the following functional areas:</para>
-    <itemizedlist>
       <listitem>
         <para>
-          <guilabel>Display Modes</guilabel>
+          <guilabel>Text Editor</guilabel>
         </para>
       </listitem>
       <listitem>
         <para>
-          <guilabel>Advanced</guilabel>
+          <guilabel>Terminal</guilabel>
         </para>
       </listitem>
     </itemizedlist>
-    <sect2 id="goscustdesk-59">
-      <title>Display Modes Settings</title>
-      <para>Use the <guilabel>Display Modes</guilabel> tabbed section to set display
-mode preferences.</para>
-      <para><xref linkend="goscustdesk-TBL-63"/> lists the display mode settings
-that you can configure.</para>
-      <table frame="topbot" id="goscustdesk-TBL-63">
-        <title>Settings for Screensaver Display Mode</title>
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec2" colwidth="35.09*"/>
-          <colspec colname="colspec3" colwidth="64.91*"/>
+    <sect2 id="goscustlookandfeel-32">
+      <title>Web Browser Preferences</title>
+      <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. 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.</para>
+      <para><xref linkend="goscustlookandfeel-TBL-37"/> lists the preferred web browser
+preferences that you can modify.</para>
+      <table frame="topbot" id="goscustlookandfeel-TBL-37">
+        <title>Preferred Web Browser Preferences</title>
+        <tgroup cols="2" colsep="1" rowsep="1">
+          <colspec colname="colspec0" colwidth="18.86*"/>
+          <colspec colname="colspec1" colwidth="47.14*"/>
           <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>Setting</para>
+            <row>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry valign="top">
-                <para>Function</para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry colname="colspec2" valign="top">
-                <para>
-                  <guilabel>Mode</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Use the drop-down list 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
-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 when your screen locks. </para>
-                  </listitem>
-                </itemizedlist>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec2" valign="top">
-                <para>Display list</para>
-              </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Select the screensaver display
-that you require from the list.</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">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Cycle After</guilabel>
+                  <guilabel>Select a Web Browser</guilabel>
                 </para>
               </entry>
-              <entry valign="top">
-                <para>Specify how long to show a particular screensaver
-display before the next display.</para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option if you want to use a standard
+web browser. Use the drop-down combination box to select your preferred web
+browser.</para>
               </entry>
             </row>
             <row>
-              <entry valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Lock Screen After</guilabel>
+                  <guilabel>Custom Web Browser</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 colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option if you want to use a custom
+web browser. </para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guibutton>Preview</guibutton>
+                  <guilabel>Command</guilabel>
                 </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.
-To stop the preview, press any key or click a mouse button.</para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>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="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guibutton>Settings</guibutton>
+                  <guilabel>Start in Terminal</guilabel>
                 </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. </para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option to run the command in a terminal
+window. Select this option for a browser that does not create a window in
+which to run.</para>
               </entry>
             </row>
           </tbody>
         </tgroup>
       </table>
     </sect2>
-    <sect2 id="goscustdesk-60">
-      <title>Advanced Settings</title>
-      <para>Use the <guilabel>Advanced</guilabel> tabbed section to set advanced
-screensaver preferences.</para>
-      <para><xref linkend="goscustdesk-TBL-64"/> lists the advanced screensaver settings
-that you can configure.</para>
-      <table frame="topbot" id="goscustdesk-TBL-64">
-        <title>Advanced Screensaver Settings</title>
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec2" colwidth="40.38*"/>
-          <colspec colname="colspec3" colwidth="59.62*"/>
+    <sect2 id="goscustlookandfeel-42">
+      <title>Email Client Preferences</title>
+      <indexterm>
+        <primary>preferred applications</primary>
+        <secondary>email client</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>email client, preferred application</primary>
+      </indexterm>
+      <para>Use the <application>Mail Reader</application>
+tabbed section to configure your preferred email client. </para>
+      <para><xref linkend="goscustlookandfeel-TBL-43"/> lists the preferred email
+client preferences that you can modify.</para>
+      <table frame="topbot" id="goscustlookandfeel-TBL-43">
+        <title>Preferred Email Client Preferences</title>
+        <tgroup cols="2" colsep="1" rowsep="1">
+          <colspec colname="colspec0" colwidth="18.86*"/>
+          <colspec colname="colspec1" colwidth="47.14*"/>
           <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>Setting</para>
+            <row>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry valign="top">
-                <para>Function</para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Grab Desktop Images</guilabel>
+                  <guilabel>Select a Mail Reader</guilabel>
                 </para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Some
-screensavers can take a screenshot of your screen, then manipulate the screenshot
-to create your screensaver display. Select this option to enable screensavers
-to take a screenshot of your screen.</para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option if you want to use a standard
+email client. Use the drop-down combination box to select your preferred email
+client.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Grab Video Frames</guilabel>
+                  <guilabel>Custom Mail Reader</guilabel>
                 </para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <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 colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option if you want to use a custom
+email client. </para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Choose Random
-Image</guilabel>
+                  <guilabel>Command</guilabel>
                 </para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <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 colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Enter the command to execute to start the custom email
+client.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Verbose Dialognostics</guilabel>
+                  <guilabel>Start in Terminal</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>Display Subprocess
-Errors</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Select this option if you want to display errors related to screensaver subprocesses
-on screen.</para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option to run the command in a terminal
+window. Select this option for an email client that does not create a window
+in which to run.</para>
               </entry>
             </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </sect2>
+    <sect2 id="goscustlookandfeel-31">
+      <title>Text Editor Preferences</title>
+      <indexterm>
+        <primary>preferred applications</primary>
+        <secondary>text editor</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>
+      <para><xref linkend="goscustdoc-TBL-1"/> lists the preferred text editor preferences
+that you can modify.</para>
+      <table frame="topbot" id="goscustdoc-TBL-1">
+        <title>Preferred Text Editor Preferences</title>
+        <tgroup cols="2" colsep="1" rowsep="1">
+          <colspec colname="colspec0" colwidth="18.86*"/>
+          <colspec colname="colspec1" colwidth="47.14*"/>
+          <thead>
             <row>
-              <entry colname="colspec2" valign="top">
-                <para>
-                  <guilabel>Display Splash
-Screen at Startup</guilabel>
-                </para>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Select this option to if you want <application>Xscreensaver</application>
-to display a splash dialog when <application>Xscreensaver</application> starts.</para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
+          </thead>
+          <tbody>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Power Management
-Enabled</guilabel>
+                  <guilabel>Select an Editor</guilabel>
                 </para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <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 colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option if you want to use a standard
+text editor. Use the drop-down combination box to specify your preferred text
+editor.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Standby After</guilabel>
+                  <guilabel>Custom Editor</guilabel>
                 </para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <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 colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option if you want to use a custom
+text editor. A <guilabel>Custom Editor Properties</guilabel> dialog is displayed.</para>
+                <itemizedlist>
+                  <listitem>
+                    <para><guilabel>Name</guilabel>: Type the name of the custom text
+editor.</para>
+                  </listitem>
+                  <listitem>
+                    <para><guilabel>Command</guilabel>: Enter the command to start the
+custom text editor.</para>
+                  </listitem>
+                  <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>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>
+                <para>After you specify a custom text editor, you can click
+on the <guibutton>Properties</guibutton> button to display the <guilabel>Custom Editor Properties</guilabel> dialog. You can use the dialog to modify
+the properties of the custom text editor.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Suspend After</guilabel>
+                  <guilabel>Use this editor to open text files in the file manager</guilabel>
                 </para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Specify
-how long to wait to put the monitor in power-saving mode. </para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select
+this option if you want the file manager to start the custom text editor to
+display text files.</para>
               </entry>
             </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </sect2>
+    <sect2 id="goscustlookandfeel-34">
+      <title>Terminal Preferences</title>
+      <indexterm>
+        <primary>preferred applications</primary>
+        <secondary>terminal</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>terminal, preferred application</primary>
+      </indexterm>
+      <para>Use the <application>Terminal</application> tabbed section
+to configure your preferred terminal.</para>
+      <para><xref linkend="goscustlookandfeel-TBL-35"/> lists the preferred terminal
+preferences that you can modify.</para>
+      <table frame="topbot" id="goscustlookandfeel-TBL-35">
+        <title>Preferred Terminal Preferences</title>
+        <tgroup cols="2" colsep="1" rowsep="1">
+          <colspec colname="colspec0" colwidth="18.86*"/>
+          <colspec colname="colspec1" colwidth="47.14*"/>
+          <thead>
             <row>
-              <entry colname="colspec2" valign="top">
-                <para>
-                  <guilabel>Off After</guilabel>
-                </para>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Specify how long to wait to switch
-off monitor. </para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
+          </thead>
+          <tbody>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Install Colormap</guilabel>
+                  <guilabel>Select a Terminal</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
-screensaver displays.</para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option if you want to use a standard
+terminal. Use the drop-down combination box to specify your preferred terminal.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Fade to Black
-When Blanking</guilabel>
+                  <guilabel>Custom Terminal</guilabel>
                 </para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Select this option if you want your display to fade to black when the screensaver
-activates.</para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option if you want to use a custom
+terminal. </para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Fade from Black
-When Unblanking</guilabel>
+                  <guilabel>Command</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 stops.</para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Enter the command to execute to start the custom terminal.</para>
               </entry>
             </row>
             <row>
-              <entry valign="top">
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Fade Duration</guilabel>
+                  <guilabel>Exec Flag</guilabel>
                 </para>
               </entry>
-              <entry valign="top">
-                <para>Specify how long to take to fade to black when the
-screensaver activates.</para>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Enter the <command>exec</command> option to use with the
+command.</para>
               </entry>
             </row>
           </tbody>
@@ -1444,20 +2543,20 @@ screensaver activates.</para>
       <primary>preference tools</primary>
       <secondary>Screen Resolution</secondary>
     </indexterm>
-    <para>Use the Screen Resolution preference tool to
-specify the resolution settings for your screen. <xref linkend="goscustdesk-TBL-72"/>
-lists the screen resolution settings that you can configure.</para>
+    <para>Use the <application>Screen Resolution</application>
+preference tool to specify the resolution settings for your screen. <xref linkend="goscustdesk-TBL-72"/> lists the screen resolution preferences that
+you can modify.</para>
     <table frame="topbot" id="goscustdesk-TBL-72">
-      <title>Settings for Screen Resolution</title>
+      <title>Screen Resolution Preferences</title>
       <tgroup cols="2" colsep="0" rowsep="0">
         <colspec colname="colspec0" colwidth="50*"/>
         <colspec colname="colspec1" colwidth="50*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
-              <para>Setting</para>
+            <entry>
+              <para>Dialog Element</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Description</para>
             </entry>
           </row>
@@ -1501,6 +2600,416 @@ for the system that you are logged in to only.</para>
       </tgroup>
     </table>
   </sect1>
+  <sect1 id="goscustsession-5">
+    <title>Configuring Sessions</title>
+    <indexterm>
+      <primary>preference tools</primary>
+      <secondary>Sessions</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>sessions</primary>
+      <secondary>preferences</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 in the GNOME 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>Current Session</guilabel>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <guilabel>Startup Programs</guilabel>
+        </para>
+      </listitem>
+    </itemizedlist>
+    <sect2 id="goscustsession-16">
+      <title>Setting Session Preferences</title>
+      <indexterm>
+        <primary>sessions</primary>
+        <secondary>setting options</secondary>
+      </indexterm>
+      <para>Use the <guilabel>Session Options</guilabel> tabbed section
+to manage multiple sessions, and to set preferences for the current session.</para>
+      <para><xref linkend="goscustsession-TBL-11"/> lists the session options that
+you can modify.</para>
+      <table frame="topbot" id="goscustsession-TBL-11">
+        <title>Session Options</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">
+                <para>Dialog Element</para>
+              </entry>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry colsep="0" rowsep="0" valign="top">
+                <para>
+                  <guilabel>Show splash
+screen on login</guilabel>
+                </para>
+              </entry>
+              <entry colsep="0" rowsep="0" valign="top">
+                <para>Select this option to display a splash screen when you start a session. </para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
+                <para>
+                  <guilabel>Prompt on logout</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Select this option to display a confirmation
+dialog when you end a session. </para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
+                <para>
+                  <guilabel>Automatically save changes to session</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <indexterm>
+                  <primary>startup applications</primary>
+                  <secondary>session-managed</secondary>
+                </indexterm>
+                <para>Select this
+option if you want the session manager to save the current state of your session.
+The session manager saves the session-managed applications that are open,
+and the settings associated with the session-managed applications. The next
+time that you start a session, the applications start automatically, with
+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>Sessions</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>Use this area of the dialog to manage multiple sessions
+in the GNOME 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
+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>
+                <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>
+    </sect2>
+    <sect2 id="goscustlookandfeel-27">
+      <title>Setting Session Properties</title>
+      <indexterm>
+        <primary>startup applications</primary>
+        <secondary>session-managed</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>sessions</primary>
+        <secondary>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>
+      <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">
+          <colspec colname="colspec0" colwidth="18.86*"/>
+          <colspec colname="colspec1" colwidth="47.14*"/>
+          <thead>
+            <row>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
+              </entry>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry colsep="0" rowsep="0" valign="top">
+                <para>
+                  <guilabel>Order</guilabel>
+                </para>
+              </entry>
+              <entry colsep="0" rowsep="0" valign="top">
+                <para>The <guilabel>Order</guilabel>
+property specifies the order in which the session manager starts session-managed
+startup applications. The session manager starts applications with lower order
+values first. The default value is 50.</para>
+                <para>To specify the startup
+order of an application, select the application in the table. Use the <guilabel>Order</guilabel> spin box to specify the startup order value.</para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
+                <para>
+                  <guilabel>Style</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
+                <para>The <guilabel>Style</guilabel> property determines the
+restart 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 terminate applications with this restart style during
+a session.</para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>Restart</guilabel>
+                    </para>
+                    <para>Restarts automatically whenever you close or terminate the application.
+Choose this style for an application if the application must run continuously
+during your  session. To terminate an application with this restart style,
+select the application in the table, then click on the <guibutton>Remove</guibutton>
+button.</para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>Trash</guilabel>
+                    </para>
+                    <para>Does not start when you start a GNOME session.</para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>Settings</guilabel>
+                    </para>
+                    <para>Starts automatically when you start a  session. Applications with this
+style usually have a low startup order, and store your configuration settings
+for GNOME and session-managed applications.</para>
+                  </listitem>
+                </itemizedlist>
+              </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" 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. 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>
+    <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>Sessions</application> preference tool
+to specify non-session-managed <firstterm>startup applications</firstterm>.
+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, see <xref linkend="goscustsession-16"/>.</para>
+      <para><xref linkend="goscustsession-TBL-19"/> lists the startup applications
+preferences that you can modify.</para>
+      <table frame="topbot" id="goscustsession-TBL-19">
+        <title>Startup Programs Preferences</title>
+        <tgroup cols="2">
+          <colspec colname="col1" colwidth="18.86*"/>
+          <colspec colname="col2" colwidth="47.14*"/>
+          <thead>
+            <row>
+              <entry colname="col1" colsep="0">
+                <para>Dialog Element</para>
+              </entry>
+              <entry colname="col2" colsep="0">
+                <para>Description</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. </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>
+  <sect1 id="goscustdesk-39">
+    <title>Customizing Keyboard Shortcuts</title>
+    <indexterm>
+      <primary>preference tools</primary>
+      <secondary>Keyboard Shortcuts</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>shortcut
+keys</primary>
+      <secondary>configuring</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>keyboard shortcuts</primary>
+      <secondary>configuring</secondary>
+    </indexterm>
+    <para>A <firstterm>keyboard shortcut</firstterm> is a key or combination of
+keys that provides an alternative to standard ways of performing an action. </para>
+    <para>Use the <application>Keyboard Shortcuts</application> preference tool to display the default keyboard
+shortcuts. You can customize the default keyboard shortcuts to your requirements. </para>
+    <para><xref linkend="goscustdesk-TBL-5"/>
+lists the keyboard shortcut settings that you can customize.</para>
+    <table frame="topbot" id="goscustdesk-TBL-5">
+      <title>Keyboard Shortcuts Preferences</title>
+      <tgroup cols="2" colsep="0" rowsep="0">
+        <colspec colname="colspec0" colwidth="36.11*"/>
+        <colspec colname="colspec1" colwidth="63.89*"/>
+        <thead>
+          <row rowsep="1">
+            <entry>
+              <para>Dialog Element</para>
+            </entry>
+            <entry>
+              <para>Description</para>
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <guilabel>Text editing shortcuts</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <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 <application>Emacs</application> shortcut keys.</para>
+                </listitem>
+              </itemizedlist>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <guilabel>Desktop shortcuts</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <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, click on the action
+to select the action, then click on the shortcut for the action. Press the
+keys that you want to associate with the action.</para>
+              <para>To disable the
+shortcut keys for an action, click on the action to select the action, then
+click on the shortcut for the action. Press <keycap>Back Space</keycap>.</para>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </sect1>
   <sect1 id="goscustmulti-2">
     <title>Setting Sound Preferences</title>
     <indexterm>
@@ -1546,23 +3055,23 @@ preference tool in the following functional areas:</para>
       </listitem>
     </itemizedlist>
     <sect2 id="goscustmulti-3">
-      <title>General Settings</title>
+      <title>General Sound Preferences</title>
       <para>Use the <guilabel>General</guilabel> tabbed section of the <application>Sound</application> preference tool to specify when to launch the GNOME sound
 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>
+      <para><xref linkend="goscustmulti-TBL-4"/> lists the general sound preferences
+that you can modify.</para>
       <table frame="topbot" id="goscustmulti-TBL-4">
-        <title>Settings for Sound</title>
+        <title>General Sound Preferences</title>
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="colspec18" colwidth="19.21*"/>
           <colspec colname="colspec19" colwidth="46.79*"/>
           <thead>
             <row>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Option</para>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Function</para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
           </thead>
@@ -1576,8 +3085,7 @@ server startup</guilabel>
               </entry>
               <entry colsep="0" rowsep="0" valign="top">
                 <para>Select this option to start the GNOME sound server when you start a GNOME
-session. When the sound server is active, the desktop environment can play
-sounds.</para>
+session. When the sound server is active, the GNOME Desktop can play sounds.</para>
               </entry>
             </row>
             <row>
@@ -1588,9 +3096,9 @@ events</guilabel>
                 </para>
               </entry>
               <entry colsep="0" rowsep="0" valign="top">
-                <para>Select this option to play sounds when particular events occur in your desktop
-environment. You can select this option only if the <guilabel>Enable sound
-server startup</guilabel> option is selected.</para>
+                <para>Select this option to play sounds when particular events occur in the GNOME
+Desktop. You can select this option only if the <guilabel>Enable sound server
+startup</guilabel> option is selected.</para>
               </entry>
             </row>
           </tbody>
@@ -1598,7 +3106,7 @@ server startup</guilabel> option is selected.</para>
       </table>
     </sect2>
     <sect2 id="goscustdesk-48">
-      <title>Sound Event Settings</title>
+      <title>Sound Event Preferences</title>
       <para>Use the <guilabel>Sound Events</guilabel> tabbed section of the <application>Sound</application> preference tool to associate particular sounds with particular
 events. </para>
       <note>
@@ -1606,20 +3114,20 @@ events. </para>
 option, and the <guilabel>Sounds for events</guilabel> option before you can
 access the <guilabel>Sound Events</guilabel> tabbed section.</para>
       </note>
-      <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 preferences
+that you can modify.</para>
       <table frame="topbot" id="goscustmulti-TBL-6">
-        <title>Settings for Sound Events</title>
+        <title>Sound Event Preferences</title>
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="colspec18" colwidth="19.21*"/>
           <colspec colname="colspec19" colwidth="46.79*"/>
           <thead>
             <row>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Option</para>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Function</para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
           </thead>
@@ -1688,21 +3196,21 @@ bell</primary>
       <para>Use the <guilabel>System Bell</guilabel> tabbed section to set your preferences
 for the system bell.</para>
       <para>Some applications play a bell sound to indicate a keyboard input error.
-Use the options in the <guilabel>System Bell</guilabel> tabbed section to
-configure the bell sound. <xref linkend="goscustdesk-TBL-1"/> lists the system
-bell settings that you can configure.</para>
+Use the preferences in the <guilabel>System Bell</guilabel> tabbed section
+to configure the bell sound. <xref linkend="goscustdesk-TBL-1"/> lists the
+system bell preferences that you can modify.</para>
       <table frame="topbot" id="goscustdesk-TBL-1">
-        <title>Settings for System Bell</title>
+        <title>System Bell Preferences</title>
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="colspec18" colwidth="19.21*"/>
           <colspec colname="colspec19" colwidth="46.79*"/>
           <thead>
             <row>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Option</para>
+              <entry colsep="0" rowsep="1">
+                <para>Dialog Element</para>
               </entry>
-              <entry colsep="0" rowsep="1" valign="top">
-                <para>Function</para>
+              <entry colsep="0" rowsep="1">
+                <para>Description</para>
               </entry>
             </row>
           </thead>
@@ -1759,36 +3267,34 @@ to indicate an input error. </para>
     </sect2>
   </sect1>
   <sect1 id="goscustdesk-12">
-    <title>Customizing Themes in the Desktop Environment</title>
+    <title>Customizing Themes</title>
     <indexterm>
       <primary>themes</primary>
-      <secondary>setting controls themes</secondary>
+      <secondary>setting controls options</secondary>
     </indexterm>
     <indexterm>
       <primary>themes</primary>
       <secondary>setting window
-frame themes</secondary>
+frame options</secondary>
     </indexterm>
     <indexterm>
       <primary>themes</primary>
-      <secondary>setting icons themes</secondary>
+      <secondary>setting icons options</secondary>
     </indexterm>
     <indexterm>
       <primary>windows</primary>
-      <secondary>setting frame themes</secondary>
+      <secondary>setting frame theme options</secondary>
     </indexterm>
     <indexterm>
       <primary>preference tools</primary>
       <secondary>Theme</secondary>
     </indexterm>
-    <para>A
-theme is a group of coordinated settings that specifies the visual appearance
-of a part of the desktop environment. You can choose themes to change the
-appearance of the desktop environment. Use the <application>Theme</application>
-preference tool to select a theme for your desktop environment. You can choose
-from a list of available themes. The list of available themes includes several
-themes for users with accessibility requirements. </para>
-    <para>A theme contains settings that affect different parts of the GNOME desktop,
+    <para>A theme is a group of coordinated settings that specifies
+the visual appearance of a part of the GNOME Desktop. You can choose themes
+to change the appearance of the GNOME Desktop. Use the <application>Theme</application> preference tool to select a theme. You can choose from a list
+of available themes. The list of available themes includes several themes
+for users with accessibility requirements. </para>
+    <para>A theme contains settings that affect different parts of the GNOME Desktop,
 as follows:</para>
     <variablelist>
       <varlistentry>
@@ -1831,9 +3337,7 @@ of controls options, window frame options, and icon options.</para>
       <para>To create a custom theme, perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>To open the <application>Theme</application> preference tool,
-choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop
-Preferences</guisubmenu><guimenuitem>Theme</guimenuitem></menuchoice>.</para>
+          <para>Start the <application>Theme</application> preference tool.</para>
         </listitem>
         <listitem>
           <para>Select a theme in the list of themes.</para>
@@ -1882,9 +3386,7 @@ be a <filename>.tar.gz</filename> file.</para>
       <para>To install a new theme, perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>To open the <application>Theme</application> preference tool,
-choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop
-Preferences</guisubmenu><guimenuitem>Theme</guimenuitem></menuchoice>.</para>
+          <para>Start the <application>Theme</application> preference tool.</para>
         </listitem>
         <listitem>
           <para>Click on the <guibutton>Install theme</guibutton> button.
@@ -1908,9 +3410,7 @@ options. You can find many controls options on the Internet.</para>
 perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>To open the <application>Theme</application> preference tool,
-choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop
-Preferences</guisubmenu><guimenuitem>Theme</guimenuitem></menuchoice>.</para>
+          <para>Start the <application>Theme</application> preference tool.</para>
         </listitem>
         <listitem>
           <para>Click on the <guibutton>Details</guibutton> button. An <guilabel>Theme Details</guilabel> dialog is displayed.</para>
@@ -1941,9 +3441,7 @@ the new option. </para>
 the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>To open the <application>Theme</application> preference tool,
-choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop
-Preferences</guisubmenu><guimenuitem>Theme</guimenuitem></menuchoice>.</para>
+          <para>Start the <application>Theme</application> preference tool.</para>
         </listitem>
         <listitem>
           <para>Click on the <guibutton>Details</guibutton> button. A <guilabel>Theme Details</guilabel> dialog is displayed.</para>
@@ -1989,21 +3487,21 @@ bar. The themes are displayed as icons in the view pane.</para>
       <secondary>Windows</secondary>
     </indexterm>
     <para>Use the <application>Windows</application> preference
-tool to customize window behavior for your desktop environment.</para>
-    <para><xref linkend="goscustwindows-TBL-14"/> lists the window behavior settings
-that you can customize.</para>
+tool to customize window behavior for the GNOME Desktop.</para>
+    <para><xref linkend="goscustwindows-TBL-14"/> lists the windows preferences
+that you can modify.</para>
     <table frame="topbot" id="goscustwindows-TBL-14">
-      <title>Settings for Window Behavior</title>
+      <title>Windows Preferences</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 colsep="0" rowsep="1">
+              <para>Dialog Element</para>
             </entry>
-            <entry colsep="0" rowsep="1" valign="top">
-              <para>Function</para>
+            <entry colsep="0" rowsep="1">
+              <para>Description</para>
             </entry>
           </row>
         </thead>
diff --git a/gnome2-user-guide/C/gosdeskback.xml b/gnome2-user-guide/C/gosdeskback.xml
index 97ea925..0187639 100644
--- a/gnome2-user-guide/C/gosdeskback.xml
+++ b/gnome2-user-guide/C/gosdeskback.xml
@@ -38,29 +38,53 @@ desktop.</para>
         <para>You can customize the pattern or color of the desktop.</para>
       </listitem>
     </itemizedlist>
-    <para>By default, your desktop contains three objects. <xref linkend="gosdeskback-TBL-84"/>
+    <para><xref linkend="gosdeskback-TBL-84"/>
 describes the functions of the default objects on the desktop.</para>
     <table frame="topbot" id="gosdeskback-TBL-84">
       <title>Functions of Default Desktop Objects</title>
       <tgroup cols="3" colsep="0" rowsep="0">
-        <colspec colname="colspec2" colwidth="35.94*"/>
-        <colspec colname="colspec0" colwidth="35.94*"/>
-        <colspec colname="colspec1" colwidth="64.06*"/>
+        <colspec colname="colspec2" colwidth="64.77*"/>
+        <colspec colname="colspec0" colwidth="25.66*"/>
+        <colspec colname="colspec1" colwidth="45.51*"/>
         <thead>
           <row rowsep="1">
-            <entry colname="colspec2" valign="top">
+            <entry colname="colspec2">
               <para>Object</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Component</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Function </para>
             </entry>
           </row>
         </thead>
         <tbody>
           <row>
+            <entry colname="colspec2">
+              <screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata fileref="figures/naut_computer_launcher.png" format="PNG"/>
+                  </imageobject>
+                  <textobject>
+                    <phrase>Nautilus computer icon.</phrase>
+                  </textobject>
+                </mediaobject>
+              </screenshot>
+            </entry>
+            <entry colname="colspec0">
+              <para>
+                <guilabel>Computer</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec1">
+              <para>Opens a
+file manager window, and displays your CD-ROM drive and floppy drives, file
+system and network.</para>
+            </entry>
+          </row>
+          <row>
             <entry colname="colspec2" valign="top">
               <screenshot>
                 <mediaobject>
@@ -140,7 +164,7 @@ window, and displays your <guilabel>Trash</guilabel> in the view pane.</para>
     </indexterm>
     <para>A desktop object is an icon on your desktop that you can
 use to open your files, folders, and applications. By default, your desktop
-contains three objects. You can also add objects to your desktop to provide
+contains four objects. You can also add objects to your desktop to provide
 convenient access to files, folders, applications, and URIs that you use frequently.
 For example, you can add a launcher to your desktop to enable you to open
 a particular application that you use often. </para>
@@ -153,10 +177,10 @@ you can add to your desktop.</para>
         <colspec colname="colspec1" colwidth="69.77*"/>
         <thead>
           <row rowsep="1">
-            <entry colname="colspec0" valign="top">
+            <entry colname="colspec0">
               <para>Object Type</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Description</para>
             </entry>
           </row>
@@ -254,8 +278,7 @@ the <application>File Types and Programs</application> preference tool.</para>
 on the object, then choose <guimenuitem>Open With</guimenuitem>. Choose an
 action from the <guisubmenu>Open With</guisubmenu> submenu. </para>
       <para>The items in the <guimenuitem>Open With</guimenuitem> submenu correspond
-to the contents of the following parts of the <application>File Types and
-Programs</application> preference tool:</para>
+to the contents of the following parts of the <application>File Types and Programs</application> preference tool:</para>
       <itemizedlist>
         <listitem>
           <para><guilabel>Default action</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog</para>
@@ -278,11 +301,12 @@ once on a file to execute the default action.</para>
         <secondary>launchers</secondary>
       </indexterm>
       <para>A desktop launcher can start an application
-or link to a particular file, folder, FTP site, or URI. </para>
+or link to a particular file, folder, FTP site, or URI location. </para>
       <para>To add a launcher to your desktop, perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>Right-click on the desktop, then choose <guimenuitem>New Launcher</guimenuitem>. A <guilabel>Create Launcher</guilabel> dialog is displayed.</para>
+          <para>Right-click on the desktop, then choose  <guilabel>Create Launcher</guilabel>. A <guilabel>Create Launcher</guilabel> dialog
+is displayed.</para>
         </listitem>
         <listitem>
           <para>For information on how to enter the properties of the launcher
@@ -291,6 +315,9 @@ With Panels</emphasis>. The command that you enter for the launcher is the
 command that is executed when you use the desktop object.</para>
         </listitem>
       </orderedlist>
+      <para>You can also drag an application launcher from a menu to the desktop.
+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. </para>
     </sect2>
     <sect2 id="gosdeskback-20">
       <title>To Add a Symbolic Link to the Desktop</title>
@@ -421,10 +448,9 @@ Right-click on any desktop object, then choose <guimenuitem>Paste Files</guimenu
           <secondary>creating a folder on</secondary>
         </indexterm>
         <para>To create a folder object, right-click on the desktop to
-open the <guimenu>Desktop</guimenu> menu. Choose <guimenuitem>New Folder</guimenuitem>.
-An <guilabel>untitled</guilabel> folder is added to the desktop. Type the
-name of the new folder, then press <keycap>Return</keycap>. The folder is
-displayed with the new name. The new folder resides in your desktop directory.</para>
+open the <guimenu>Desktop</guimenu> menu. Choose <guimenuitem>Create Folder</guimenuitem>. An <guilabel>untitled</guilabel> folder is added
+to the desktop. Type the name of the new folder, then press <keycap>Return</keycap>. The folder is displayed with the new name. The new folder resides
+in your desktop directory.</para>
       </sect3>
     </sect2>
     <sect2 id="gosdeskback-90">
@@ -477,6 +503,9 @@ is only available if you select the <guilabel>Include a Delete command that
 bypasses Trash</guilabel> option in the <application>Nautilus</application><guilabel>File Management Preferences</guilabel> dialog. </para>
       <para>To delete an object from the desktop right-click on the object, then
 choose <guimenuitem>Delete</guimenuitem>. </para>
+      <note>
+        <para>You cannot delete the <guilabel>Home</guilabel> or <guilabel>Trash</guilabel> desktop objects. </para>
+      </note>
     </sect2>
     <sect2 id="gosdeskback-89">
       <title>To View the Properties of a Desktop Object</title>
@@ -771,84 +800,74 @@ menu</secondary>
     <screenshot>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/file_manager_menu.png" format="PNG"/>
+          <imagedata fileref="figures/com_file_manager_menu.png" format="PNG"/>
         </imageobject>
         <textobject>
-          <phrase>Desktop menu. The context describes the graphic.</phrase>
+          <phrase>Desktop menu. The context describes the graphic. </phrase>
         </textobject>
       </mediaobject>
     </screenshot>
     <para><indexterm><primary>Desktop menu</primary><secondary>illustration</secondary></indexterm>To open the <guimenu>Desktop</guimenu> menu, right-click on a
 vacant space on the desktop. You can use the <guimenu>Desktop</guimenu> menu
 to perform actions on the desktop.</para>
-    <para><xref linkend="gosdeskback-TBL-85"/> describes the items in the <guimenu>Desktop</guimenu> menu.</para>
-    <table frame="topbot" id="gosdeskback-TBL-85">
+    <para><xref linkend="gosdeskback-TBL-90"/> describes the items in
+the <guimenu>Desktop</guimenu> menu.</para>
+    <table frame="topbot" id="gosdeskback-TBL-90">
       <title>Items on the Desktop Menu</title>
       <tgroup cols="2" colsep="0" rowsep="0">
         <colspec colname="colspec0" colwidth="35.94*"/>
         <colspec colname="colspec1" colwidth="64.06*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Menu Item</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Function </para>
             </entry>
           </row>
         </thead>
         <tbody>
           <row>
-            <entry valign="top">
-              <para>
-                <guimenuitem>New Window</guimenuitem>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>Opens a new file manager window that displays your
-home location.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
+            <entry colname="colspec0">
               <para>
-                <guimenuitem>New Folder</guimenuitem>
+                <guimenuitem>Open Terminal</guimenuitem>
               </para>
             </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Creates a new folder object on your desktop. The folder is created in your
-desktop directory.</para>
+            <entry colname="colspec1">
+              <para>Starts a <application>GNOME Terminal</application>.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec0" valign="top">
+            <entry colname="colspec0">
               <para>
-                <guimenuitem>New Terminal</guimenuitem>
+                <guimenuitem>Create Folder</guimenuitem>
               </para>
             </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Starts a <application>GNOME Terminal</application>.</para>
+            <entry colname="colspec1">
+              <para>Creates a new folder object.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec0" valign="top">
+            <entry colname="colspec0">
               <para>
-                <guimenuitem>New Launcher</guimenuitem>
+                <guimenuitem>Create Launcher</guimenuitem>
               </para>
             </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Creates a launcher on your desktop. For more information, see <xref linkend="gosdeskback-3"/>.</para>
+            <entry colname="colspec1">
+              <para>Creates a launcher on your desktop. For more
+information, see <xref linkend="gosdeskback-3"/>.</para>
             </entry>
           </row>
           <row>
-            <entry colname="colspec0" valign="top">
+            <entry valign="top">
               <para>
-                <guisubmenu>Scripts</guisubmenu>
+                <guimenuitem>Create Document</guimenuitem>
               </para>
             </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Opens a submenu of scripts that
-you can run.</para>
+            <entry valign="top">
+              <para>Create a document. You can select to create an empty
+document or select a document from a template.</para>
             </entry>
           </row>
           <row>
@@ -870,29 +889,7 @@ Name</guimenuitem>
             </entry>
             <entry colname="colspec1">
               <para>Ensures that the left edges of the objects
-on the desktop are aligned with one another.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <guimenuitem>Cut Files</guimenuitem>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Deletes the selected file or
-files from the folder or desktop, and places the file or files in buffer.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <guimenuitem>Copy Files</guimenuitem>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Copies the selected file or files from the folder or desktop, and places the
-file or files in buffer.</para>
+on the desktop are aligned.</para>
             </entry>
           </row>
           <row>
@@ -902,18 +899,7 @@ file or files in buffer.</para>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Puts the file or files in the buffer into the selected folder or the desktop.</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 other  removable media.</para>
+              <para>Puts the file or files into the selected folder or the desktop.</para>
             </entry>
           </row>
           <row>
@@ -976,11 +962,11 @@ 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> preference tool. </para>
+        <para>Use the <application>Desktop Background</application> preference 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>
+        <para>Choose a pattern or color for the background from the <guilabel>Background Preferences</guilabel> dialog. To change the pattern or color of
+the desktop background, perform the following steps:</para>
         <orderedlist>
           <listitem>
             <para>Open a file manager window.</para>
diff --git a/gnome2-user-guide/C/goseditmainmenu.xml b/gnome2-user-guide/C/goseditmainmenu.xml
index a76eb84..406c893 100644
--- a/gnome2-user-guide/C/goseditmainmenu.xml
+++ b/gnome2-user-guide/C/goseditmainmenu.xml
@@ -9,32 +9,34 @@
       <primary>menus</primary>
       <secondary>introduction</secondary>
     </indexterm>
-    <para>You can access all desktop environment functions through menus. The
-panels 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 in your desktop environment:</para>
+    <para>You can access all GNOME Desktop functions through menus. The panels
+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 in the GNOME Desktop:</para>
     <itemizedlist>
       <listitem>
-        <para><guimenu>Applications</guimenu> menu: You can access many
-of your applications, commands, and configuration options from the <guimenu>Applications</guimenu> menu. You can also access the desktop environment preference
-tools from the <guimenu>Applications</guimenu> menu.</para>
+        <para><guimenu>Main Menu</guimenu>: You can access the items in
+the <guimenu>Applications</guimenu> menu from the <guimenu>Main Menu</guimenu>.
+You can have many <guimenu>Main Menu</guimenu> buttons in your panels. You
+can also access the items in the <guimenu>Actions</guimenu> menu from the <guimenu>Main Menu</guimenu>. The items in the <guimenu>Actions</guimenu> menu are
+at the top level of the <guimenu>Main Menu</guimenu>.</para>
       </listitem>
       <listitem>
-        <para><guimenu>Actions</guimenu> menu: You can access various commands
-that enable you to perform desktop environment tasks from the <guimenu>Actions</guimenu> menu. For example, you can start the <application>Search Tool</application>
-application, or log out of the desktop environment. </para>
+        <para><application>Menu Bar</application>: You can access the items
+in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus
+from <application>Menu Bar</application>. You can have many <application>Menu Bar</application> applets in your panels. </para>
       </listitem>
       <listitem>
-        <para><guimenu>Main Menu</guimenu>: You can access the items in
-the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus from
-the <guimenu>Main Menu</guimenu>. You can have many <guimenu>Main Menu</guimenu>
-buttons in your panels. </para>
+        <para><guimenu>Applications</guimenu> menu: You can access many
+of your applications, commands, and configuration options from the <guimenu>Applications</guimenu> menu. You can also access the
+GNOME Desktop preference tools from the <guimenu>Applications</guimenu> menu.</para>
       </listitem>
       <listitem>
-        <para><application>Menu Bar</application>: You can also access the
-items in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu>
-menus from the <application>Menu Bar</application>. You can have many <application>Menu Bar</application> objects in your panels. </para>
+        <para><guimenu>Actions</guimenu> menu: You can access commands that
+enable you to perform various tasks from the <guimenu>Actions</guimenu> menu.
+For example, you can start the <application>Search Tool</application> application,
+or log out of the GNOME Desktop. </para>
       </listitem>
     </itemizedlist>
     <para>You can also right-click on the desktop to open the <guimenu>Desktop</guimenu> menu. The <guimenu>Desktop</guimenu> menu enables you to perform
@@ -59,11 +61,11 @@ and enable you to work in the way that you prefer.</para>
     </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
-items from the submenu. </para>
+items from the submenu.</para>
     <para>When you choose a launcher, the launcher starts an application or runs
 a command. You can also right-click on a launcher to open a popup menu. The
 popup menu enables you to add the item to a panel, and perform other tasks.
-For more information on the popup menu, see the next section. </para>
+For more information on the popup menu, see the next section.</para>
     <para>You can change the theme for your session to change how all your menus
 look. To change the theme, use the <application>Theme</application> preference
 tool.</para>
@@ -118,7 +120,7 @@ as a drawer object. </para>
           </mediaobject>
         </screenshot>
       </figure>
-      <para><xref linkend="goseditmainmenu-TBL-30"/> describes menu item popup menus. <indexterm><primary>launchers</primary><secondary>adding to panel</secondary></indexterm></para>
+      <para><xref linkend="goseditmainmenu-TBL-30"/> describes menu item popup menus. <indexterm><primary>launchers</primary><secondary>adding to panel</secondary></indexterm><indexterm><primary>menus</primary><secondary>adding to panel</secondary></indexterm></para>
       <table frame="topbot" id="goseditmainmenu-TBL-30">
         <title>Menu Item Popup Menus</title>
         <tgroup cols="2" colsep="0" rowsep="0">
@@ -126,10 +128,10 @@ as a drawer object. </para>
           <colspec colname="colspec1" colwidth="57.29*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Item</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Description</para>
               </entry>
             </row>
@@ -248,10 +250,6 @@ the properties of the submenu.</para>
           </tbody>
         </tgroup>
       </table>
-      <indexterm>
-        <primary>menus</primary>
-        <secondary>adding to panel</secondary>
-      </indexterm>
     </sect2>
   </sect1>
   <sect1 id="goseditmainmenu-8">
@@ -262,7 +260,11 @@ the properties of the submenu.</para>
     </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 contains the <guimenu>Desktop Preferences</guimenu> menu. You can use the <guimenu>Desktop Preferences</guimenu> menu to start the desktop environment preference tools. The <guimenu>Applications</guimenu> menu also includes the file manager and the help browser.</para>
+preference tools. The <guimenu>Applications</guimenu>
+menu contains the <guimenu>Desktop Preferences</guimenu> menu. You can use
+the <guimenu>Desktop Preferences</guimenu> menu to start the GNOME Desktop
+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>
       <listitem>
@@ -286,9 +288,8 @@ preference tools. The <guimenu>Applications</guimenu> menu contains the <guimenu
       <primary>menus</primary>
       <secondary>Actions menu</secondary>
     </indexterm>
-    <para>The <guimenu>Actions</guimenu> menu contains various commands that enable
-you to perform desktop environment tasks. <xref linkend="goseditmainmenu-TBL-52"/>
-describes the commands in the <guimenu>Actions</guimenu> menu.</para>
+    <para>The <guimenu>Actions</guimenu> menu contains commands that enable you
+to perform various tasks in the GNOME Desktop. <xref linkend="goseditmainmenu-TBL-52"/> describes the commands in the <guimenu>Actions</guimenu> menu. </para>
     <table frame="topbot" id="goseditmainmenu-TBL-52">
       <title>Actions Menu Commands</title>
       <tgroup cols="2" colsep="0" rowsep="0">
@@ -296,10 +297,10 @@ describes the commands in the <guimenu>Actions</guimenu> menu.</para>
         <colspec colname="colspec1" colwidth="61.52*"/>
         <thead>
           <row rowsep="1">
-            <entry valign="top">
+            <entry>
               <para>Menu Item</para>
             </entry>
-            <entry valign="top">
+            <entry>
               <para>Function</para>
             </entry>
           </row>
@@ -332,7 +333,7 @@ manual.</para>
           <row>
             <entry colname="colspec0">
               <para>
-                <guimenuitem>Open Recent</guimenuitem>
+                <guimenuitem> Recent Documents</guimenuitem>
               </para>
             </entry>
             <entry colname="colspec1">
@@ -354,16 +355,6 @@ dialog to save the screenshot.</para>
           <row>
             <entry valign="top">
               <para>
-                <guimenuitem>Lock Screen</guimenuitem>
-              </para>
-            </entry>
-            <entry valign="top">
-              <para>Locks your screen. </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>
                 <guimenuitem>Log Out</guimenuitem>
               </para>
             </entry>
@@ -374,7 +365,8 @@ dialog to save the screenshot.</para>
         </tbody>
       </tgroup>
     </table>
-    <para>The <guimenu>Actions</guimenu> menu resides in the following places: </para>
+    <para>The <guimenu>Actions</guimenu> menu resides in the following
+places: </para>
     <itemizedlist>
       <listitem>
         <para><guimenu>Main Menu</guimenu>. The items in the <guimenu>Actions</guimenu> menu are at the top level of the <guimenu>Main Menu</guimenu>.</para>
@@ -391,7 +383,7 @@ dialog to save the screenshot.</para>
       <para>The <guilabel>Run Application</guilabel> dialog gives you access to the command
 line. When you run a command in the <guilabel>Run Application</guilabel> dialog,
 you cannot receive output from the command.</para>
-      <para>To run a command from the command line perform the following steps: </para>
+      <para>To run a command from the command line perform the following steps:</para>
       <orderedlist>
         <listitem>
           <para>Display the <guilabel>Run Application</guilabel> dialog. You
@@ -400,9 +392,8 @@ following ways:<itemizedlist><listitem><para>From any panel</para><para>Add the
 the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Run</guimenuitem></menuchoice>.
 Click on the <guibutton>Run</guibutton> button.</para></listitem><listitem><para>From the <guimenu>Main Menu</guimenu></para><para>Open the <guimenu>Main Menu</guimenu>, then choose <guimenuitem>Run
 Application</guimenuitem>.</para></listitem><listitem><para>From the <application>Menu Bar</application></para><para>Choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Run
-Application</guimenuitem></menuchoice>.</para></listitem><listitem><para>Use shortcut keys</para><para>The default shortcut keys to display the <guilabel>Run Application</guilabel>
-dialog are <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>. You can change the
-shortcut keys that display the <guilabel>Run Application</guilabel> dialog
+Application</guimenuitem></menuchoice>.</para></listitem><listitem><para>Use shortcut keys</para><para>The default shortcut keys to display the <guilabel>Run Application</guilabel> dialog are <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>.You can change
+the shortcut keys that display the <guilabel>Run Application</guilabel> dialog
 in the <application>Keyboard Shortcuts</application> preference tool.</para></listitem><listitem><para>From a menu item popup menu</para><para>Right-click on an item in a menu, then choose <guilabel>Put into run
 dialog</guilabel> from the popup menu. The <guilabel>Run Application</guilabel>
 dialog opens with the command from the menu in the command field.</para></listitem></itemizedlist></para>
@@ -433,18 +424,6 @@ command that does not create a window in which to run.</para>
 take a screenshot in any of the following ways:</para>
       <itemizedlist>
         <listitem>
-          <para>From the <application>Menu Bar</application></para>
-          <para>To take a screenshot of the entire screen, choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Take Screenshot</guimenuitem></menuchoice>.
-A <guilabel>Save 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. To save the screenshot
-to the desktop, select the <guilabel>Save screenshot to desktop</guilabel>
-option. </para>
-        </listitem>
-        <listitem>
           <para>From any panel</para>
           <para>Add the <guibutton>Screenshot</guibutton> button to a panel. Right-click
 on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Screenshot</guimenuitem></menuchoice>. Click on the <guibutton>Screenshot</guibutton> button to take
@@ -460,35 +439,34 @@ dialog to save the screenshot.</para>
               <colspec colname="colspec1" colwidth="64.33*"/>
               <thead>
                 <row rowsep="1">
-                  <entry valign="top">
+                  <entry>
                     <para>Default Shortcut Keys</para>
                   </entry>
-                  <entry valign="top">
+                  <entry>
                     <para>Function</para>
                   </entry>
                 </row>
               </thead>
               <tbody>
                 <row>
-                  <entry colname="colspec0">
+                  <entry colname="colspec0" valign="top">
                     <para>
                       <keycap>Print Screen</keycap>
                     </para>
                   </entry>
-                  <entry colname="colspec1">
-                    <para>Takes a screenshot of the entire screen, and
-displays the <guilabel>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel> dialog to save the screenshot.</para>
+                  <entry colname="colspec1" valign="top">
+                    <para>Takes a screenshot of the entire
+screen, and displays the <guilabel>Save Screenshot</guilabel> dialog. Use
+the <guilabel>Save 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 colname="colspec0" valign="top">
+                    <para><keycombo><keycap>Alt</keycap><keycap>Print Screen</keycap></keycombo></para>
                   </entry>
-                  <entry colname="colspec1">
-                    <para>Takes a screenshot
-of the window to which the mouse points, and displays the <guilabel>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel> dialog to
-save the screenshot.</para>
+                  <entry colname="colspec1" valign="top">
+                    <para>Takes a screenshot of the window to which the mouse points, and displays the <guilabel>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel>
+dialog to save the screenshot.</para>
                   </entry>
                 </row>
               </tbody>
@@ -498,6 +476,18 @@ save the screenshot.</para>
 tool to modify the default shortcut keys.</para>
         </listitem>
         <listitem>
+          <para>From <application>Menu Bar</application></para>
+          <para>To take a screenshot of the entire screen, choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Take Screenshot</guimenuitem></menuchoice>.
+A <guilabel>Save 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. To save the screenshot
+to the desktop, select the <guilabel>Save screenshot to desktop</guilabel>
+option. </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
@@ -511,46 +501,47 @@ command as follows: </para>
               <colspec colname="colspec1" colwidth="64.33*"/>
               <thead>
                 <row rowsep="1">
-                  <entry valign="top">
+                  <entry>
                     <para>Option</para>
                   </entry>
-                  <entry valign="top">
+                  <entry>
                     <para>Function</para>
                   </entry>
                 </row>
               </thead>
               <tbody>
                 <row>
-                  <entry colname="colspec0">
+                  <entry colname="colspec0" valign="top">
                     <para>
                       <command>--window</command>
                     </para>
                   </entry>
-                  <entry colname="colspec1">
-                    <para>Takes a screenshot of the window that has
-focus, and displays the <guilabel>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel> dialog to save the screenshot.</para>
+                  <entry colname="colspec1" valign="top">
+                    <para>Takes a screenshot of the window
+that has focus, and displays the <guilabel>Save Screenshot</guilabel> dialog.
+Use the <guilabel>Save Screenshot</guilabel> dialog to save the screenshot.</para>
                   </entry>
                 </row>
                 <row>
-                  <entry colname="colspec0">
+                  <entry colname="colspec0" valign="top">
                     <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>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel>
+                  <entry colname="colspec1" valign="top">
+                    <para>Takes a screenshot after the specified number of seconds, and displays the <guilabel>Save Screenshot</guilabel> dialog. Use the <guilabel>Save Screenshot</guilabel>
 dialog to save the screenshot.</para>
                   </entry>
                 </row>
                 <row>
-                  <entry colname="colspec0">
+                  <entry colname="colspec0" valign="top">
                     <para>
                       <command>--help</command>
                     </para>
                   </entry>
-                  <entry colname="colspec1">
-                    <para>Displays the options for the command.</para>
+                  <entry colname="colspec1" valign="top">
+                    <para>Displays the options for the
+command.</para>
                   </entry>
                 </row>
               </tbody>
@@ -572,22 +563,10 @@ Menu</see>
       <primary>Main Menu</primary>
       <secondary>introduction</secondary>
     </indexterm>
-    <screenshot>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/open_main_menu.png" format="PNG"/>
-        </imageobject>
-        <textobject>
-          <phrase>Open Main Menu. Menu items: Applications, Run Application, Search for Files, Open Recent, Take Screenshot, Lock Screen, Log Out.</phrase>
-        </textobject>
-      </mediaobject>
-    </screenshot>
-    <para>The <guimenu>Main Menu</guimenu> provides access to the <guimenu>Applications</guimenu> menu and the many of the items in the <guimenu>Actions</guimenu>
-menu. You can access almost all of the standard applications, commands, and
-configuration options from the <guimenu>Main Menu</guimenu>. </para>
-    <para>You can add <guimenu>Main Menu</guimenu> buttons to your panels. By
-default, the <guimenu>Main Menu</guimenu> is represented on panels by a stylized
-footprint icon, as illustrated in the graphic above.</para>
+    <para>The <guimenu>Main Menu</guimenu> provides access to
+the <guimenu>Applications</guimenu> menu and many of the items in the <guimenu>Actions</guimenu> menu. You can access almost all of the standard applications,
+commands, and configuration options from the <guimenu>Main Menu</guimenu>. </para>
+    <para>You can add <guimenu>Main Menu</guimenu> buttons to your panels.</para>
     <sect2 id="goseditmainmenu-15">
       <title>To Open the Main Menu</title>
       <indexterm>
@@ -604,8 +583,8 @@ footprint icon, as illustrated in the graphic above.</para>
           <para>Use shortcut keys</para>
           <para>You can use shortcut keys to open the <guimenu>Main Menu</guimenu>.
 When you use shortcut keys to open the <guimenu>Main Menu</guimenu>, the <guimenu>Main Menu</guimenu> appears at the mouse pointer. </para>
-          <para>The default shortcut keys to open the <guimenu>Main Menu</guimenu> are <keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>. To change the shortcut keys that open
-the <guimenu>Main Menu</guimenu>, use the <application>Keyboard Shortcuts</application> preference tool.</para>
+          <para>The default shortcut keys to open the <guimenu>Main Menu</guimenu> are <keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>. To change the shortcut keys that
+open the <guimenu>Main Menu</guimenu>, use the <application>Keyboard Shortcuts</application> preference tool.</para>
         </listitem>
       </itemizedlist>
     </sect2>
@@ -671,7 +650,7 @@ to a panel, right-click on any vacant space on the panel. Choose <menuchoice><gu
         <para><guimenu>Desktop Preferences</guimenu> menu</para>
       </listitem>
     </itemizedlist>
-    <para>You use the following desktop environment components to customize menus:</para>
+    <para>You use the following GNOME Desktop components to customize menus:</para>
     <itemizedlist>
       <listitem>
         <para>Menus on panels</para>
@@ -682,10 +661,53 @@ to a panel, right-click on any vacant space on the panel. Choose <menuchoice><gu
     </itemizedlist>
     <para>When you use panels to customize your menus, you use the menu item popup
 menu. For more information, see <xref linkend="goseditmainmenu-11"/>.</para>
-    <para>When you use the file manager to customize your menus, you must access
-the <guimenu>Applications</guimenu> menu or the <guimenu>Desktop Preferences</guimenu> menu from within the file manager. To access the <guimenu>Applications</guimenu> menu or the <guimenu>Desktop Preferences</guimenu> menu, open a
-file manager window. Choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Start Here</guimenuitem></menuchoice>. Double-click on the <guilabel>Applications</guilabel> object or on the <guilabel>Desktop Preferences</guilabel> object.
-For more information on the file manager, see <citetitle>Nautilus File Manager</citetitle>.</para>
+    <para>When you use the file manager to customize your menus, you must access the <guimenu>Applications</guimenu> menu or the <guimenu>Desktop Preferences</guimenu>
+menu from within the file manager. To access the <guimenu>Applications</guimenu>
+menu or the <guimenu>Desktop Preferences</guimenu> menu, open a file manager
+window. </para>
+    <para>To access menus
+in the file browser manager, enter one of the following URIs in the field
+on the location bar:</para>
+    <informaltable frame="topbot">
+      <tgroup cols="2" colsep="0" rowsep="0">
+        <colspec colwidth="50*"/>
+        <colspec colwidth="50*"/>
+        <thead>
+          <row rowsep="1">
+            <entry>
+              <para>Menu</para>
+            </entry>
+            <entry>
+              <para>Enter this URI</para>
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry valign="top">
+              <para><guimenu>Applications</guimenu> menu</para>
+            </entry>
+            <entry valign="top">
+              <para>
+                <command>applications:///</command>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry valign="top">
+              <para><guimenu>Desktop Preferences</guimenu> menu</para>
+            </entry>
+            <entry valign="top">
+              <para>
+                <command>preferences:///</command>
+              </para>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+    <para>To access menus in the file object manager, double-click on the <guilabel>Start Here</guilabel> object on the desktop. The contents of the <guilabel>Start Here</guilabel> location are displayed in a file object manager window.</para>
+    <para>For more information on the file manager, see <citetitle>Nautilus File Manager</citetitle>.</para>
     <sect2 id="goseditmainmenu-61">
       <title>To Add a Menu</title>
       <indexterm>
@@ -696,12 +718,12 @@ For more information on the file manager, see <citetitle>Nautilus File Manager</
       <orderedlist>
         <listitem>
           <para>In a file manager window, access the location where you want
-to add the menu. For example, to add a menu to the <guimenu>Applications</guimenu>
-menu, choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Start Here</guimenuitem></menuchoice>, then double-click on the <guilabel>Applications</guilabel> object.</para>
+to add the menu. For example, if you want to add a menu to the <guimenu>Applications</guimenu> menu, enter <command>applications:///</command> in the field on
+the location bar from a file browser manager window.</para>
         </listitem>
         <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>New Folder</guimenuitem></menuchoice>. An untitled folder is added to the
-view pane. The name of the folder is selected.</para>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Create Folder</guimenuitem></menuchoice>. An untitled folder
+is added to the view pane. The name of the folder is selected.</para>
         </listitem>
         <listitem>
           <para>Type a name for the folder, then press <keycap>Return</keycap>. </para>
@@ -739,17 +761,12 @@ Launcher</guilabel> dialog. For more information on the elements in the <guilabe
       <para>To add a launcher to an empty menu, perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>Open a file manager window, then choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Start Here</guimenuitem></menuchoice>. Alternatively,
-double-click on the <guilabel>Start Here</guilabel> object on the desktop.
-The <guilabel>Start Here</guilabel> location is displayed. </para>
-        </listitem>
-        <listitem>
-          <para>In the file manager window, double-click on the object that
-represents the menu to which you want to add the launcher. </para>
+          <para>In a file manager window, access the menu where you want to
+add the launcher. </para>
         </listitem>
         <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>New Launcher</guimenuitem></menuchoice>. A <guilabel>Create Launcher</guilabel>
-dialog is displayed.</para>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Create Launcher</guimenuitem></menuchoice>. A <guilabel>Create
+Launcher</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
           <para>Enter the properties of the launcher in the <guilabel>Create
@@ -771,7 +788,8 @@ steps:</para>
       <orderedlist>
         <listitem>
           <para>In a file manager window, access the location from which you
-want to copy the launcher. For example, to copy a launcher from the <guimenu>Applications</guimenu> menu, choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Start Here</guimenuitem></menuchoice>, then double-click on the <guilabel>Applications</guilabel> object.</para>
+want to copy the launcher.  For example, if you want to copy a launcher from
+the <guimenu>Applications</guimenu> menu, enter <command>applications:///</command> in the field on the location bar from a file browser manager window.</para>
         </listitem>
         <listitem>
           <para>Select the launcher that you want to copy, then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy File</guimenuitem></menuchoice>.</para>
diff --git a/gnome2-user-guide/C/gosmetacity.xml b/gnome2-user-guide/C/gosmetacity.xml
index fb13a3c..b16be8d 100644
--- a/gnome2-user-guide/C/gosmetacity.xml
+++ b/gnome2-user-guide/C/gosmetacity.xml
@@ -2,8 +2,8 @@
   <title>Working With Windows</title>
   <highlights>
     <para>The information in this chapter describes how to use windows
-in the desktop environment. You can use several types of window manager with
-the GNOME Desktop, for example, <application>Metacity</application> and <application>Sawfish</application>.  Many of the functions in <application>Metacity</application>
+in the GNOME Desktop. You can use several types of window manager with the
+GNOME Desktop, for example, <application>Metacity</application> and <application>Sawfish</application>.  Many of the functions in <application>Metacity</application>
 are also available in <application>Sawfish</application>. This chapter describes
 the functions that are associated with the <application>Metacity</application>
 window manager.</para>
@@ -18,14 +18,13 @@ window manager.</para>
       <primary>workspaces</primary>
       <secondary>introduction</secondary>
     </indexterm>
-    <para>You can display many windows at the same time in your desktop
-environment. Your windows are displayed in subdivisions of your desktop environment
-that are called workspaces. A workspace is a discrete area in which you can
-work. Every workspace in your desktop environment contains the same desktop,
-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 in your desktop environment but you can have windows open in other
-workspaces.  </para>
+    <para>You can display many windows at the same time in the GNOME
+Desktop. Your windows are displayed in subdivisions of the GNOME Desktop that
+are called workspaces. A workspace is a discrete area in which you can work.
+Every workspace contains the same desktop, 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, but you can
+have windows open in other workspaces.  </para>
     <para>The <application>Workspace Switcher</application> applet displays a
 visual representation of your windows and workspaces, as show in <xref linkend="gosmetacity-FIG-717"/>.</para>
     <figure id="gosmetacity-FIG-717">
@@ -41,10 +40,10 @@ visual representation of your windows and workspaces, as show in <xref linkend="
         </mediaobject>
       </screenshot>
     </figure>
-    <para>You can add workspaces at any time. To add workspaces to your desktop
-environment, 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>
+    <para>You can add workspaces at any time. To add workspaces to the GNOME 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>
@@ -55,8 +54,10 @@ you require.</para>
 The window manager manages where your windows are located, and which window
 has focus. The window frame contains buttons that enable you to perform standard
 actions such as moving, closing, and resizing windows.</para>
-      <para>You can configure some window manager settings in the <application>Windows</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>Windows</application> preference tool.</para>
+      <para>You can set some window manager preferences in the <application>Windows</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>Windows</application> preference tool.</para>
+<!--Is this preference tool called Window Beahvior in the community?-->
     </sect2>
   </sect1>
   <sect1 id="gosmetacity-713">
@@ -65,7 +66,7 @@ that are associated with the default configuration of the <application>Metacity<
       <primary>windows</primary>
       <secondary>types of</secondary>
     </indexterm>
-    <para>The desktop environment features the following types of windows: </para>
+    <para>The GNOME Desktop features the following types of windows: </para>
     <itemizedlist>
       <listitem>
         <para>Application windows </para>
@@ -135,7 +136,7 @@ window.</para>
           <secondary>themes</secondary>
         </indexterm>
         <para>You can apply several themes to your window frames. The theme determines
-how the frame looks. To choose a theme for all your window frames, choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guimenuitem>Theme</guimenuitem></menuchoice>. </para>
+how the frame looks. To choose a theme for all your window frames, use the <application>Theme</application> preference tool. </para>
       </sect3>
       <sect3 id="gosmetacity-17">
         <title>Control Elements</title>
@@ -165,10 +166,10 @@ frames, from left to right.</para>
             <colspec colname="colspec1" colwidth="58.35*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Control Element</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description </para>
                 </entry>
               </row>
@@ -290,16 +291,6 @@ with</secondary>
 that you can use to work with windows and workspaces.</para>
     <sect2 id="gosmetacity-24">
       <title>Window Menu</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/window_menu.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Window Menu. Menu items: Minimize, Maximize, Shade, Move, Resize, Close, Put on All Workspaces, Move to workspace-name.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
       <indexterm>
         <primary>windows</primary>
         <secondary>Window Menu</secondary>
@@ -308,9 +299,8 @@ that you can use to work with windows and workspaces.</para>
         <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>
+      <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>
       <itemizedlist>
         <listitem>
           <para>Click on the <guibutton>Window Menu</guibutton> button on
@@ -333,11 +323,11 @@ in the <guimenu>Window Menu</guimenu>.</para>
           <colspec colname="colspec3" colwidth="67.66*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Menu Item</para>
               </entry>
-              <entry valign="top">
-                <para>Function </para>
+              <entry>
+                <para>Function</para>
               </entry>
             </row>
           </thead>
@@ -362,14 +352,14 @@ the window. If the window is already maximized, choose <guimenuitem>Unmaximize</
               </entry>
             </row>
             <row>
-              <entry valign="top">
-                <para><guimenuitem>Roll Up</guimenuitem> or <guimenuitem>Unroll</guimenuitem></para>
+              <entry colname="colspec2">
+                <para>
+                  <guimenuitem>On Top</guimenuitem>
+                </para>
               </entry>
-              <entry valign="top">
-                <para>Reduces a window
-so that only the titlebar is visible. If the window is already rolled up,
-choose <guimenuitem>Unroll</guimenuitem> to restore the window to its previous
-size. </para>
+              <entry colname="colspec3">
+                <para>Places
+the window above any other open windows on the desktop.</para>
               </entry>
             </row>
             <row>
@@ -416,13 +406,28 @@ only.</para>
               </entry>
             </row>
             <row>
-              <entry colname="colspec2" valign="top">
-                <para><guimenuitem>Move to <replaceable>workspace-name</replaceable></guimenuitem> or <guimenuitem>Only on <replaceable>workspace-name</replaceable></guimenuitem></para>
+              <entry colname="colspec2">
+                <para><guimenuitem>Move
+to Workspace Right</guimenuitem>  or <guimenuitem>Move to Workspace Left</guimenuitem></para>
               </entry>
-              <entry colname="colspec3" valign="top">
-                <para>Moves the window to the workspace that you choose.  If
-the window is on all of your workspaces, choose <guimenuitem>Only on <replaceable>workspace-name</replaceable></guimenuitem> to put the window on the workspace
-that you want.</para>
+              <entry colname="colspec3">
+                <para>Move the window to the
+workspace to the right of the current workspace. If the window is already
+on the workspace to the right of your workspace, choose <guimenuitem>Move
+to Workspace Left</guimenuitem> to move the window to the workspace to the
+left of the current workspace.</para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec2">
+                <para>
+                  <guimenuitem>Move
+to Another Workspace</guimenuitem>
+                </para>
+              </entry>
+              <entry colname="colspec3">
+                <para>Moves the window to another workspace. Select the workspace you want from
+the following:<itemizedlist><listitem><para><guimenuitem>Workspace 1</guimenuitem></para></listitem><listitem><para><guimenuitem>Workspace 2</guimenuitem></para></listitem><listitem><para><guimenuitem>Workspace 3</guimenuitem></para></listitem><listitem><para><guimenuitem>Workspace 4</guimenuitem></para></listitem></itemizedlist>.</para>
               </entry>
             </row>
           </tbody>
@@ -523,13 +528,13 @@ The examples in <xref linkend="gosmetacity-TBL-3"/> refer to <xref linkend="gosm
           <colspec colname="colspec2" colwidth="33*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>State</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Indicates</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Example</para>
               </entry>
             </row>
@@ -670,36 +675,33 @@ of rows in which your workspaces are displayed in <application>Workspace Switche
 display the names of your workspaces in the applet.</para>
     </sect2>
     <sect2 id="gosmetacity-27">
-      <title>Using the Top Edge Panel to Work With Windows</title>
+      <title>Window Selector Applet</title>
       <indexterm>
         <primary>top edge panel</primary>
-        <secondary>window list icon</secondary>
+        <secondary>window selector icon</secondary>
       </indexterm>
       <indexterm>
-        <primary>window lists</primary>
-        <secondary>top edge
-panel</secondary>
+        <primary>window selector</primary>
+        <secondary>top edge panel</secondary>
       </indexterm>
-      <para>From the top edge panel, you can view a
-list of all windows that are currently open. You can also choose a window
-to give focus to. To view the window list, click on the icon at the extreme
-right of the top edge panel. The following figure shows an example of the
-window list that is displayed from the top edge panel:</para>
+      <para>You can view a list of all windows
+that are currently open. You can also choose a window to give focus to. To
+view the window list, click on the <application>Window Selector</application>
+applet. The following figure shows an example of the <application>Window Selector</application> applet:</para>
       <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/openwindows_menu.png" format="PNG"/>
           </imageobject>
           <textobject>
-            <phrase>Window list displayed from top edge panel.</phrase>
+            <phrase>Window selector applet displayed from the top edge panel.</phrase>
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>When the focus changes, the icon that you click on to display the window
-list changes. The icon represents the window that currently has focus. To
-give focus to a window, choose that window from the window list.</para>
-      <para>The window list lists the windows in all workspaces. The windows in
-all workspaces other than the current workspace, are listed under a separator
+      <para>To give focus to a window, choose that window from the window selector
+applet.</para>
+      <para>The window selector lists the windows in all workspaces. The windows
+in all workspaces other than the current workspace, are listed under a separator
 line.</para>
     </sect2>
   </sect1>
@@ -729,10 +731,10 @@ different appearance than other windows. </para>
           <colspec colname="colspec1" colwidth="66.38*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Element</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Action</para>
               </entry>
             </row>
@@ -783,9 +785,9 @@ focus to the window. </para>
                 <para>Top edge panel</para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Click on the icon at the extreme
-right of the top edge panel. A list of your open windows is displayed. Choose
-the window from the list.</para>
+                <para>Click on the button that represents
+the <application>Window Selector</application> applet. A list of your open
+windows is displayed. Choose the window from the list.</para>
               </entry>
             </row>
           </tbody>
@@ -872,6 +874,20 @@ window frame.</para>
       <para>To restore a minimized window, click on the button that represents the
 window in <application>Window List</application>.</para>
     </sect2>
+    <sect2 id="gosmetacity-2">
+      <title>To Place A Window on Top of Other Windows</title>
+      <para>To place a window on top of other windows, perform one of the following
+actions: </para>
+      <itemizedlist>
+        <listitem>
+          <para>From the file browser window, open the <guimenu>Window Menu</guimenu>, then choose <guimenuitem>On Top</guimenuitem>.</para>
+        </listitem>
+        <listitem>
+          <para>Right-click on the button that represents the window in <application>Window List</application>, then choose <guimenuitem>On Top</guimenuitem> from
+the <guimenu>Window Menu</guimenu>.</para>
+        </listitem>
+      </itemizedlist>
+    </sect2>
     <sect2 id="gosmetacity-32">
       <title>To Close a Window</title>
       <indexterm>
@@ -1006,10 +1022,9 @@ rolled-up state so that the full window is displayed.</para>
       <itemizedlist>
         <listitem>
           <para>Double-click on the titlebar of the window. To roll down the
-window, double-click on the titlebar again.</para>
-        </listitem>
-        <listitem>
-          <para>Open the <guimenu>Window Menu</guimenu>. Choose <guimenuitem>Roll Up</guimenuitem>. To roll down the window, choose <guimenuitem>Unroll</guimenuitem>.</para>
+window, double-click on the titlebar again. You must select <guilabel>Roll
+up</guilabel> in the <guilabel>Window Preferences</guilabel> dialog to perform
+this action.</para>
         </listitem>
         <listitem>
           <para>Right-click on the button that represents the window in <application>Window List</application>, then choose <guimenuitem>Roll Up</guimenuitem>
@@ -1047,7 +1062,7 @@ window to the workspace you require.</para>
         <listitem>
           <para>Use the <guimenu>Window Menu</guimenu></para>
           <para>Open the <guimenu>Window Menu</guimenu>. To move the window to the next
-workspace choose <guimenuitem>Move to <replaceable>workspace-name</replaceable></guimenuitem>.</para>
+workspace choose <guimenuitem>Move to Workspace Right</guimenuitem> or <guimenuitem>Move to Another Workspace <replaceable>workspace-name</replaceable></guimenuitem>.</para>
         </listitem>
       </itemizedlist>
     </sect2>
@@ -1121,7 +1136,7 @@ left. </para>
         <primary>workspaces</primary>
         <secondary>adding</secondary>
       </indexterm>
-      <para>To add workspaces to your desktop environment, right-click on <application>Workspace Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>.
+      <para>To add workspaces to the GNOME Desktop, right-click on <application>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>
@@ -1136,8 +1151,9 @@ adds new workspaces at the end of the workspace list.</para>
       <para>The default names of your workspaces are <literal>Workspace 1</literal>, <literal>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>
+Switcher Preferences</guilabel> dialog is displayed. Use the <guilabel>Workspaces
+names</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>
@@ -1147,7 +1163,7 @@ then type the new name for the workspace.</para>
       </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 environment, right-click on <application>Workspace Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>.
+      <para>To delete workspaces from the GNOME Desktop, right-click on <application>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>
diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index edb6d36..397b6ab 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -11,9 +11,26 @@
     </indexterm>
     <para>The <application>Nautilus</application> file manager provides
 an integrated access point to your files and applications. The file manager
-enables you to do the following:</para>
+enables you to browse and to navigate your files and folders using the following:</para>
     <itemizedlist>
       <listitem>
+        <para>File browser window</para>
+        <para>The file browser window enables you to navigate between folders by changing
+the current location of the file manager within a file browser window.</para>
+      </listitem>
+      <listitem>
+        <para>File object window</para>
+        <para>The file object window represents every folder as an object, and each
+object is represented by a separate file object window. Each file object window
+displays the contents of a single file, folder, FTP site, or special URI location.</para>
+      </listitem>
+    </itemizedlist>
+    <para>Both the file browser and file object windows of the <application>Nautilus</application> file manager enables you to do the following:</para>
+    <itemizedlist>
+      <listitem>
+        <para>Create folders and documents.</para>
+      </listitem>
+      <listitem>
         <para>Display your files and folders.</para>
       </listitem>
       <listitem>
@@ -35,188 +52,186 @@ enables you to do the following:</para>
     <para><application>Nautilus</application> also manages the desktop. The desktop
 lies behind all of the other components on your visible desktop. The desktop
 is an active component of the user interface. </para>
-    <para>File manager windows enable you to display and manage your files and
-folders. You can open a file manager window in any of the following ways:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Double-click on the <guilabel>Home</guilabel> object on the
-desktop. </para>
-      </listitem>
-      <listitem>
-        <para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Home Folder</guimenuitem></menuchoice>.</para>
-      </listitem>
-      <listitem>
-        <para>Right-click on the desktop to open the <guimenu>Desktop</guimenu>
-menu. Choose <guimenuitem>New Window</guimenuitem>.</para>
-      </listitem>
-    </itemizedlist>
-    <para>The file manager window displays the contents of your home location
-in the view pane.</para>
   </sect1>
   <sect1 id="gosnautilus-210">
-    <title>File Manager Windows</title>
+    <title>Browsing Your Files</title>
     <indexterm>
       <primary>file manager</primary>
       <secondary>windows</secondary>
     </indexterm>
-    <para>File manager windows enable you to display and manage your files and
-folders. <xref linkend="gosnautilus-FIG-1"/> shows a file manager window that
-displays the contents of a folder.</para>
-    <figure id="gosnautilus-FIG-1">
-      <title>Contents of a Folder in a File Manager Window<indexterm><primary>file
-manager</primary><secondary>icon view</secondary><tertiary>illustration</tertiary></indexterm></title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/naut_iconview_anno_window.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>A folder in a file manager window. Callouts: Menubar, toolbar, location bar, zoom buttons,  side pane, view pane.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-    </figure>
-    <para><xref linkend="gosnautilus-TBL-83"/> describes the components of file
-manager windows.</para>
-    <table frame="topbot" id="gosnautilus-TBL-83">
-      <title>File Manager Window Components</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="29.39*"/>
-        <colspec colname="colspec1" colwidth="70.61*"/>
-        <thead>
-          <row rowsep="1">
-            <entry valign="top">
-              <para>Component</para>
-            </entry>
-            <entry valign="top">
-              <para>Description </para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry valign="top">
-              <para>Menubar</para>
-            </entry>
-            <entry valign="top">
-              <para>Contains menus that you use to perform tasks in the file manager.</para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>Toolbar</para>
-            </entry>
-            <entry valign="top">
-              <para>Contains buttons that you use to perform tasks in the file manager.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>Location bar</para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Contains the following elements:</para>
-              <itemizedlist>
-                <listitem>
-                  <para><guilabel>Location</guilabel> field or <guilabel>Go To</guilabel>
-field: Enables you to specify a file, folder, or URI that you want to view.</para>
-                </listitem>
-                <listitem>
-                  <para><guimenu>Zoom</guimenu> buttons: Enable you to change the
+    <para>You can browse your file system and navigate between directories by
+changing the current location of the file manager. </para>
+    <sect2 id="gosnautilus-492">
+      <title>File Browser Windows</title>
+      <para>You can access your file browser window in any of the following ways:<itemizedlist><listitem><para>Double-click on the <guilabel>Browse Filesystem</guilabel>
+icon on the top edge panel. </para></listitem><listitem><para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Browse Filesystem</guimenuitem></menuchoice>. </para></listitem><listitem><para>Select a folder from a file object window, then choose <menuchoice><guimenu>File</guimenu><guimenuitem>Browse Folder</guimenuitem></menuchoice>.
+The file browser window displays the contents of your folder in the view pane.</para></listitem></itemizedlist><xref linkend="gosnautilus-FIG-505"/> shows a sample file browser
+window that displays the contents of the Home folder.</para>
+      <figure id="gosnautilus-FIG-505">
+        <title>Contents of a Folder in a File Browser Window</title>
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/naut_browser_window.png" format="PNG"/>
+            </imageobject>
+            <textobject>
+              <phrase> A folder in a file browser window.</phrase>
+            </textobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+    </sect2>
+    <sect2 id="gosnautilus-493">
+      <title>Browser Window Components</title>
+      <para><xref linkend="gosnautilus-TBL-83"/> describes the components of file
+browser windows.</para>
+      <table frame="topbot" id="gosnautilus-TBL-83">
+        <title>File Browser Window Components</title>
+        <tgroup cols="2" colsep="0" rowsep="0">
+          <colspec colname="colspec0" colwidth="29.39*"/>
+          <colspec colname="colspec1" colwidth="70.61*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>Component</para>
+              </entry>
+              <entry>
+                <para>Description </para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry valign="top">
+                <para>Menubar</para>
+              </entry>
+              <entry valign="top">
+                <para>Contains menus that you use to perform tasks in the file manager.</para>
+              </entry>
+            </row>
+            <row>
+              <entry valign="top">
+                <para>Toolbar</para>
+              </entry>
+              <entry valign="top">
+                <para>Contains buttons that you use to perform tasks in the file manager.</para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>Location bar</para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Contains the following elements:</para>
+                <itemizedlist>
+                  <listitem>
+                    <para><guilabel>Location</guilabel> field: Enables you to specify
+a file, folder, or URI that you want to view.</para>
+                  </listitem>
+                  <listitem>
+                    <para><guimenu>Zoom</guimenu> buttons: Enable you to change the
 size of items in the view pane.</para>
-                </listitem>
-                <listitem>
-                  <para><guilabel>View as</guilabel> drop-down list: Enables you to
+                  </listitem>
+                  <listitem>
+                    <para><guilabel>View as</guilabel> drop-down list: Enables you to
 choose how to show 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>Shows information about the current file or folder. </para>
-                </listitem>
-                <listitem>
-                  <para>Enables you to navigate through your files. </para>
-                </listitem>
-              </itemizedlist>
-              <para>The side pane contains a drop-down list that enables
+                  </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>Shows information about the current file or folder. </para>
+                  </listitem>
+                  <listitem>
+                    <para>Enables you to navigate through your files. </para>
+                  </listitem>
+                </itemizedlist>
+                <para>The side pane contains a drop-down list that enables
 you to choose what to show in the side pane. You can choose from the following
 options:</para>
-              <itemizedlist>
-                <listitem>
-                  <para>
-                    <guilabel>Information</guilabel>
-                  </para>
-                </listitem>
-                <listitem>
-                  <para>
-                    <guilabel>Emblems</guilabel>
-                  </para>
-                </listitem>
-                <listitem>
-                  <para>
-                    <guilabel>History</guilabel>
-                  </para>
-                </listitem>
-                <listitem>
-                  <para>
-                    <guilabel>Notes</guilabel>
-                  </para>
-                </listitem>
-                <listitem>
-                  <para>
-                    <guilabel>Tree</guilabel>
-                  </para>
-                </listitem>
-              </itemizedlist>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para>View pane</para>
-            </entry>
-            <entry valign="top">
-              <para>Shows the contents of the following:</para>
-              <itemizedlist>
-                <listitem>
-                  <para>Particular types of files</para>
-                </listitem>
-                <listitem>
-                  <para>Folders</para>
-                </listitem>
-                <listitem>
-                  <para>FTP sites</para>
-                </listitem>
-                <listitem>
-                  <para>Locations that correspond to special URIs</para>
-                </listitem>
-              </itemizedlist>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>Statusbar</para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Displays status information.</para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <para>You can also open a popup menu from file manager windows. To open this
+                <itemizedlist>
+                  <listitem>
+                    <para>
+                      <guilabel>Information</guilabel>
+                    </para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>Emblems</guilabel>
+                    </para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>History</guilabel>
+                    </para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>Notes</guilabel>
+                    </para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guilabel>Tree</guilabel>
+                    </para>
+                  </listitem>
+                </itemizedlist>
+                <para>To display the side pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Side Pane</guimenuitem></menuchoice>.</para>
+              </entry>
+            </row>
+            <row>
+              <entry valign="top">
+                <para>View pane</para>
+              </entry>
+              <entry valign="top">
+                <para>Shows the contents of the following:</para>
+                <itemizedlist>
+                  <listitem>
+                    <para>Particular types of files</para>
+                  </listitem>
+                  <listitem>
+                    <para>Folders</para>
+                  </listitem>
+                  <listitem>
+                    <para>FTP sites</para>
+                  </listitem>
+                  <listitem>
+                    <para>Locations that correspond to special URIs</para>
+                  </listitem>
+                </itemizedlist>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>Statusbar</para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Displays status information.</para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+      <para>You can access files and folders from the file browser window in the
+following ways:<itemizedlist><listitem><para>Enter a directory path in the <guilabel>Location</guilabel>
+field.</para></listitem><listitem><para>Click on an item in the tree view.</para></listitem><listitem><para>Double-click on a folder or a file in the view pane. </para></listitem></itemizedlist></para>
+      <para>You can also open a popup menu from file manager windows. To open this
 popup menu right-click in a file manager window. The items in this menu depend
 on where you right-click. For example, when you right-click on a file or folder,
 you can choose items related to the file or folder. When you right-click on
 the background of a view pane, you can choose items related to the display
 of items in the view pane.</para>
+      <note>
+        <para>In other distributions of the GNOME Desktop, the <guibutton>Home</guibutton> toolbar button might have another designation, for example, <guibutton>Documents</guibutton>.</para>
+      </note>
+    </sect2>
     <sect2 id="gosnautilus-53">
       <title>View Pane</title>
       <indexterm>
@@ -245,23 +260,9 @@ of the following:</para>
         </listitem>
       </itemizedlist>
       <para><indexterm><primary>viewer components</primary></indexterm>The file
-manager contains <firstterm>viewer components</firstterm> that enable you
-to display particular types of file in the view pane. For example,  you can
-use a text viewer to display text files in the view pane. <xref linkend="gosnautilus-FIG-477"/>
-shows a text file displayed in the view pane.</para>
-      <figure id="gosnautilus-FIG-477">
-        <title>Text File in a File Manager Window</title>
-        <screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/naut_viewpane_text_window.png" format="PNG"/>
-            </imageobject>
-            <textobject>
-              <phrase>File manager window with text file in view pane. Side pane contains: file icon, file information, file emblem, Open with gedit, Open with buttons.</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
+browser window contains <firstterm>viewer components</firstterm> that enable
+you to display particular types of file in the view pane. For example,  you
+can use a text viewer to display text files in the view pane.</para>
       <para>Displaying a file in the view pane provides the following benefits:</para>
       <itemizedlist>
         <listitem>
@@ -272,7 +273,7 @@ shows a text file displayed in the view pane.</para>
         </listitem>
       </itemizedlist>
       <para>However, you cannot edit a file in the view pane.</para>
-      <para>The file manager also includes <firstterm>views</firstterm> that enable
+      <para>The file browser also includes <firstterm>views</firstterm> that enable
 you to display the contents of your folders in different ways. For example,
 you can display the contents of a folder in the following types of view: </para>
       <itemizedlist>
@@ -344,230 +345,36 @@ use the <guilabel>Tree</guilabel> to navigate through your files.</para>
       <para>To close the side pane, click on the <guibutton>X</guibutton> button
 at the top right of the side pane.</para>
     </sect2>
-    <sect2 id="gosnautilus-550">
-      <title>Icons and Emblems</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>icons</secondary>
-        <tertiary>introduction</tertiary>
-      </indexterm>
+    <sect2 id="gosnautilus-18">
+      <title>To Show and Hide Browser Window Components</title>
       <indexterm>
         <primary>file manager</primary>
-        <secondary>emblems</secondary>
-        <see>emblems</see>
-      </indexterm>
-      <indexterm>
-        <primary>emblems</primary>
-        <secondary>introduction</secondary>
+        <secondary>window components, showing
+and hiding</secondary>
       </indexterm>
-      <para>In icon
-view, the file manager displays your files and folders as icons. You can add
-emblems to your file icons and folder icons. An emblem is a small icon that
-you can add to an item to visually mark the item. For example, to mark a file
-as important, you can add an <guilabel>Important</guilabel> emblem to the
-file icon to create the following visual effect: </para>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/naut_sampleemblem_icon.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>File icon with Important emblem.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-      <para>For more information on how to add an emblem to an icon, see <xref linkend="gosnautilus-112"/>.</para>
-      <para>The following table describes the structure of the file icon:</para>
-      <informaltable frame="topbot">
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="35.09*"/>
-          <colspec colname="colspec1" colwidth="64.91*"/>
-          <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>Component</para>
-              </entry>
-              <entry valign="top">
-                <para>Description</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/naut_sampleemblem1_icon.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Important emblem.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Emblem. This emblem is the <guilabel>Important</guilabel> emblem.</para>
-              </entry>
-            </row>
-            <row>
-              <entry valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/naut_sampleemblem2_icon.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Text file icon.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-              <entry valign="top">
-                <para>Icon that represents the file.
-This icon mioght contain a preview of the contents of the file.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/naut_sampleemblem3_icon.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Icon caption.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Icon caption. You can modify what items of information are displayed in the
-icon caption.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-      <para>The file manager includes default emblems for the following types of
-item:</para>
+      <para>You can show and hide file browser
+window components as follows: </para>
       <itemizedlist>
         <listitem>
-          <para>Symbolic links</para>
+          <para>To hide the side pane, choose <menuchoice><guimenu>View</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>Items for which you have the following permissions:<indexterm><primary>permissions</primary><secondary>and emblems</secondary></indexterm></para>
-          <itemizedlist>
-            <listitem>
-              <para>Read permission only </para>
-            </listitem>
-            <listitem>
-              <para>No read permission and no write permission</para>
-            </listitem>
-          </itemizedlist>
+          <para>To hide the toolbar, choose <menuchoice><guimenu>View</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>Location Bar</guimenuitem></menuchoice>. To display
+the location bar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Location Bar</guimenuitem></menuchoice> again.</para>
+        </listitem>
+        <listitem>
+          <para>To hide the statusbar, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Statusbar</guimenuitem></menuchoice>. To display the
+statusbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Statusbar</guimenuitem></menuchoice> again. </para>
         </listitem>
       </itemizedlist>
-      <para>The following table shows the default emblems:</para>
-      <informaltable frame="topbot">
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="35.09*"/>
-          <colspec colname="colspec1" colwidth="64.91*"/>
-          <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>Default Emblem</para>
-              </entry>
-              <entry valign="top">
-                <para>Description</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/naut_link_emblem.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Symbolic link emblem.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para><indexterm><primary>symbolic links</primary><secondary>and emblems</secondary></indexterm>Symbolic
-link</para>
-              </entry>
-            </row>
-            <row>
-              <entry valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/naut_nowrite_emblem.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Read permission only emblem.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-              <entry valign="top">
-                <para>Read permission only</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/naut_noread_emblem.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>No read permission and no write permission emblem.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>No read permission and no write permission</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
     </sect2>
-  </sect1>
-  <sect1 id="gosnautilus-24">
-    <title>Navigating Your Computer</title>
-    <indexterm>
-      <primary>file manager</primary>
-      <secondary>navigating</secondary>
-    </indexterm>
-    <para>Each file manager window displays the contents of a single
-file, folder, FTP site, or special URI location. This section describes the
-following:</para>
-    <itemizedlist>
-      <listitem>
-        <para>How to display items in file manager windows.</para>
-      </listitem>
-      <listitem>
-        <para>How to open files from file manager windows.</para>
-      </listitem>
-      <listitem>
-        <para>How to navigate the files and folders in your file system.</para>
-      </listitem>
-      <listitem>
-        <para>How to navigate to FTP sites.</para>
-      </listitem>
-      <listitem>
-        <para>How to access special URI locations.</para>
-      </listitem>
-    </itemizedlist>
-    <sect2 id="gosnautilus-4">
-      <title>To Display Your Home Location</title>
+    <sect2 id="gosnautilus-499">
+      <title>To Display Your Home Folder</title>
       <screenshot>
         <mediaobject>
           <imageobject>
@@ -588,31 +395,24 @@ following:</para>
         <secondary>displaying</secondary>
       </indexterm>
       <para>To display your home location,
-perform one of the following actions: </para>
+perform one of the following actions from the file browser window:</para>
       <itemizedlist>
         <listitem>
-          <para>Double-click on the <guilabel>Home</guilabel> object on the
-desktop.</para>
+          <para>Enter the home path in the <guilabel>Location</guilabel> field.</para>
         </listitem>
         <listitem>
-          <para>On a file manager window, choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Home</guimenuitem></menuchoice>. </para>
+          <para>Choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Home</guimenuitem></menuchoice>. </para>
         </listitem>
         <listitem>
-          <para>On a file manager window, click on the <guibutton>Home</guibutton>
-toolbar button. </para>
+          <para>Click on the <guibutton>Home</guibutton> toolbar button. </para>
         </listitem>
       </itemizedlist>
-      <para>The file manager window displays the contents of your home location.
+      <para>The file browser window displays the contents of your home location.
 To reload the display,  click on the <guibutton>Reload</guibutton> button.</para>
     </sect2>
-    <sect2 id="gosnautilus-25">
+    <sect2 id="gosnautilus-500">
       <title>To Display a Folder</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>displaying folders</secondary>
-      </indexterm>
-      <para>You can display the contents of a folder in any of the following
-ways: </para>
+      <para>You can display the contents of a folder in any of the following ways: </para>
       <itemizedlist>
         <listitem>
           <para>Double-click on the folder in the view pane.</para>
@@ -639,7 +439,7 @@ button.</para>
       <para>To reload the display, click on the <guibutton>Reload</guibutton> button.</para>
       <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>
+Files</guimenuitem></menuchoice>. </para>
     </sect2>
     <sect2 id="gosnautilus-27">
       <title>Using the Tree From the Side Pane</title>
@@ -651,8 +451,10 @@ Files</guimenuitem></menuchoice>.</para>
         <primary>Tree, using</primary>
       </indexterm>
       <para>The <guilabel>Tree</guilabel> displays a hierarchical representation of your file system.
-The <guilabel>Tree</guilabel> provides a convenient way to navigate your file
-system. To display the <guilabel>Tree</guilabel> in the side pane, choose <guimenuitem>Tree</guimenuitem> from the drop-down list at the top of the side pane. </para>
+The <guilabel>Tree</guilabel> provides a convenient way to browse and to navigate
+your file system. To display the <guilabel>Tree</guilabel> in the side pane,
+choose <guimenuitem>Tree</guimenuitem> from the drop-down list at the top
+of the side pane. </para>
       <para>In the <guilabel>Tree</guilabel>, folders are represented as follows:</para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
@@ -698,10 +500,10 @@ perform with the <guilabel>Tree</guilabel>, and how to perform the tasks.</para>
           <colspec colname="colspec1" colwidth="50*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Task</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Action</para>
               </entry>
             </row>
@@ -765,481 +567,17 @@ pane.</para>
       <para>You can set your preferences so that the <guilabel>Tree</guilabel> does
 not display files. For more information, see <xref linkend="gosnautilus-438"/>. </para>
     </sect2>
-    <sect2 id="gosnautilus-28">
-      <title>Opening Files</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>opening files</secondary>
-      </indexterm>
-      <para>When you open a file, the file manager performs the default
-action for that file type. The default action can be one of the following: </para>
-      <itemizedlist>
-        <listitem>
-          <para>Use a viewer component to display the file in the view pane.</para>
-        </listitem>
-        <listitem>
-          <para>Launch an application that opens the file.</para>
-        </listitem>
-      </itemizedlist>
-      <para>The file manager checks 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 file manager checks the file extension.</para>
-      <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>
-      <sect3 id="gosnautilus-447">
-        <title>Viewing Files in the View Pane</title>
-        <indexterm>
-          <primary>file manager</primary>
-          <secondary>viewing files in view
-pane</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>view pane</primary>
-          <secondary>viewing files in</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>viewer components</primary>
-        </indexterm>
-        <para>The file manager contains viewer components that
-enable you to display particular types of file in the view pane. For example,
-you can display the following types of files in the view pane:</para>
-        <itemizedlist>
-          <listitem>
-            <para>Plain text files</para>
-          </listitem>
-          <listitem>
-            <para>PNG files</para>
-          </listitem>
-          <listitem>
-            <para>Joint Photographic Experts Group (JPEG) files</para>
-          </listitem>
-        </itemizedlist>
-        <para>To reload the contents of the view pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>. To stop
-loading an item in the view pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Stop</guimenuitem></menuchoice>.</para>
-        <para>When you display a file in the view pane, the viewer component might
-add menu items to the file manager menus. The menu items relate to the file
-type that is displayed. For example, when you display a PNG file, the <guimenu>Edit</guimenu> menu contains flip and rotate menu items. </para>
-        <para>Also, when you display some types of file in the view pane, you can
-use the file manager zoom buttons to change the size of the item.</para>
-      </sect3>
-      <sect3 id="gosnautilus-29">
-        <title>To Execute the Default Action</title>
-        <indexterm>
-          <primary>file manager</primary>
-          <secondary>executing default actions
-for files</secondary>
-        </indexterm>
-        <para>To execute the default action for a
-file, double-click on the file. For example, if the default action for plain
-text documents is to display the file in a text viewer. In this case, you
-can double-click on the file to  display the file in a text viewer.</para>
-        <para>You can set your file manager preferences so that you click once on
-a file to execute the default action. For more information, see <xref linkend="gosnautilus-56"/>.</para>
-      </sect3>
-      <sect3 id="gosnautilus-30">
-        <title>To Execute Non-Default Actions Using the Open With Submenu</title>
-        <indexterm>
-          <primary>file manager</primary>
-          <secondary>executing non-default
-actions for files</secondary>
-        </indexterm>
-        <para>To execute actions other than
-the default action for a file, perform the following steps:</para>
-        <orderedlist>
-          <listitem>
-            <para>In the view pane, select the file that you want to perform
-an action on. Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open With</guimenuitem></menuchoice>. The <guisubmenu>Open With</guisubmenu>
-submenu opens. The items in this submenu correspond to the contents of the
-following parts of the <application>File Types and Programs</application>
-preference tool:<itemizedlist><listitem><para><guilabel>Default action</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog</para></listitem><listitem><para><guilabel>Viewer component</guilabel> drop-down list 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>
-        </orderedlist>
-      </sect3>
-      <sect3 id="gosnautilus-73">
-        <title>To Execute Other Actions When Displaying a File</title>
-        <indexterm>
-          <primary>file manager</primary>
-          <secondary>executing other actions
-for files</secondary>
-        </indexterm>
-        <para>When you display a file in the view
-pane, the side pane might contain buttons. <xref linkend="gosnautilus-FIG-477"/>
-shows the buttons in the side pane when a text file is displayed in the view
-pane.</para>
-        <para>The buttons represent any actions that are defined in the <application>File Types and Programs</application> preference tool. The actions are defined
-in the <guilabel>Default action</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog in the <application>File Types and Programs</application> preference tool. Click on a button to execute an action. For
-example, if an action defined for plain text documents is to open the file
-in <application>gedit</application>. If this action is defined, an <guibutton>Open with gedit</guibutton> button is displayed in the side 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:</para>
-          <itemizedlist>
-            <listitem>
-              <para>
-                <guilabel>Open with Other Application</guilabel>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <guilabel>Open with Other Viewer</guilabel>
-              </para>
-            </listitem>
-          </itemizedlist>
-        </note>
-      </sect3>
-    </sect2>
-    <sect2 id="gosnautilus-445">
-      <title>Using the Start Here Location</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/naut_starthere_launcher.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Start Here icon.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>Start Here location</secondary>
-        <see>Start Here location</see>
-      </indexterm>
-      <indexterm>
-        <primary>Start Here location</primary>
-        <secondary>using</secondary>
-      </indexterm>
-      <para>The <guilabel>Start
-Here</guilabel> location enables you to access the following functions:</para>
-      <itemizedlist>
-        <listitem>
-          <para>
-            <guilabel>Applications</guilabel>
-          </para>
-          <para>Double-click on <guilabel>Applications</guilabel> to access your key
-GNOME applications. You can also access the <guimenu>Applications</guimenu>
-menu through the <guimenu>Main Menu</guimenu> and the <application>Menu Bar</application>.</para>
-        </listitem>
-        <listitem>
-          <para>
-            <guilabel>Desktop Preferences</guilabel>
-          </para>
-          <para>Double-click on <guilabel>Desktop Preferences</guilabel> to customize
-your desktop environment. You can also access the desktop environment preference
-tools through the <guimenu>Applications</guimenu> menu. </para>
-        </listitem>
-        <listitem>
-          <para>Applications that enable you to configure your system as a
-server, and to choose other system settings.</para>
-        </listitem>
-      </itemizedlist>
-      <para>You can access the <guilabel>Start Here</guilabel> location in the following
-ways:</para>
-      <itemizedlist>
-        <listitem>
-          <para>From a file manager window</para>
-          <para>Choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Start Here</guimenuitem></menuchoice>. The contents of the <guilabel>Start Here</guilabel>
-location are displayed in the window.</para>
-        </listitem>
-        <listitem>
-          <para>From the desktop</para>
-          <para>Double-click on the <guilabel>Start Here</guilabel> object on the desktop.
-The contents of the <guilabel>Start Here</guilabel> location are displayed
-in a file manager window.</para>
-        </listitem>
-      </itemizedlist>
-    </sect2>
-    <sect2 id="gosnautilus-37">
-      <title>To Access FTP Sites</title>
-      <indexterm>
-        <primary>FTP sites</primary>
-        <secondary>accessing</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>FTP sites</secondary>
-        <see>FTP sites</see>
-      </indexterm>
-      <para>You can use the file manager 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>
-      <para>To reload the FTP site in the view pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>. To stop
-loading the FTP site, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Stop</guimenuitem></menuchoice>.</para>
-    </sect2>
-    <sect2 id="gosnautilus-465">
-      <title>To Access Network Servers</title>
-      <indexterm>
-        <primary>network servers</primary>
-        <secondary>accessing</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>network servers</secondary>
-        <see>network servers</see>
-      </indexterm>
-      <para>If your desktop environment
-is configured to access servers on a network, you can use the file manager
-to access the network servers. </para>
-      <para>To access network servers, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Network Servers</guimenuitem></menuchoice>. A file
-manager window is displayed. The window displays the network servers that
-you can access. Double-click on the network server that you want to access. </para>
-      <para><indexterm><primary>Samba servers</primary><see>Windows shares</see></indexterm>To access Windows shares, double-click on the <guilabel>Network
-Neighborhood</guilabel> icon. A list of the Windows shares available to you
-is displayed in the file manager window.</para>
-      <informaltable frame="topbot">
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="50*"/>
-          <colspec colname="colspec1" colwidth="50*"/>
-          <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>Location</para>
-              </entry>
-              <entry valign="top">
-                <para>URI</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry valign="top">
-                <para>Network servers</para>
-              </entry>
-              <entry valign="top">
-                <para>
-                  <command>network:///</command>
-                </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>NFS servers</para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>
-                  <command>nfs:///</command>
-                </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>Shares on Windows servers</para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>
-                  <command>smb:///</command>
-                </para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-      <sect3 id="gosnautilus-466">
-        <title>To Add a Network Server</title>
-        <para>To add a network server, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Network Servers</guimenuitem></menuchoice>. A file
-manager window is displayed. Double-click on the <guilabel>New Server</guilabel>
-object. A <guilabel>New Server</guilabel> dialog is displayed. Enter the name
-of the server in the dialog, then click <guilabel>OK</guilabel>.</para>
-      </sect3>
-    </sect2>
-    <sect2 id="gosnautilus-467">
-      <title>Accessing Special URI Locations</title>
-      <indexterm>
-        <primary>special URI locations</primary>
-        <secondary>accessing</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>special URI
-locations</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>URI, special</primary>
-        <see>special URI locations</see>
-      </indexterm>
-      <para>The GNOME Desktop contains
-special URI locations that enable you to access particular functions from
-the file manager. For example, to access the preference tools, you can access
-the <command>preferences:///</command> URI in a file manager window. The following
-table lists the special URI locations that you can use with the file manager:</para>
-      <informaltable frame="topbot">
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="33.94*"/>
-          <colspec colname="colspec1" colwidth="66.06*"/>
-          <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>URI Location</para>
-              </entry>
-              <entry valign="top">
-                <para>Description</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>applications:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays
-a list of the applications in your desktop environment. The applications are
-the same as the applications in the <guimenu>Applications</guimenu> menu.
-To open an application, double-click on the application.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>burn:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Copy files and folders that you
-want to write to a CD to this location. You can write the contents of this
-location to a CD.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>fonts:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays all the fonts that are
-available in your desktop environment. To preview a font, double-click on
-the font. You can also use this location to add fonts to your desktop environment.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>network:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays network servers, if
-your desktop environment is configured to access servers on a network. To
-access a network server, double-click on the network server. You can also
-use this location to add network servers to your desktop environment.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>nfs:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays NFS network servers,
-if your desktop environment is configured to access NFS servers. To access
-an NFS network server, double-click on the NFS network server.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>preferences:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays
-a list of the preference tools in your desktop environment. The preference
-tools are the same as the preference tools in the <guimenu>Desktop Preferences</guimenu> menu. To open a preference tool, double-click on the preference
-tool.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>server-settings:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays
-a list of applications that you can use to configure your system as a server.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>smb:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays Windows servers, if
-your desktop environment is configured to access Windows servers. To open
-a Windows server, double-click on the Windows server.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>start-here:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays
-a list of applications and preference tools in your desktop environment. Also
-displays applications that you can use to configure your system as a server,
-and to modify your system settings.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>system-settings:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays
-a list of applications that you can use to modify your system settings.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>themes:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Displays all the themes that
-are available in your desktop environment. To preview a theme, double-click
-on the theme. You can also use this location to add themes to your desktop
-environment.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-    </sect2>
     <sect2 id="gosnautilus-5">
       <title>Using Your Navigation History</title>
       <indexterm>
         <primary>file manager</primary>
         <secondary>navigating history list</secondary>
       </indexterm>
-      <para>The file manager maintains 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. Your history
-list contains the last ten items that you viewed. The following sections describe
-how to navigate your history list.</para>
+      <para>The file browser window maintains a history
+list of files, folders, FTP sites, and URI locations. You can use the history
+list to navigate to files, folders, FTP sites, and URI locations that you
+have recently visited. Your history list contains the last ten items that
+you viewed. 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>
@@ -1252,11 +590,11 @@ the <guimenu>Go</guimenu> menu.</para>
 following actions:</para>
         <itemizedlist>
           <listitem>
-            <para>To open the previous file, folder, or URL in your history
+            <para>To open the previous file, folder, or URI 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,
+            <para>To open the next file, folder, or URI in your history list,
 click on the <guibutton>Forward</guibutton> toolbar button.</para>
           </listitem>
           <listitem>
@@ -1292,7 +630,7 @@ the item in the <guilabel>History</guilabel> list.</para>
       <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 files
-and folders in your file system, or to FTP sites.</para>
+and folders in your file system, to FTP sites, or to URI locations.</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
@@ -1316,10 +654,10 @@ on the right side of the <guilabel>Edit Bookmarks</guilabel> dialog, as follows:
                 <colspec colwidth="72.73*"/>
                 <thead>
                   <row rowsep="1">
-                    <entry valign="top">
+                    <entry>
                       <para>Dialog Element</para>
                     </entry>
-                    <entry valign="top">
+                    <entry>
                       <para>Description </para>
                     </entry>
                   </row>
@@ -1357,890 +695,476 @@ of the dialog. Click <guilabel>Delete</guilabel>. </para>
         </orderedlist>
       </sect3>
     </sect2>
-  </sect1>
-  <sect1 id="gosnautilus-8">
-    <title>Managing Your Files and Folders</title>
-    <indexterm>
-      <primary>file manager</primary>
-      <secondary>managing files and folders</secondary>
-    </indexterm>
-    <para>This section describes how to work with your
-files and folders.</para>
-    <sect2 id="gosnautilus-201">
-      <title>Drag-and-Drop in the File Manager</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>drag-and-drop</secondary>
-      </indexterm>
-      <para>You can use drag-and-drop to perform several tasks in the
-file manager. When you drag-and-drop, the mouse pointer provides feedback
-about the task that you perform. <xref linkend="gosnautilus-TBL-11"/> describes
-the tasks that you can perform with drag-and-drop. The table also shows the
-mouse pointers that appear when you drag-and-drop.</para>
-      <table frame="topbot" id="gosnautilus-TBL-11">
-        <title>Drag-and-Drop in the File Manager</title>
-        <tgroup cols="3" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="36.36*"/>
-          <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>Mouse Pointer</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>Move an item</para>
-              </entry>
-              <entry colname="colspec2" valign="top">
-                <para>Drag the item to the new location.</para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/move_pointer.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Move pointer.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>Copy an item</para>
-              </entry>
-              <entry colname="colspec2" valign="top">
-                <para>Grab the item, then press-and-hold <keycap>Ctrl</keycap>. Drag the item to the new location.</para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/copy_pointer.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Copy pointer.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>Create a symbolic link to
-an item</para>
-              </entry>
-              <entry colname="colspec2" valign="top">
-                <para>Grab the
-item, then press-and-hold <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>.
-Drag the item to the location where you want the symbolic link to reside.</para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <screenshot>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/link_pointer.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Symbolic link pointer.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>Ask what to do with the
-item you drag</para>
-              </entry>
-              <entry colname="colspec2" valign="top">
-                <para>Grab the item, then press-and-hold <keycap>Alt</keycap>. Drag the item to
-the location where you want the item to reside. Release the mouse button.
-A popup menu appears. Choose one of the following items from the popup menu:</para>
-                <itemizedlist>
-                  <listitem>
-                    <para>
-                      <guimenuitem>Move here</guimenuitem>
-                    </para>
-                    <para>Moves the item to the location.</para>
-                  </listitem>
-                  <listitem>
-                    <para>
-                      <guimenuitem>Copy here</guimenuitem>
-                    </para>
-                    <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 desktop background.
- 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>
-                  <mediaobject>
-                    <imageobject>
-                      <imagedata fileref="figures/ask_pointer.png" format="PNG"/>
-                    </imageobject>
-                    <textobject>
-                      <phrase>Ask pointer.</phrase>
-                    </textobject>
-                  </mediaobject>
-                </screenshot>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-    <sect2 id="gosnautilus-202">
-      <title>To Select Files and Folders</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>selecting files and folders</secondary>
-      </indexterm>
-      <para>You can select files and folders in several
-ways in the file manager. <xref linkend="gosnautilus-TBL-10"/> describes how
-to select items in file manager windows and on the desktop.</para>
-      <table frame="topbot" id="gosnautilus-TBL-10">
-        <title>Selecting Items in the File Manager</title>
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="36.36*"/>
-          <colspec colname="colspec2" colwidth="63.64*"/>
-          <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>Task</para>
-              </entry>
-              <entry colname="colspec2" valign="top">
-                <para>Action</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>Select an item</para>
-              </entry>
-              <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>In icon view,
-drag around the files that you want to select.</para>
-                <para>In list view, click
-on the first item in the group. Press-and-hold <keycap>Shift</keycap>, 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>.
-Click on the items that you want to select.</para>
-                <para>Alternatively, press-and-hold <keycap>Ctrl</keycap>, then drag around the files that you want to select.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>Select all items in a folder</para>
-              </entry>
-              <entry colname="colspec2" valign="top">
-                <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All Files</guimenuitem></menuchoice>.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-      <para>To perform the default action on an item, double-click on the item.
-You can set your file manager preferences so that you click once on a file
-to execute the default action. For more information, see <xref linkend="gosnautilus-56"/>.</para>
-    </sect2>
-    <sect2 id="gosnautilus-9">
-      <title>To Move a File or Folder</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>moving files and folders</secondary>
-      </indexterm>
-      <para>The following sections describe the ways that
-you can move a file or folder.</para>
-      <sect3 id="gosnautilus-537">
-        <title>Drag to the New Location in a View Pane</title>
-        <para>To drag a file or folder to a new location in a view pane, perform the
-following steps:</para>
+    <sect2 id="gosnautilus-200">
+      <title>Adding Notes to Files and Folders</title>
+      <para>You can add notes to files or folders. You can add notes to files or
+folders in the following ways:</para>
+      <itemizedlist>
+        <listitem>
+          <para>From the properties dialog</para>
+        </listitem>
+        <listitem>
+          <para>From <guilabel>Notes</guilabel> in the side pane</para>
+        </listitem>
+      </itemizedlist>
+      <sect3 id="gosnautilus-472">
+        <title>To Add a Note Using the Properties Dialog</title>
+        <indexterm>
+          <primary>notes</primary>
+          <secondary>adding to files and folders</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>file manager</primary>
+          <secondary>notes</secondary>
+          <tertiary>adding</tertiary>
+        </indexterm>
+        <para>To add a note
+to a file or folder, perform the following steps:</para>
         <orderedlist>
           <listitem>
-            <para>Open a file manager window. Choose <menuchoice><guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice> to open a second
-file manager window.</para>
+            <para>Select the file or folder to which you want to add a note. </para>
           </listitem>
           <listitem>
-            <para>In one window, select the folder from which you want to move
-the file or folder. In the other window, select the folder to which you want
-to move the file or folder.</para>
+            <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
           </listitem>
           <listitem>
-            <para>Drag the file or folder that you want to move to the new location
-in the other window.</para>
-          </listitem>
-        </orderedlist>
-        <para>To move the file or folder to a folder that is one level below the current
-location, do not open a new window. Instead, drag the file or folder to the
-new location in the same window.</para>
-      </sect3>
-      <sect3 id="gosnautilus-538">
-        <title>Cut and Paste to the New Location</title>
-        <para>You can cut a file or folder and paste the file or folder into another
-folder, as follows:</para>
-        <orderedlist>
-          <listitem>
-            <para>Select the file or folder that you want to move, then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Cut File</guimenuitem></menuchoice>.</para>
+            <para>Click on the <guilabel>Notes</guilabel> tab. In the <guilabel>Notes</guilabel> tabbed section, type the note.</para>
           </listitem>
           <listitem>
-            <para>Open the folder to which you want to move the file or folder,
-then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste
-Files</guimenuitem></menuchoice>.</para>
+            <para>Click <guibutton>Close</guibutton> to close the properties
+dialog. A note emblem is added to the file or folder.</para>
           </listitem>
         </orderedlist>
-<!--<para><emphasis>Question</emphasis>: What is the purpose of the Clear Text command?</para>-->
+        <para><indexterm><primary>notes</primary><secondary>deleting</secondary></indexterm><indexterm><primary>file manager</primary><secondary>notes</secondary><tertiary>deleting</tertiary></indexterm>To delete a note, delete the note text from the <guilabel>Notes</guilabel> tabbed section.</para>
       </sect3>
-    </sect2>
-    <sect2 id="gosnautilus-10">
-      <title>To Copy a File or Folder</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>copying files and folders</secondary>
-      </indexterm>
-      <para>The following sections describe the ways you
-can copy a file or folder.</para>
-      <sect3 id="gosnautilus-640">
-        <title>Drag to the New Location in a View Pane</title>
-        <para>To copy a file or folder perform the following steps:</para>
+      <sect3 id="gosnautilus-473">
+        <title>To Add a Note Using Notes in the Side Pane</title>
+        <para>To add a note to a file or folder, perform the following steps:</para>
         <orderedlist>
           <listitem>
-            <para>Open a file manager window. Choose <menuchoice><guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice> to open a second
-file manager window.</para>
-          </listitem>
-          <listitem>
-            <para>In one window, select the folder from which you want to copy
-the file or folder. In the other window, select the folder to which you want
-to copy the file or folder.</para>
+            <para>Open the file or folder to which you want to add a note in
+the view pane.</para>
           </listitem>
           <listitem>
-            <para>Grab the file or folder, then press-and-hold <keycap>Ctrl</keycap>. Drag the file or 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, grab the file or folder, then
-press-and-hold <keycap>Ctrl</keycap>. 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>
-        <para>You can copy a file or folder and paste the file or folder into another
-folder, as follows:</para>
-        <orderedlist>
-          <listitem>
-            <para>Select the file or folder that you want to copy, then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy File</guimenuitem></menuchoice>.</para>
+            <para>Choose <guilabel>Notes</guilabel> from the drop-down list
+at the top of the side pane. To display the side pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Side Pane</guimenuitem></menuchoice>. </para>
           </listitem>
           <listitem>
-            <para>Open the folder to which you want to copy the file or folder,
-then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste
-Files</guimenuitem></menuchoice>.</para>
+            <para>Type the note in the side pane. A note emblem is added to
+the file or folder in the view pane, and a note icon is added to the side
+pane. You can click on this icon to display the note.</para>
           </listitem>
         </orderedlist>
+        <para>To delete a note, delete the note text from <guilabel>Notes</guilabel>
+in the side pane.</para>
       </sect3>
     </sect2>
-    <sect2 id="gosnautilus-82">
-      <title>To Duplicate a File or Folder</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>duplicating files and
-folders</secondary>
-      </indexterm>
-      <para>To create a copy of a file or folder
-in the current folder perform the following steps:</para>
-      <orderedlist>
+  </sect1>
+  <sect1 id="gosnautilus-24">
+    <title>Navigating Your Files and Folders as Objects</title>
+    <indexterm>
+      <primary>file manager</primary>
+      <secondary>navigating</secondary>
+    </indexterm>
+    <para>Each file object window displays the contents of a single
+file, folder, FTP site, or special URI location. This section describes the
+following:</para>
+    <itemizedlist>
+      <listitem>
+        <para>How to display items in file object windows.</para>
+      </listitem>
+      <listitem>
+        <para>How to open files from file object windows.</para>
+      </listitem>
+      <listitem>
+        <para>How to navigate the files and folders in your file system.</para>
+      </listitem>
+      <listitem>
+        <para>How to access FTP sites.</para>
+      </listitem>
+      <listitem>
+        <para>How to access special URI locations.</para>
+      </listitem>
+    </itemizedlist>
+    <sect2 id="gosnautilus-510">
+      <title>File Object Windows</title>
+      <para>You can access your file object window in any of the following ways:</para>
+      <itemizedlist>
         <listitem>
-          <para>Select the file or folder that you want to duplicate in the
-view pane.</para>
+          <para>Double-click on the <guilabel>Home</guilabel> object on the
+desktop. </para>
+          <para>The file object window displays the contents of your home location in
+the view pane.</para>
         </listitem>
         <listitem>
-          <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Duplicate</guimenuitem></menuchoice>. Alternatively, right-click on the file
-or folder in the view pane, then choose <guimenuitem>Duplicate</guimenuitem>.</para>
-          <para>A copy of the file or folder appears in the current folder.</para>
+          <para>Double-click on the <guilabel>Computer</guilabel> object on
+the desktop.</para>
+          <para>The file object window displays the contents of your default Computer
+folders in the view pane.</para>
         </listitem>
-      </orderedlist>
+      </itemizedlist>
+      <para><xref linkend="gosnautilus-FIG-504"/> shows a sample file object window
+that displays the contents of the Computer folder.</para>
+      <figure id="gosnautilus-FIG-504">
+        <title>Contents of a Folder in a File Object Window<indexterm><primary>file
+manager</primary><secondary>icon view</secondary><tertiary>illustration</tertiary></indexterm></title>
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/naut_computer_contents.png" format="PNG"/>
+            </imageobject>
+            <textobject>
+              <phrase> A folder in a file object window.</phrase>
+            </textobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
-    <sect2 id="gosnautilus-11">
-      <title>To Create a Folder</title>
+    <sect2 id="gosnautilus-4">
+      <title>To Display Your Home Location</title>
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/naut_home_launcher.png" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase>Home location icon.</phrase>
+          </textobject>
+        </mediaobject>
+      </screenshot>
       <indexterm>
         <primary>file manager</primary>
-        <secondary>creating folders</secondary>
+        <secondary>Home location</secondary>
+        <see>Home location</see>
       </indexterm>
-      <para>To create a folder perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Select the folder where you want to create the new folder.</para>
-        </listitem>
+      <indexterm>
+        <primary>Home location</primary>
+        <secondary>displaying</secondary>
+      </indexterm>
+      <para>To display your home location,
+perform one of the following actions: </para>
+      <itemizedlist>
         <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>New Folder</guimenuitem></menuchoice>. Alternatively, right-click on the background
-of the view pane, then choose <guimenuitem>New Folder</guimenuitem>.</para>
-          <para>An <guilabel>untitled</guilabel> folder is added to the view pane. The
-name of the folder is selected.</para>
+          <para>Double-click on the <guilabel>Home</guilabel> object on the
+desktop.</para>
         </listitem>
         <listitem>
-          <para>Type a name for the folder, then press <keycap>Return</keycap>. </para>
+          <para>On a file manager window, choose <menuchoice><guimenu>Places</guimenu><guimenuitem>Home</guimenuitem></menuchoice>. </para>
         </listitem>
-      </orderedlist>
+      </itemizedlist>
+      <para>The file object window displays the contents of your home location.
+To reload the display,  choose <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>.</para>
     </sect2>
-    <sect2 id="gosnautilus-12">
-      <title>To Rename a File or Folder</title>
+    <sect2 id="gosnautilus-25">
+      <title>To Display a Folder</title>
       <indexterm>
         <primary>file manager</primary>
-        <secondary>renaming folders</secondary>
+        <secondary>displaying folders</secondary>
       </indexterm>
-      <para>To rename a file or folder perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Select the file or folder that you want to rename in the view
-pane.</para>
-        </listitem>
+      <para>You can display the contents of a folder in any of the following
+ways: </para>
+      <itemizedlist>
         <listitem>
-          <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Rename</guimenuitem></menuchoice>. Alternatively, right-click on the file
-or folder in the view pane, then choose <guimenuitem>Rename</guimenuitem>.</para>
-          <para>The name of the file or folder is selected.</para>
+          <para>Double-click on the folder in the file object window.</para>
         </listitem>
         <listitem>
-          <para>Type a new name for the file or folder, then press <keycap>Return</keycap>.</para>
+          <para>Highlight the folder, then choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>. </para>
         </listitem>
-      </orderedlist>
+      </itemizedlist>
     </sect2>
-    <sect2 id="gosnautilus-13">
-      <title>To Move a File or Folder to Trash</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>Trash</secondary>
-        <see>Trash</see>
-      </indexterm>
-      <indexterm>
-        <primary>Trash</primary>
-        <secondary>moving
-files or folders to</secondary>
-      </indexterm>
-      <para>To move a file or folder
-to <guilabel>Trash</guilabel> perform the following steps:</para>
+    <sect2 id="gosnautilus-511">
+      <title>To Open a Parent Folder</title>
+      <para>You can display the contents of a parent folder in the following way: </para>
       <orderedlist>
         <listitem>
-          <para>Select the file or folder that you want to move to <guilabel>Trash</guilabel> in the view pane.</para>
+          <para>Highlight a folder that is below the top level folder in a
+hierarchical representation of your file system.</para>
         </listitem>
         <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>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open Parent</guimenuitem></menuchoice>. </para>
         </listitem>
       </orderedlist>
-      <para>Alternatively, you can drag the file or folder from the view pane to
-the <guilabel>Trash</guilabel> object on the desktop.</para>
-      <note>
-        <para>When you move a file or folder from a removable media to <guilabel>Trash</guilabel>, the file or folder is stored in a <guilabel>Trash</guilabel>
-location on the removable media. To remove the file or folder permanently
-from the removable media, you must empty <guilabel>Trash</guilabel>.</para>
-      </note>
     </sect2>
-    <sect2 id="gosnautilus-443">
-      <title>To Delete a File or Folder</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>deleting files or folders</secondary>
-      </indexterm>
-      <para>When you delete a file or folder, the file or
-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>File Management Preferences</guilabel>
-dialog. </para>
-      <para>To delete a file or folder perform the following steps:</para>
+    <sect2 id="gosnautilus-501">
+      <title>To Display a Folder in a File Browser Window</title>
+      <para>You can display the contents of a folder in a file browser window in
+the following ways: </para>
       <orderedlist>
         <listitem>
-          <para>Select the file or folder that you want to delete in the view
-pane.</para>
+          <para>Select a folder in the file object window.</para>
         </listitem>
         <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>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Browse Folder</guimenuitem></menuchoice> to open a file browser window for
+the folder.</para>
         </listitem>
       </orderedlist>
     </sect2>
-    <sect2 id="gosnautilus-14">
-      <title>To Create a Symbolic Link to a File or Folder</title>
+    <sect2 id="gosnautilus-445">
+      <title>Using the Start Here Location</title>
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/naut_starthere_launcher.png" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase>Start Here icon.</phrase>
+          </textobject>
+        </mediaobject>
+      </screenshot>
       <indexterm>
         <primary>file manager</primary>
-        <secondary>creating symbolic link</secondary>
+        <secondary>Start Here location</secondary>
+        <see>Start Here location</see>
       </indexterm>
       <indexterm>
-        <primary>symbolic link</primary>
-        <secondary>to file or folder, creating</secondary>
-      </indexterm>
-      <para>A symbolic link is
-a special type of file that points to another file or folder. When you perform
-an action on a symbolic 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>Edit</guimenu><guimenuitem>Make Link</guimenuitem></menuchoice>. A link to the
-file or folder is added to the current folder. </para>
-      <para>Alternatively, grab the item to which you want to create a link, then
-press-and-hold <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>. Drag the item
-to the location where you want to place the link.</para>
-      <para>By default, the file manager adds an emblem to symbolic links.</para>
-      <note>
-        <para>The permissions of a symbolic link are determined by the file
-or folder to which a symbolic link points.</para>
-      </note>
-    </sect2>
-    <sect2 id="gosnautilus-476">
-      <title>To View the Properties of a File or Folder</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>viewing properties</secondary>
+        <primary>Start Here location</primary>
+        <secondary>using</secondary>
       </indexterm>
-      <para>To view the properties of a file or folder, perform the
-following steps:</para>
-      <orderedlist>
+      <para>The <guilabel>Start
+Here</guilabel> location enables you to access the following functions:</para>
+      <itemizedlist>
         <listitem>
-          <para>Select the file or folder whose properties you want to view. </para>
+          <para>
+            <guilabel>Applications</guilabel>
+          </para>
+          <para>Double-click on <guilabel>Applications</guilabel> to access your key
+GNOME applications. You can also access the <guimenu>Applications</guimenu>
+menu through the <guimenu>Main Menu</guimenu> and the <application>Menu Bar</application>.</para>
         </listitem>
         <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
+          <para>
+            <guilabel>Desktop Preferences</guilabel>
+          </para>
+          <para>Double-click on <guilabel>Desktop Preferences</guilabel> to customize
+the GNOME Desktop. You can also access the preference tools through the <guimenu>Applications</guimenu> menu. </para>
         </listitem>
         <listitem>
-          <para>Use the properties dialog to view the properties of the desktop
-object. </para>
+          <para>Applications that enable you to configure your system as a
+server, and to modify other system configuration details.</para>
         </listitem>
+      </itemizedlist>
+      <para>You can access the <guilabel>Start Here</guilabel> location in the following
+ways:</para>
+      <itemizedlist>
         <listitem>
-          <para>Click <guibutton>Close</guibutton> to close the properties
-dialog.</para>
+          <para>From a file browser window</para>
+          <para>Choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Desktop</guimenuitem></menuchoice>. The contents of the <guilabel>Desktop</guilabel>
+folder are displayed in the window. Double-click on the <guilabel>Start Here</guilabel> object.</para>
         </listitem>
-      </orderedlist>
+        <listitem>
+          <para>From the desktop</para>
+          <para>Double-click on the <guilabel>Start Here</guilabel> object on the desktop.
+The contents of the <guilabel>Start Here</guilabel> location are displayed
+in a file object window.</para>
+        </listitem>
+      </itemizedlist>
     </sect2>
-    <sect2 id="gosnautilus-430">
-      <title>To Change Permissions</title>
+  </sect1>
+  <sect1 id="gosnautilus-203">
+    <title>Modifying the Appearance of Files and Folders</title>
+    <indexterm>
+      <primary>file manager</primary>
+      <secondary>modifying appearance
+of files and folders</secondary>
+    </indexterm>
+    <para>The file manager enables
+you to modify the appearance of your files and folders in several ways, as
+described in the following sections.</para>
+    <sect2 id="gosnautilus-550">
+      <title>Icons and Emblems</title>
       <indexterm>
-        <primary>permissions</primary>
+        <primary>file manager</primary>
+        <secondary>icons</secondary>
+        <tertiary>introduction</tertiary>
+      </indexterm>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>emblems</secondary>
+        <see>emblems</see>
+      </indexterm>
+      <indexterm>
+        <primary>emblems</primary>
         <secondary>introduction</secondary>
       </indexterm>
-      <para>Permissions are settings assigned to each file and folder
-that determine what type of access users can have to the file or folder. The
-following table lists the permissions that you can set for files and folders,
-and the effect of the permission on files and folders:</para>
+      <para>In icon
+view, the file manager displays your files and folders as icons. You can add
+emblems to your file icons and folder icons. An emblem is a small icon that
+you can add to an item to visually mark the item. For example, to mark a file
+as important, you can add an <guilabel>Important</guilabel> emblem to the
+file icon to create the following visual effect: </para>
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/naut_sampleemblem_icon.png" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase>File icon with Important emblem.</phrase>
+          </textobject>
+        </mediaobject>
+      </screenshot>
+      <para>For more information on how to add an emblem to an icon, see <xref linkend="gosnautilus-112"/>.</para>
+      <para>The following table describes the structure of the file icon:</para>
       <informaltable frame="topbot">
-        <tgroup cols="3" colsep="0" rowsep="0">
-          <colspec colwidth="29.62*"/>
-          <colspec colwidth="74.59*"/>
-          <colspec colname="colspec0" colwidth="74.59*"/>
+        <tgroup cols="2" colsep="0" rowsep="0">
+          <colspec colname="colspec0" colwidth="35.09*"/>
+          <colspec colname="colspec1" colwidth="64.91*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
-                <para>Permission</para>
-              </entry>
-              <entry valign="top">
-                <para>File</para>
+              <entry>
+                <para>Component</para>
               </entry>
-              <entry colname="colspec0" valign="top">
-                <para>Folder</para>
+              <entry>
+                <para>Description</para>
               </entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry valign="top">
-                <para>Read</para>
-              </entry>
-              <entry valign="top">
-                <para>Permission to read the file.</para>
-              </entry>
               <entry colname="colspec0" valign="top">
-                <para>Permission to list the contents of the folder.</para>
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/naut_sampleemblem1_icon.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Important emblem.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Emblem. This emblem is the <guilabel>Important</guilabel> emblem.</para>
               </entry>
             </row>
             <row>
               <entry valign="top">
-                <para>Write</para>
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/naut_sampleemblem2_icon.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Text file icon.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
               </entry>
               <entry valign="top">
-                <para>Permission to make changes to the file. </para>
-              </entry>
-              <entry colname="colspec0" valign="top">
-                <para>Permission to create and delete files in the folder.</para>
+                <para>Icon that represents the file.
+This icon might contain a preview of the contents of the file.</para>
               </entry>
             </row>
             <row>
-              <entry valign="top">
-                <para>Execute</para>
-              </entry>
-              <entry valign="top">
-                <para>Permission to run the file as a program. This is only relevant if the file
-is a program or script.</para>
-              </entry>
               <entry colname="colspec0" valign="top">
-                <para>Permission to access files in the directory.</para>
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/naut_sampleemblem3_icon.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Icon caption.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <para>Icon caption. You can modify what items of information are displayed in the
+icon caption.</para>
               </entry>
             </row>
           </tbody>
         </tgroup>
       </informaltable>
-      <para>You can set permissions for different types of user. The following table
-lists the types of user that you can set for which you can set permissions:</para>
+      <para>The file manager includes default emblems for the following types of
+item:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Symbolic links</para>
+        </listitem>
+        <listitem>
+          <para>Items for which you have the following permissions:<indexterm><primary>permissions</primary><secondary>and emblems</secondary></indexterm></para>
+          <itemizedlist>
+            <listitem>
+              <para>Read permission only </para>
+            </listitem>
+            <listitem>
+              <para>No read permission and no write permission</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </itemizedlist>
+      <para>The following table shows the default emblems:</para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colwidth="27.27*"/>
-          <colspec colwidth="72.73*"/>
+          <colspec colname="colspec0" colwidth="35.09*"/>
+          <colspec colname="colspec1" colwidth="64.91*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
-                <para>User Category</para>
+              <entry>
+                <para>Default Emblem</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Description</para>
               </entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry valign="top">
-                <para>Owner</para>
+              <entry colname="colspec0" valign="top">
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/naut_link_emblem.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Symbolic link emblem.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
               </entry>
-              <entry valign="top">
-                <para>The user that created the file or folder.</para>
+              <entry colname="colspec1" valign="top">
+                <para><indexterm><primary>symbolic links</primary><secondary>and emblems</secondary></indexterm>Symbolic
+link</para>
               </entry>
             </row>
             <row>
               <entry valign="top">
-                <para>Group</para>
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/naut_nowrite_emblem.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Read permission only emblem.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
               </entry>
               <entry valign="top">
-                <para>The group to which the owner belongs.</para>
+                <para>Read permission only</para>
               </entry>
             </row>
             <row>
-              <entry valign="top">
-                <para>Others</para>
+              <entry colname="colspec0" valign="top">
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/naut_noread_emblem.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>No read permission and no write permission emblem.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
               </entry>
-              <entry valign="top">
-                <para>All other users who are not in the group to which the owner belongs.</para>
+              <entry colname="colspec1" valign="top">
+                <para>No read permission and no write permission</para>
               </entry>
             </row>
           </tbody>
         </tgroup>
       </informaltable>
-      <para><indexterm><primary>file manager</primary><secondary>changing permissions</secondary></indexterm><indexterm><primary>permissions</primary><secondary>changing file and folder</secondary></indexterm>To change the permissions
-on a file or folder perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Select the file or folder that you want to change. </para>
-        </listitem>
-        <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Click on the <guilabel>Permissions</guilabel> tab. In the <guilabel>Permissions</guilabel> tabbed section, use the drop-down lists and check boxes
-to change the permissions for the file or folder. The following table describes
-the dialog elements on the <guilabel>Permissions</guilabel> tabbed section: </para>
-          <informaltable frame="topbot">
-            <tgroup cols="2" colsep="0" rowsep="0">
-              <colspec colwidth="37.78*"/>
-              <colspec colwidth="62.22*"/>
-              <thead>
-                <row rowsep="1">
-                  <entry valign="top">
-                    <para>Element</para>
-                  </entry>
-                  <entry valign="top">
-                    <para>Description</para>
-                  </entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry valign="top">
-                    <para>
-                      <guilabel>File owner</guilabel>
-                    </para>
-                  </entry>
-                  <entry valign="top">
-                    <para>To change the owner of the file or folder, select
-the owner from the drop-down list. </para>
-                  </entry>
-                </row>
-                <row>
-                  <entry valign="top">
-                    <para>
-                      <guilabel>File group</guilabel>
-                    </para>
-                  </entry>
-                  <entry valign="top">
-                    <para>To change the group to which a file or folder belongs,
-select the group from the drop-down list. </para>
-                  </entry>
-                </row>
-                <row>
-                  <entry valign="top">
-                    <para>
-                      <guilabel>Owner</guilabel>
-                    </para>
-                  </entry>
-                  <entry valign="top">
-                    <para>Select the permissions that you want to apply to the owner
-of the file or folder.</para>
-                  </entry>
-                </row>
-                <row>
-                  <entry valign="top">
-                    <para>
-                      <guilabel>Group</guilabel>
-                    </para>
-                  </entry>
-                  <entry valign="top">
-                    <para>Select the permissions that you want to apply to the group
-to which the owner of the file or folder belongs.</para>
-                  </entry>
-                </row>
-                <row>
-                  <entry valign="top">
-                    <para>
-                      <guilabel>Others</guilabel>
-                    </para>
-                  </entry>
-                  <entry valign="top">
-                    <para>Select the permissions that you want to apply to
-all other users who are not in the group to which the owner belongs.</para>
-                  </entry>
-                </row>
-                <row>
-                  <entry valign="top">
-                    <para>
-                      <guilabel>Text view</guilabel>
-                    </para>
-                  </entry>
-                  <entry valign="top">
-                    <para>Displays the permissions that you select from the <guilabel>Read</guilabel>, <guilabel>Write</guilabel>, and <guilabel>Execute</guilabel>
-options, in text format.</para>
-                  </entry>
-                </row>
-                <row>
-                  <entry valign="top">
-                    <para>
-                      <guilabel>Number view</guilabel>
-                    </para>
-                  </entry>
-                  <entry valign="top">
-                    <para>Displays the permissions that you select from the <guilabel>Read</guilabel>, <guilabel>Write</guilabel>, and <guilabel>Execute</guilabel>
-options, in text format.</para>
-                  </entry>
-                </row>
-                <row>
-                  <entry valign="top">
-                    <para>
-                      <guilabel>Last changed</guilabel>
-                    </para>
-                  </entry>
-                  <entry valign="top">
-                    <para>Displays the date and time that the file or folder
-was last modified.</para>
-                  </entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </informaltable>
-        </listitem>
-        <listitem>
-          <para>Click <guibutton>Close</guibutton> to close the properties
-dialog.</para>
-        </listitem>
-      </orderedlist>
     </sect2>
-    <sect2 id="gosnautilus-200">
-      <title>Adding Notes to Files and Folders</title>
-      <para>You can add notes to files or folders. You can add notes to files or
-folders in the following ways:</para>
-      <itemizedlist>
-        <listitem>
-          <para>From the properties dialog</para>
-        </listitem>
-        <listitem>
-          <para>From <guilabel>Notes</guilabel> in the side pane</para>
-        </listitem>
-      </itemizedlist>
-      <sect3 id="gosnautilus-472">
-        <title>To Add a Note Using the Properties Dialog</title>
-        <indexterm>
-          <primary>notes</primary>
-          <secondary>adding to files and folders</secondary>
-        </indexterm>
-        <indexterm>
-          <primary>file manager</primary>
-          <secondary>notes</secondary>
-          <tertiary>adding</tertiary>
-        </indexterm>
-        <para>To add a note
-to a file or folder, perform the following steps:</para>
-        <orderedlist>
-          <listitem>
-            <para>Select the file or folder to which you want to add a note. </para>
-          </listitem>
-          <listitem>
-            <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
-          </listitem>
-          <listitem>
-            <para>Click on the <guilabel>Notes</guilabel> tab. In the <guilabel>Notes</guilabel> tabbed section, type the note.</para>
-          </listitem>
-          <listitem>
-            <para>Click <guibutton>Close</guibutton> to close the properties
-dialog. A note emblem is added to the file or folder.</para>
-          </listitem>
-        </orderedlist>
-        <para><indexterm><primary>notes</primary><secondary>deleting</secondary></indexterm><indexterm><primary>file manager</primary><secondary>notes</secondary><tertiary>deleting</tertiary></indexterm>To delete a note, delete the note text from the <guilabel>Notes</guilabel> tabbed section.</para>
-      </sect3>
-      <sect3 id="gosnautilus-473">
-        <title>To Add a Note Using Notes in the Side Pane</title>
-        <para>To add a note to a file or folder, perform the following steps:</para>
-        <orderedlist>
-          <listitem>
-            <para>Open the file or folder to which you want to add a note in
-the view pane.</para>
-          </listitem>
-          <listitem>
-            <para>Choose <guilabel>Notes</guilabel> from the drop-down list
-at the top of the side pane. To display the side pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Side Pane</guimenuitem></menuchoice>. </para>
-          </listitem>
-          <listitem>
-            <para>Type the note in the side pane. A note emblem is added to
-the file or folder in the view pane, and a note icon is added to the side
-pane. You can click on this icon to display the note.</para>
-          </listitem>
-        </orderedlist>
-        <para>To delete a note, delete the note text from <guilabel>Notes</guilabel>
-in the side pane.</para>
-      </sect3>
-    </sect2>
-    <sect2 id="gosnautilus-44">
-      <title>Using Trash</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/naut_trash_launcher.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>Trash icon, empty.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-      <indexterm>
-        <primary>Trash</primary>
-        <secondary>introduction</secondary>
-      </indexterm>
-      <para>You can move the following items to <guilabel>Trash</guilabel>:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Files</para>
-        </listitem>
-        <listitem>
-          <para>Folders</para>
-        </listitem>
-        <listitem>
-          <para>Desktop objects</para>
-        </listitem>
-      </itemizedlist>
-      <para>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>. When you empty <guilabel>Trash</guilabel>, you delete the
-contents of <guilabel>Trash</guilabel> permanently. </para>
-      <sect3 id="gosnautilus-107">
-        <title>To Display Trash</title>
-        <indexterm>
-          <primary>Trash</primary>
-          <secondary>displaying</secondary>
-        </indexterm>
-        <para>You can display the contents of <guilabel>Trash</guilabel> in the following
-ways:</para>
-        <itemizedlist>
-          <listitem>
-            <para>From a file manager window</para>
-            <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</para>
-            <para>Double-click on the <guilabel>Trash</guilabel> object on the desktop.</para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
-      <sect3 id="gosnautilus-108">
-        <title>To Empty Trash</title>
-        <indexterm>
-          <primary>Trash</primary>
-          <secondary>emptying</secondary>
-        </indexterm>
-        <para>You can empty the contents of <guilabel>Trash</guilabel> in the following
-ways:</para>
-        <itemizedlist>
-          <listitem>
-            <para>From a file manager window</para>
-            <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Empty
-Trash</guimenuitem></menuchoice>.</para>
-          </listitem>
-          <listitem>
-            <para>From the desktop</para>
-            <para>Right-click on the <guilabel>Trash</guilabel> object, then choose <guimenuitem>Empty Trash</guimenuitem>.</para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
-    </sect2>
-  </sect1>
-  <sect1 id="gosnautilus-203">
-    <title>Modifying the Appearance of Files and Folders</title>
-    <indexterm>
-      <primary>file manager</primary>
-      <secondary>modifying appearance
-of files and folders</secondary>
-    </indexterm>
-    <para>The file manager enables
-you to modify the appearance of your files and folders in several ways, as
-described in the following sections.</para>
     <sect2 id="gosnautilus-112">
       <title>To Add an Emblem to a File or Folder</title>
       <indexterm>
@@ -2294,9 +1218,8 @@ text box.</para>
         </listitem>
         <listitem>
           <para>Click on the <guilabel>Image</guilabel> button. A dialog is
-displayed. Choose an emblem from the dialog. Alternatively, to choose an emblem
-from another directory, click <guibutton>Browse</guibutton>. When you choose
-an emblem, click <guibutton>OK</guibutton>. </para>
+displayed. , click <guibutton>Browse</guibutton>. When you choose an emblem,
+click <guibutton>OK</guibutton>. </para>
         </listitem>
         <listitem>
           <para>Click <guibutton>OK</guibutton> on the <guilabel>Create a
@@ -2335,7 +1258,7 @@ dialog.</para>
         </listitem>
       </orderedlist>
       <para>To restore an icon from a custom icon to the default icon specified
-in the <application>File Types and Programs</application> preference tool,
+in the <application>File Types and Programs</application>  preference 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>
@@ -2372,13 +1295,13 @@ to use the zoom buttons.</para>
           <colspec colname="colspec2" colwidth="44.17*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Button</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Button Name </para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Description</para>
               </entry>
             </row>
@@ -2480,45 +1403,16 @@ of a folder in the following types of view: </para>
       <itemizedlist>
         <listitem>
           <para>Icon view</para>
-          <para>Shows the items in the folder as icons. <xref linkend="gosnautilus-FIG-1"/>
-shows a folder in icon view.</para>
+          <para>Shows the items in the folder as icons.</para>
         </listitem>
         <listitem>
           <para>List view</para>
-          <para>Shows the items in the folder as a list. <xref linkend="gosnautilus-FIG-3"/>
-shows a folder in list view.</para>
-          <figure id="gosnautilus-FIG-3">
-            <title>File Manager Window in List View<indexterm><primary>file manager</primary><secondary>list view</secondary><tertiary>illustration</tertiary></indexterm></title>
-            <screenshot>
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="figures/naut_listview_window.png" format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase>Folder in file manager window, contents in list view.</phrase>
-                </textobject>
-              </mediaobject>
-            </screenshot>
-          </figure>
+          <para>Shows the items in the folder as a list.</para>
         </listitem>
         <listitem>
           <para>Audio view</para>
           <para>Shows the audio items in the folder only, and displays controls that
-enable you to play the audio files. <xref linkend="gosnautilus-FIG-474"/> shows
-a folder in audio view.</para>
-          <figure id="gosnautilus-FIG-474">
-            <title>File Manager Window in Audio View<indexterm><primary>file manager</primary><secondary>audio view</secondary><tertiary>illustration</tertiary></indexterm></title>
-            <screenshot>
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="figures/naut_audioview_window.png" format="PNG"/>
-                </imageobject>
-                <textobject>
-                  <phrase>Folder in file manager window, contents displayed in audio view.</phrase>
-                </textobject>
-              </mediaobject>
-            </screenshot>
-          </figure>
+enable you to play the audio files.</para>
         </listitem>
       </itemizedlist>
       <para>Use the <guilabel>View</guilabel> menu to choose how to display a file
@@ -2582,10 +1476,10 @@ following table: </para>
             <colspec colname="colspec7" colwidth="71.25*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Option</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description </para>
                 </entry>
               </row>
@@ -2638,7 +1532,7 @@ sorted by the total size of the items in the folder.</para>
                 <entry colname="colspec7" valign="top">
                   <para>Select this option to sort the
 items alphabetically by object type. The items are sorted alphabetically by
-the description of their <firstterm>MIME type</firstterm> in the <application>File Types and Programs</application> preference tool. The MIME type identifies
+the description of their <firstterm>MIME type</firstterm> in the <application>File Types and Programs</application>  preference tool. The MIME type identifies
 the format of a file, and enables applications to read the file. For example,
 an email application can use the <literal>image/png</literal> MIME type to
 detect that a PNG file is attached to an email.</para>
@@ -2774,10 +1668,10 @@ on the <guilabel>Modify</guilabel> dialog:</para>
                 <colspec colwidth="64.91*"/>
                 <thead>
                   <row rowsep="1">
-                    <entry valign="top">
+                    <entry>
                       <para>Option</para>
                     </entry>
-                    <entry valign="top">
+                    <entry>
                       <para>Description </para>
                     </entry>
                   </row>
@@ -2846,9 +1740,8 @@ submenu for this type of item.</para>
         </orderedlist>
         <note>
           <para>You can also modify the actions that are associated with a file
-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>
+type in the <guilabel>Edit file type</guilabel> dialog in the <application>File Types and Programs</application> preference tool. To open the <guilabel>Edit file type</guilabel> dialog, click on the <guibutton>Go There</guibutton>
+button. </para>
         </note>
       </sect3>
     </sect2>
@@ -2867,8 +1760,8 @@ their associated file extensions, and their default actions. This table specifie
 what happens when you double-click on a file in the file manager. </para>
     <para>You can also use the file manager to modify the actions that are  associated
 with a particular file or file type. </para>
-    <para>You can use the <application>File Types and Programs</application> preference
-tool to perform the following tasks:</para>
+    <para>You can use the <application>File Types and Programs</application> 
+preference tool to perform the following tasks:</para>
     <itemizedlist>
       <listitem>
         <para>Specify the default action for a file type. You can also change
@@ -2951,10 +1844,10 @@ on the <guilabel>Modify</guilabel> dialog:</para>
               <colspec colwidth="64.91*"/>
               <thead>
                 <row rowsep="1">
-                  <entry valign="top">
+                  <entry>
                     <para>Option</para>
                   </entry>
-                  <entry valign="top">
+                  <entry>
                     <para>Description </para>
                   </entry>
                 </row>
@@ -3023,9 +1916,8 @@ for this file, and not for other files of this type.</para>
       </orderedlist>
       <note>
         <para>You can also modify the actions that are associated with a file
-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>
+type in the <guilabel>Edit file type</guilabel> dialog in the <application>File Types and Programs</application>  preference tool. To open the <guilabel>Edit file type</guilabel> dialog, click on the <guibutton>Go There</guibutton>
+button. </para>
       </note>
     </sect2>
   </sect1>
@@ -3049,7 +1941,7 @@ and preferences. This section describes how to customize the file manager.</para
 file manager</primary>
         <see>file manager preferences</see>
       </indexterm>
-      <para>Use the <guilabel>File Management Preferences</guilabel> dialog to set preferences
+      <para>Use the <guilabel>File Management Preferences</guilabel>  dialog to set preferences
 for the file manager. To display the <guilabel>File Management Preferences</guilabel> dialog, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.</para>
       <para>You can set preferences in the following categories: </para>
       <itemizedlist>
@@ -3077,10 +1969,10 @@ and <guilabel>Trash</guilabel>.</para>
         <para>You can specify a default view,
 and select sort options and display options. You can also specify default
 settings for icon views and list views. To specify your default view settings,
-choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. Click on the <guilabel>Views</guilabel> tab in
-the <guilabel>File Management Preferences</guilabel> dialog to display the <guilabel>Views</guilabel> tabbed section.</para>
-        <para><xref linkend="gosnautilus-TBL-30"/> lists the views settings that you
-can modify. </para>
+choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. Click on the <guilabel>Views</guilabel> tab to
+display the <guilabel>Views</guilabel> tabbed section.</para>
+        <para><xref linkend="gosnautilus-TBL-30"/> lists the views preferences that
+you can modify. </para>
         <table frame="topbot" id="gosnautilus-TBL-30">
           <title>Views Preferences</title>
           <tgroup cols="2" colsep="0" rowsep="0">
@@ -3088,10 +1980,10 @@ can modify. </para>
             <colspec colname="colspec1" colwidth="64.91*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Dialog Element</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description</para>
                 </entry>
               </row>
@@ -3133,18 +2025,6 @@ files when you sort a folder.</para>
               <row>
                 <entry colname="colspec0" valign="top">
                   <para>
-                    <guilabel>Sort in reverse</guilabel>
-                  </para>
-                </entry>
-                <entry colname="colspec1">
-                  <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 the <guilabel>Arrange Items</guilabel> drop-down list is reversed. For example, if you select <guilabel>By Name</guilabel>, the items are sorted in reverse alphabetical order.</para>
-                </entry>
-              </row>
-              <row>
-                <entry colname="colspec0" valign="top">
-                  <para>
                     <guilabel>Show hidden and
 backup files</guilabel>
                   </para>
@@ -3154,6 +2034,8 @@ backup files</guilabel>
 this option to display hidden files and backup files in the view pane. The
 first character in a hidden filename is a period (.). The last character in
 a backup filename is a tilde (~).</para>
+                  <para>You can hide files from the
+view pane by adding .hidden extension to the filename.</para>
                 </entry>
               </row>
               <row>
@@ -3225,21 +2107,21 @@ in the <guilabel>Tree</guilabel> in the side pane.</para>
           <tertiary>behavior</tertiary>
         </indexterm>
         <para>To set your preferences for
-files and folders, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. Click on the <guilabel>Files and Folders</guilabel> tab in the <guilabel>File Management Preferences</guilabel> dialog
-to display the <guilabel>Files and Folders</guilabel> tabbed section.</para>
-        <para><xref linkend="gosnautilus-TBL-37"/> lists the settings that you can
+files and folders, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. Click on the <guilabel>Behavior</guilabel>
+tab to display the <guilabel>Behavior</guilabel> tabbed section.</para>
+        <para><xref linkend="gosnautilus-TBL-37"/> lists the preferences that you can
 modify for files and folders. </para>
         <table frame="topbot" id="gosnautilus-TBL-37">
-          <title>Files and Folders Preferences</title>
+          <title>File and Folder Behavior Preferences</title>
           <tgroup cols="2" colsep="0" rowsep="0">
             <colspec colname="colspec6" colwidth="35.09*"/>
             <colspec colname="colspec7" colwidth="64.91*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Option</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description </para>
                 </entry>
               </row>
@@ -3375,8 +2257,7 @@ name. Normally only one item of information is visible, but when you zoom
 in on an icon, more of the information is displayed. You can modify what additional
 information is displayed in icon captions. </para>
         <para>To set your preferences for icon captions, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
-Click on the <guilabel>Files and Folders</guilabel> tab in the <guilabel>File Management Preferences</guilabel> dialog to display the <guilabel>Files
-and Folders</guilabel> tabbed section. </para>
+Click on the <guilabel>Icon Caption</guilabel> tab to display the <guilabel>Icon Caption</guilabel> tabbed section. </para>
         <para>Select the items of information that you want to display in the icon
 caption from the three drop-down lists. Select the first item from the first
 drop-down list, select the second item from the second drop-down list, and
@@ -3388,10 +2269,10 @@ select:</para>
             <colspec colname="colspec1" colwidth="64.91*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Information</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description </para>
                 </entry>
               </row>
@@ -3512,8 +2393,152 @@ no information for the item.</para>
             </tbody>
           </tgroup>
         </informaltable>
-<!--<para><emphasis>Comment:</emphasis> IEL Item: Permissions and Octal permissions above do not match the terms used on the Properties 
-dialog Permissions tab (it uses Text View/Number View).</para>-->
+      </sect3>
+      <sect3 id="gosnautilus-490">
+        <title>To Set List Columns Preferences</title>
+        <para>You can specify what information is displayed in list view in file manager
+windows. You can specify which columns are displayed in list view, and the
+order in which the columns are displayed.</para>
+        <para>To set your preferences for list columns, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>.
+Click on the <guilabel>List Columns</guilabel> tab to display the <guilabel>List Columns</guilabel> tabbed section. </para>
+        <para>To specify a column to display in list view, select the column, then
+click on the <guibutton>Show</guibutton> button. To remove a column from the
+list view, select the column, then click on the <guibutton>Hide</guibutton>
+button.</para>
+        <para>Use the <guibutton>Move Up</guibutton> and <guibutton>Move Down</guibutton>
+buttons to specify the position of columns in list view.</para>
+        <para>To use the default columns and column positions, click on the <guibutton>Use Default</guibutton> button. </para>
+        <para>The following table describes the columns that you can display:</para>
+        <informaltable frame="topbot">
+          <tgroup cols="2" colsep="0" rowsep="0">
+            <colspec colname="colspec0" colwidth="35.09*"/>
+            <colspec colname="colspec1" colwidth="64.91*"/>
+            <thead>
+              <row rowsep="1">
+                <entry>
+                  <para>Information</para>
+                </entry>
+                <entry>
+                  <para>Description </para>
+                </entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry colname="colspec0">
+                  <para>
+                    <guilabel>Name</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1">
+                  <para>Choose this option to display the name of
+the item.</para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0" valign="top">
+                  <para>
+                    <guilabel>Size</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1" valign="top">
+                  <para>Choose this option to display
+the size of the item.</para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0" valign="top">
+                  <para>
+                    <guilabel>Type</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1" valign="top">
+                  <para>Choose this option to display
+the description of the MIME type of the item from the <application>File Types
+and Programs</application> preference tool.</para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0" valign="top">
+                  <para>
+                    <guilabel>Date Modified</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1" valign="top">
+                  <para>Choose
+this option to display the last modification date of the item.</para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0" valign="top">
+                  <para>
+                    <guilabel>Date Accessed</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1" valign="top">
+                  <para>Choose
+this option to display the date that the item was last accessed.</para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0">
+                  <para>
+                    <guilabel>Group</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1">
+                  <para>Choose this option to display the group to
+which the item belongs.</para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0">
+                  <para>
+                    <guilabel>MIME type</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1">
+                  <para>Choose this option to display the MIME type
+of the item.</para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0">
+                  <para>
+                    <guilabel>Octal Permissions</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1">
+                  <para><indexterm><primary>permissions</primary><secondary>displaying in octal notation</secondary></indexterm>Choose this
+option to display the permissions of the item in octal notation, for example <computeroutput>764</computeroutput>. </para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0" valign="top">
+                  <para>
+                    <guilabel>Owner</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1" valign="top">
+                  <para>Choose this option to display
+the owner of the item.</para>
+                </entry>
+              </row>
+              <row>
+                <entry colname="colspec0" valign="top">
+                  <para>
+                    <guilabel>Permissions</guilabel>
+                  </para>
+                </entry>
+                <entry colname="colspec1" valign="top">
+                  <para><indexterm><primary>permissions</primary><secondary>displaying as characters</secondary></indexterm>Choose
+this option to display the permissions of the item as three sets of three
+characters, for example <computeroutput>-rwxrw-r--</computeroutput>.</para>
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
       </sect3>
       <sect3 id="gosnautilus-60">
         <title>To Set Preview Preferences</title>
@@ -3534,10 +2559,10 @@ table:</para>
             <colspec colwidth="64.91*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Option</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description </para>
                 </entry>
               </row>
@@ -3577,9 +2602,9 @@ on other file systems.</para>
             </tbody>
           </tgroup>
         </informaltable>
-        <para>To set your preview preferences, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. Click on the <guilabel>Preview</guilabel> tab in the <guilabel>File Management Preferences</guilabel>
-dialog to display the <guilabel>Preview</guilabel> tabbed section. </para>
-        <para><xref linkend="gosnautilus-TBL-41"/> lists the preview settings that
+        <para>To set your preview preferences, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. Click on the <guilabel>Preview</guilabel> tab dialog to display the <guilabel>Preview</guilabel>
+tabbed section. </para>
+        <para><xref linkend="gosnautilus-TBL-41"/> lists the preview preferences that
 you can modify.</para>
         <table frame="topbot" id="gosnautilus-TBL-41">
           <title>Preview Preferences</title>
@@ -3588,10 +2613,10 @@ you can modify.</para>
             <colspec colname="colspec1" colwidth="64.91*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Dialog Element</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description </para>
                 </entry>
               </row>
@@ -3624,7 +2649,7 @@ directory that is one level below the folder.</para>
               <row>
                 <entry colname="colspec0">
                   <para>
-                    <guimenu>Only for files smaller than</guimenu>
+                    <guilabel>Only for files smaller than</guilabel>
                   </para>
                 </entry>
                 <entry colname="colspec1">
@@ -3651,7 +2676,9 @@ files</guilabel>
                 </entry>
                 <entry colname="colspec1">
                   <para>Select an option to specify when to show the
-number of items in folders.</para>
+number of items in folders. If you have set your view to icon view, you might
+need to increase your default zoom level in the <guilabel>Views</guilabel>
+tabbed section to see the number of items in each folder.</para>
                 </entry>
               </row>
             </tbody>
@@ -3677,10 +2704,10 @@ screen components: </para>
           <para>Desktop</para>
         </listitem>
         <listitem>
-          <para>Side pane</para>
+          <para>Side pane and view pane of file browser windows</para>
         </listitem>
         <listitem>
-          <para>View pane</para>
+          <para>File object windows</para>
         </listitem>
         <listitem>
           <para>Panels</para>
@@ -3737,38 +2764,1279 @@ to choose the color. Click <guibutton>OK</guibutton> to add the new color
 to the <guilabel>Backgrounds and Emblems</guilabel> dialog.</para>
       </sect3>
     </sect2>
-    <sect2 id="gosnautilus-18">
-      <title>To Show and Hide Window Components</title>
+  </sect1>
+  <sect1 id="gosnautilus-28">
+    <title>Opening Files</title>
+    <indexterm>
+      <primary>file manager</primary>
+      <secondary>opening files</secondary>
+    </indexterm>
+    <para>When you open a file, the file manager performs the default
+action for that file type. The default action can be one of the following: </para>
+    <itemizedlist>
+      <listitem>
+        <para>Use a viewer component to display the file in the view pane.</para>
+      </listitem>
+      <listitem>
+        <para>Launch an application that opens the file.</para>
+      </listitem>
+    </itemizedlist>
+    <para>The file manager checks 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 file manager checks the file extension.</para>
+    <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>
+    <sect2 id="gosnautilus-447">
+      <title>Viewing Files in a Window</title>
       <indexterm>
         <primary>file manager</primary>
-        <secondary>window components, showing
-and hiding</secondary>
+        <secondary>viewing files in view
+pane</secondary>
       </indexterm>
-      <para>You can show and hide file manager
-window components as follows: </para>
+      <indexterm>
+        <primary>view pane</primary>
+        <secondary>viewing files in</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>viewer components</primary>
+      </indexterm>
+      <para>The file manager contains viewer components that
+enable you to display particular types of file in the view pane. For example,
+you can display the following types of files in the view pane:</para>
       <itemizedlist>
         <listitem>
-          <para>To hide the side pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Side Pane</guimenuitem></menuchoice>. To display the
-side pane again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Side Pane</guimenuitem></menuchoice> again. </para>
+          <para>Plain text files</para>
         </listitem>
         <listitem>
-          <para>To hide the toolbar, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>. To display the
-toolbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice> again. </para>
+          <para>PNG files</para>
         </listitem>
         <listitem>
-          <para>To hide the location bar, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Location Bar</guimenuitem></menuchoice>. To display
-the location bar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Location Bar</guimenuitem></menuchoice> again.</para>
+          <para>Joint Photographic Experts Group (JPEG) files</para>
         </listitem>
+      </itemizedlist>
+      <para>To reload the contents of the view pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>. To stop
+loading an item in the view pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Stop</guimenuitem></menuchoice>.</para>
+      <para>When you display a file in the view pane, the viewer component might
+add menu items to the file manager menus. The menu items relate to the file
+type that is displayed. For example, when you display a PNG file, the <guimenu>Edit</guimenu> menu contains flip and rotate menu items. </para>
+      <para>Also, when you display some types of file in the view pane, you can
+use the file manager zoom buttons to change the size of the item.</para>
+    </sect2>
+    <sect2 id="gosnautilus-29">
+      <title>To Execute the Default Action</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>executing default actions
+for files</secondary>
+      </indexterm>
+      <para>To execute the default action for a
+file, double-click on the file. For example, if the default action for plain
+text documents is to display the file in a text viewer. In this case, you
+can double-click on the file to  display the file in a text viewer.</para>
+      <para>You can set your file manager preferences so that you click once on
+a file to execute the default action. For more information, see <xref linkend="gosnautilus-56"/>.</para>
+    </sect2>
+    <sect2 id="gosnautilus-30">
+      <title>To Execute Non-Default Actions Using the Open With Submenu</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>executing non-default
+actions for files</secondary>
+      </indexterm>
+      <para>To execute actions other than
+the default action for a file, perform the following steps:</para>
+      <orderedlist>
         <listitem>
-          <para>To hide the statusbar, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Statusbar</guimenuitem></menuchoice>. To display the
-statusbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Statusbar</guimenuitem></menuchoice> again. </para>
+          <para>In the view pane, select the file that you want to perform
+an action on. Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open With</guimenuitem></menuchoice>. The <guisubmenu>Open With</guisubmenu>
+submenu opens. The items in this submenu correspond to the contents of the
+following parts of the <application>File Types and Programs</application>
+preference tool:</para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Default action</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog</para>
+            </listitem>
+            <listitem>
+              <para><guilabel>Viewer component</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog</para>
+            </listitem>
+          </itemizedlist>
         </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>
+          <para>Choose an action from the <guisubmenu>Open With</guisubmenu>
+submenu.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="gosnautilus-73">
+      <title>To Execute Other Actions When Displaying a File</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>executing other actions
+for files</secondary>
+      </indexterm>
+      <para>When you display a file in the view
+pane, the side pane might contain buttons.</para>
+      <para>The buttons represent any actions that are defined in the <application>File Types and Programs</application> preference tool. The actions are defined
+in the <guilabel>Default action</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog in the <application>File Types and Programs</application> preference tool. Click on a button to execute an action. For
+example, if an action defined for plain text documents is to open the file
+in the <application>gedit</application> text editor. If this action is defined,
+an <guibutton>Open with gedit</guibutton> button is displayed in the side
+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:</para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <guilabel>Open with Other Application</guilabel>
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <guilabel>Open with Other Viewer</guilabel>
+            </para>
+          </listitem>
+        </itemizedlist>
+      </note>
+    </sect2>
+    <sect2 id="gosnautilus-37">
+      <title>To Access FTP Sites</title>
+      <indexterm>
+        <primary>FTP sites</primary>
+        <secondary>accessing</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>FTP sites</secondary>
+        <see>FTP sites</see>
+      </indexterm>
+      <para>You can use the file manager 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>
+      <para>To reload the FTP site in the view pane, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>. To stop
+loading the FTP site, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Stop</guimenuitem></menuchoice>.</para>
+    </sect2>
+    <sect2 id="gosnautilus-465">
+      <title>To Access Network Places</title>
+      <indexterm>
+        <primary>network places</primary>
+        <secondary>accessing</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>network places</secondary>
+        <see>network places</see>
+      </indexterm>
+      <para>If your system is configured
+to access places on a network, you can use the file manager to access the
+network places. </para>
+      <para>To access network places, open the file manager and choose <menuchoice><guimenu>Places</guimenu><guimenuitem>Computer </guimenuitem></menuchoice>.
+Alternatively, double-click on the <guilabel>Computer</guilabel> object on
+the Desktop. Double-click on the <guilabel>Network</guilabel> object. A file
+manager window is displayed. The window displays the network places that you
+can access. Double-click on the network that you want to access. </para>
+      <para><indexterm><primary>NFS servers</primary><see>Unix network</see></indexterm>To
+access UNIX shares, double-click on the <guilabel>Unix Network (NFS) </guilabel>
+object. A list of the UNIX shares available to you is displayed in the file
+manager window.</para>
+      <para><indexterm><primary>Samba servers</primary><see>Windows network</see></indexterm>To access Windows shares, double-click on the <guilabel>Windows
+Network (SMB) </guilabel> object. A list of the Windows shares available to
+you is displayed in the file manager window.</para>
+      <sect3 id="gosnautilus-466">
+        <title>To Add a Network Place</title>
+        <para>To add a network place, perform the following steps:</para>
+        <orderedlist>
+          <listitem>
+            <para>Open the file manager and choose <menuchoice><guimenu>Places</guimenu><guimenuitem>Computer </guimenuitem></menuchoice>. Alternatively,
+double-click on the <guilabel>Computer</guilabel> object on the Desktop. A
+file object window is displayed.</para>
+          </listitem>
+          <listitem>
+            <para>Double-click on the <guilabel>Add Network Place</guilabel>
+object. The <guilabel>Add Network Place</guilabel> dialog is displayed. Enter
+the details of the server in the dialog, as follows:</para>
+            <informaltable frame="topbot">
+              <tgroup cols="2" colsep="0" rowsep="0">
+                <colspec colname="colspec0" colwidth="27.27*"/>
+                <colspec colname="colspec1" colwidth="72.73*"/>
+                <thead>
+                  <row rowsep="1">
+                    <entry>
+                      <para>Dialog Element</para>
+                    </entry>
+                    <entry>
+                      <para>Description </para>
+                    </entry>
+                  </row>
+                </thead>
+                <tbody>
+                  <row>
+                    <entry valign="top">
+                      <para>
+                        <guilabel>Location</guilabel>
+                      </para>
+                    </entry>
+                    <entry valign="top">
+                      <para>Use this text box to specify the location that you
+want to add. Alternatively, select one of the following locations from the
+drop-down list:<itemizedlist><listitem><para><guilabel>FTP Server</guilabel></para></listitem><listitem><para><guilabel>Web Folder</guilabel></para></listitem><listitem><para><guilabel>Windows Network (SMB)</guilabel></para></listitem><listitem><para><guilabel>Unix Network (NFS)</guilabel></para></listitem></itemizedlist></para>
+                    </entry>
+                  </row>
+                  <row>
+                    <entry valign="top">
+                      <para>
+                        <guilabel>Shortcut name</guilabel>
+                      </para>
+                    </entry>
+                    <entry valign="top">Use this text box to specify a shortcut name for the network place. </entry>
+                  </row>
+                  <row>
+                    <entry colname="colspec0">
+                      <para>
+                        <guilabel>Anonymous login </guilabel>
+                      </para>
+                    </entry>
+                    <entry colname="colspec1">
+                      <para>FTP Server option only. Select this option
+to log in to the FTP server as an anonymous user.</para>
+                    </entry>
+                  </row>
+                  <row>
+                    <entry colname="colspec0">
+                      <para>
+                        <guilabel> No login required</guilabel>
+                      </para>
+                    </entry>
+                    <entry colname="colspec1">
+                      <para>Web Folder, Windows Network (SMB), and Unix
+Network (NFS) options only. Select this option if you do not need to log in
+to the web folder, Windows share, or UNIX share.</para>
+                    </entry>
+                  </row>
+                  <row>
+                    <entry colname="colspec0">
+                      <para>
+                        <guilabel>Username</guilabel>
+                      </para>
+                    </entry>
+                    <entry colname="colspec1">
+                      <para>Use this text box to specify a username  when
+you connect to the specified network place.</para>
+                      <para>When you connect to
+the network place, you must enter your password.</para>
+                    </entry>
+                  </row>
+                  <row>
+                    <entry colname="colspec0">
+                      <para>
+                        <guilabel>Go there now</guilabel>
+                      </para>
+                    </entry>
+                    <entry colname="colspec1">
+                      <para>Select this option if you want to access the
+network place immediately.</para>
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </informaltable>
+          </listitem>
+          <listitem>
+            <para>Click <guibutton>OK</guibutton> to add your network place.</para>
+          </listitem>
+        </orderedlist>
+      </sect3>
+    </sect2>
+    <sect2 id="gosnautilus-508">
+      <title>To Access Network Servers</title>
+      <para>If your GNOME desktop environment is configured to access servers on
+a network, you can use the <guilabel>Applications</guilabel> menu to access
+the network servers.</para>
+      <para>To access network servers, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Network Servers</guimenuitem></menuchoice>. A file
+object window is displayed. The window displays the network servers that you
+can access. Double-click on the network server that you want to access.</para>
+      <sect3 id="gosnautilus-509">
+        <title>To Add a Network Server</title>
+        <para>To add a network server, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Network Servers</guimenuitem></menuchoice>.  A file
+object window is displayed. Double-click on the <guilabel>New Server</guilabel>
+object. A <guilabel>New Server </guilabel> dialog is displayed. Enter the
+name of the server in the dialog, then click <guibutton>OK</guibutton>.</para>
+      </sect3>
+    </sect2>
+  </sect1>
+  <sect1 id="gosnautilus-467">
+    <title>Accessing Special URI Locations</title>
+    <indexterm>
+      <primary>special URI locations</primary>
+      <secondary>accessing</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>file manager</primary>
+      <secondary>special URI
+locations</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>URI, special</primary>
+      <see>special URI locations</see>
+    </indexterm>
+    <para>The GNOME Desktop contains
+special URI locations that enable you to access particular functions from
+the file manager. For example, to access the preference tools, you can access
+the <command>preferences:///</command> URI in a file manager window. <xref linkend="gosnautilus-TBL-479"/> lists the special URI locations that you can
+use with the file manager.</para>
+    <table frame="topbot" id="gosnautilus-TBL-479">
+      <title>Special URI Locations</title>
+      <tgroup cols="2" colsep="0" rowsep="0">
+        <colspec colname="colspec0" colwidth="33.94*"/>
+        <colspec colname="colspec1" colwidth="66.06*"/>
+        <thead>
+          <row rowsep="1">
+            <entry>
+              <para>URI Location</para>
+            </entry>
+            <entry>
+              <para>Description</para>
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <command>applications:///</command>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Displays
+a list of the applications in the GNOME Desktop. The applications are the
+same as the applications in the <guimenu>Applications</guimenu> menu. To open
+an application, double-click on the application.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <command>fonts:///</command>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Displays all the fonts that are
+available in your system. To preview a font, double-click on the font. You
+can also use this location to add fonts to the GNOME Desktop.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <command>network:///</command>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Displays network locations to
+which you can connect, if your system is configured to access locations on
+a network. To access a network location, double-click on the network location.
+You can also use this URI to add network locations to your system.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <command>preferences:///</command>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Displays
+a list of the preference tools in the GNOME Desktop. The preference tools
+are the same as the preference tools in the <guimenu>Desktop Preferences</guimenu>
+menu. To open a preference tool, double-click on the preference tool.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <command>server-settings:///</command>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Displays
+a list of applications that you can use to configure your system as a server.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <command>start-here:///</command>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Displays
+a list of applications and preference tools in the GNOME Desktop. Also displays
+applications that you can use to configure your system as a server, and to
+modify your system configuration details.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <command>system-settings:///</command>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Displays
+a list of applications that you can use to modify your system settings.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <command>themes:///</command>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Displays all the themes that
+are available in the GNOME Desktop. To preview a theme, double-click on the
+theme. You can also use this location to add themes to the GNOME Desktop.</para>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </sect1>
+  <sect1 id="gosnautilus-8">
+    <title>Managing Your Files and Folders</title>
+    <indexterm>
+      <primary>file manager</primary>
+      <secondary>managing files and folders</secondary>
+    </indexterm>
+    <para>This section describes how to work with your
+files and folders.</para>
+    <sect2 id="gosnautilus-201">
+      <title>Drag-and-Drop in the File Manager</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>drag-and-drop</secondary>
+      </indexterm>
+      <para>You can use drag-and-drop to perform several tasks in the
+file manager. When you drag-and-drop, the mouse pointer provides feedback
+about the task that you perform. <xref linkend="gosnautilus-TBL-11"/> describes
+the tasks that you can perform with drag-and-drop. The table also shows the
+mouse pointers that appear when you drag-and-drop.</para>
+      <table frame="topbot" id="gosnautilus-TBL-11">
+        <title>Drag-and-Drop in the File Manager</title>
+        <tgroup cols="3" colsep="0" rowsep="0">
+          <colspec colname="colspec0" colwidth="36.36*"/>
+          <colspec colname="colspec2" colwidth="98.56*"/>
+          <colspec colname="colspec1" colwidth="28.70*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>Task</para>
+              </entry>
+              <entry colname="colspec2">
+                <para>Action</para>
+              </entry>
+              <entry colname="colspec1">
+                <para>Mouse Pointer</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>Move an item</para>
+              </entry>
+              <entry colname="colspec2" valign="top">
+                <para>Drag the item to the new location.</para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/move_pointer.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Move pointer.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>Copy an item</para>
+              </entry>
+              <entry colname="colspec2" valign="top">
+                <para>Grab the item, then press-and-hold <keycap>Ctrl</keycap>. Drag the item to the new location.</para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/copy_pointer.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Copy pointer.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>Create a symbolic link to
+an item</para>
+              </entry>
+              <entry colname="colspec2" valign="top">
+                <para>Grab the
+item, then press-and-hold <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>.
+Drag the item to the location where you want the symbolic link to reside.</para>
+              </entry>
+              <entry colname="colspec1" valign="top">
+                <screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/link_pointer.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Symbolic link pointer.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>Ask what to do with the
+item you drag</para>
+              </entry>
+              <entry colname="colspec2" valign="top">
+                <para>Grab the item, then press-and-hold <keycap>Alt</keycap>. Drag the item to
+the location where you want the item to reside. Release the mouse button.
+A popup menu appears. Choose one of the following items from the popup menu:</para>
+                <itemizedlist>
+                  <listitem>
+                    <para>
+                      <guimenuitem>Move here</guimenuitem>
+                    </para>
+                    <para>Moves the item to the location.</para>
+                  </listitem>
+                  <listitem>
+                    <para>
+                      <guimenuitem>Copy here</guimenuitem>
+                    </para>
+                    <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 desktop background.
+ 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>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/ask_pointer.png" format="PNG"/>
+                    </imageobject>
+                    <textobject>
+                      <phrase>Ask pointer.</phrase>
+                    </textobject>
+                  </mediaobject>
+                </screenshot>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </sect2>
+    <sect2 id="gosnautilus-202">
+      <title>To Select Files and Folders</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>selecting files and folders</secondary>
+      </indexterm>
+      <para>You can select files and folders in several
+ways in the file manager. <xref linkend="gosnautilus-TBL-10"/> describes how
+to select items in file manager windows and on the desktop.</para>
+      <table frame="topbot" id="gosnautilus-TBL-10">
+        <title>Selecting Items in the File Manager</title>
+        <tgroup cols="2" colsep="0" rowsep="0">
+          <colspec colname="colspec0" colwidth="36.36*"/>
+          <colspec colname="colspec2" colwidth="63.64*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>Task</para>
+              </entry>
+              <entry colname="colspec2">
+                <para>Action</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>Select an item</para>
+              </entry>
+              <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>In icon view,
+drag around the files that you want to select.</para>
+                <para>In list view, click
+on the first item in the group. Press-and-hold <keycap>Shift</keycap>, 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>.
+Click on the items that you want to select.</para>
+                <para>Alternatively, press-and-hold <keycap>Ctrl</keycap>, then drag around the files that you want to select.</para>
+              </entry>
+            </row>
+            <row>
+              <entry colname="colspec0" valign="top">
+                <para>Select all items in a folder</para>
+              </entry>
+              <entry colname="colspec2" valign="top">
+                <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All Files</guimenuitem></menuchoice>.</para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+      <para>To perform the default action on an item, double-click on the item.
+You can set your file manager preferences so that you click once on a file
+to execute the default action. For more information, see <xref linkend="gosnautilus-56"/>.</para>
+    </sect2>
+    <sect2 id="gosnautilus-9">
+      <title>To Move a File or Folder</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>moving files and folders</secondary>
+      </indexterm>
+      <para>The following sections describe the ways that
+you can move a file or folder.</para>
+      <sect3 id="gosnautilus-537">
+        <title>Drag to the New Location</title>
+        <para>To drag a file or folder to a new location, perform the following steps:</para>
+        <orderedlist>
+          <listitem>
+            <para>Open a file manager window. Choose <menuchoice><guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice> to open a second
+file manager window.</para>
+          </listitem>
+          <listitem>
+            <para>In one window, select the folder from which you want to move
+the file or folder. In the other window, select the folder to which you want
+to move the file or folder.</para>
+          </listitem>
+          <listitem>
+            <para>Drag the file or folder that you want to move to the new location
+in the other window.</para>
+          </listitem>
+        </orderedlist>
+        <para>To move the file or folder to a folder that is one level below the current
+location, do not open a new window. Instead, drag the file or folder to the
+new location in the same window.</para>
+      </sect3>
+      <sect3 id="gosnautilus-538">
+        <title>Cut and Paste to the New Location</title>
+        <para>You can cut a file or folder and paste the file or folder into another
+folder, as follows:</para>
+        <orderedlist>
+          <listitem>
+            <para>Select the file or folder that you want to move, then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Cut File</guimenuitem></menuchoice>.</para>
+          </listitem>
+          <listitem>
+            <para>Open the folder to which you want to move the file or folder,
+then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste
+Files</guimenuitem></menuchoice>.</para>
+          </listitem>
+        </orderedlist>
+      </sect3>
+    </sect2>
+    <sect2 id="gosnautilus-10">
+      <title>To Copy a File or Folder</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>copying files and folders</secondary>
+      </indexterm>
+      <para>The following sections describe the ways you
+can copy a file or folder.</para>
+      <sect3 id="gosnautilus-640">
+        <title>Drag to the New Location</title>
+        <para>To copy a file or folder perform the following steps:</para>
+        <orderedlist>
+          <listitem>
+            <para>Open a file manager window. Choose <menuchoice><guimenu>File</guimenu><guimenuitem>New Window</guimenuitem></menuchoice> to open a second
+file manager window.</para>
+          </listitem>
+          <listitem>
+            <para>In one window, select the folder from which you want to copy
+the file or folder. In the other window, select the folder to which you want
+to copy the file or folder.</para>
+          </listitem>
+          <listitem>
+            <para>Grab the file or folder, then press-and-hold <keycap>Ctrl</keycap>. Drag the file or 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, grab the file or folder, then
+press-and-hold <keycap>Ctrl</keycap>. 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>
+        <para>You can copy a file or folder and paste the file or folder into another
+folder, as follows:</para>
+        <orderedlist>
+          <listitem>
+            <para>Select the file or folder that you want to copy, then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy File</guimenuitem></menuchoice>.</para>
+          </listitem>
+          <listitem>
+            <para>Open the folder to which you want to copy the file or folder,
+then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste
+Files</guimenuitem></menuchoice>.</para>
+          </listitem>
+        </orderedlist>
+      </sect3>
+    </sect2>
+    <sect2 id="gosnautilus-82">
+      <title>To Duplicate a File or Folder</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>duplicating files and
+folders</secondary>
+      </indexterm>
+      <para>To create a copy of a file or folder
+in the current folder perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select the file or folder that you want to duplicate.</para>
+        </listitem>
+        <listitem>
+          <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Duplicate</guimenuitem></menuchoice>. Alternatively, right-click on the file
+or folder, then choose <guimenuitem>Duplicate</guimenuitem>.</para>
+          <para>A copy of the file or folder appears in the current folder.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="gosnautilus-11">
+      <title>To Create a Folder</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>creating folders</secondary>
+      </indexterm>
+      <para>To create a folder perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select the folder where you want to create the new folder.</para>
+        </listitem>
+        <listitem>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Create Folder</guimenuitem></menuchoice>. Alternatively, right-click
+on the background of the view pane, then choose <guimenuitem>Create Folder</guimenuitem>.</para>
+          <para>An <guilabel>untitled</guilabel> folder is added to the location. The
+name of the folder is selected.</para>
+        </listitem>
+        <listitem>
+          <para>Type a name for the folder, then press <keycap>Return</keycap>. </para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="gosnautilus-512">
+      <title>To Create a Document</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>creating documents</secondary>
+      </indexterm>
+      <para>If you have document templates installed, you can choose
+to create a document from one of the installed templates. You can also choose
+to create an empty document.</para>
+      <para>To create a document perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select the folder where you want to create the new document.</para>
+        </listitem>
+        <listitem>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Create Document</guimenuitem></menuchoice>. Alternatively, right-click on
+the background of the view pane, then choose <guimenuitem>Create Document</guimenuitem>.</para>
+          <para>An <guilabel>untitled</guilabel> document is added to the location. </para>
+        </listitem>
+        <listitem>
+          <para>Type a name for the document, then press <keycap>Return</keycap>. </para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="gosnautilus-12">
+      <title>To Rename a File or Folder</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>renaming folders</secondary>
+      </indexterm>
+      <para>To rename a file or folder perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select the file or folder that you want to rename.</para>
+        </listitem>
+        <listitem>
+          <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Rename</guimenuitem></menuchoice>. Alternatively, right-click on the file
+or folder, then choose <guimenuitem>Rename</guimenuitem>.</para>
+          <para>The name of the file or folder is selected.</para>
+        </listitem>
+        <listitem>
+          <para>Type a new name for the file or folder, then press <keycap>Return</keycap>.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="gosnautilus-13">
+      <title>To Move a File or Folder to Trash</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>Trash</secondary>
+        <see>Trash</see>
+      </indexterm>
+      <indexterm>
+        <primary>Trash</primary>
+        <secondary>moving
+files or folders to</secondary>
+      </indexterm>
+      <para>To move a file or folder
+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>.</para>
+        </listitem>
+        <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>
+      </orderedlist>
+      <para>Alternatively, you can drag the file or folder from the view pane to
+the <guilabel>Trash</guilabel> object on the desktop.</para>
+      <note>
+        <para>When you move a file or folder from a removable media to <guilabel>Trash</guilabel>, the file or folder is stored in a <guilabel>Trash</guilabel>
+location on the removable media. To remove the file or folder permanently
+from the removable media, you must empty <guilabel>Trash</guilabel>.</para>
+      </note>
+    </sect2>
+    <sect2 id="gosnautilus-443">
+      <title>To Delete a File or Folder</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>deleting files or folders</secondary>
+      </indexterm>
+      <para>When you delete a file or folder, the file or
+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>File Management 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.</para>
+        </listitem>
+        <listitem>
+          <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>. Alternatively, right-click on the file
+or folder, then choose <guimenuitem>Delete</guimenuitem>.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="gosnautilus-14">
+      <title>To Create a Symbolic Link to a File or Folder</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>creating symbolic link</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>symbolic link</primary>
+        <secondary>to file or folder, creating</secondary>
+      </indexterm>
+      <para>A symbolic link is
+a special type of file that points to another file or folder. When you perform
+an action on a symbolic 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>Edit</guimenu><guimenuitem>Make Link</guimenuitem></menuchoice>. A link to the
+file or folder is added to the current folder. </para>
+      <para>Alternatively, grab the item to which you want to create a link, then
+press-and-hold <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>. Drag the item
+to the location where you want to place the link.</para>
+      <para>By default, the file manager adds an emblem to symbolic links.</para>
+      <note>
+        <para>The permissions of a symbolic link are determined by the file
+or folder to which a symbolic link points.</para>
+      </note>
+    </sect2>
+    <sect2 id="gosnautilus-476">
+      <title>To View the Properties of a File or Folder</title>
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>viewing properties</secondary>
+      </indexterm>
+      <para>To view the properties of a file or folder, perform the
+following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select the file or folder whose properties you want to view. </para>
+        </listitem>
+        <listitem>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Use the properties dialog to view the properties of the file
+or folder. </para>
+        </listitem>
+        <listitem>
+          <para>Click <guibutton>Close</guibutton> to close the properties
+dialog.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="gosnautilus-430">
+      <title>To Change Permissions</title>
+      <indexterm>
+        <primary>permissions</primary>
+        <secondary>introduction</secondary>
+      </indexterm>
+      <para>Permissions are settings assigned to each file and folder
+that determine what type of access users can have to the file or folder. The
+following table lists the permissions that you can set for files and folders,
+and the effect of the permission on files and folders:</para>
+      <informaltable frame="topbot">
+        <tgroup cols="3" colsep="0" rowsep="0">
+          <colspec colwidth="29.62*"/>
+          <colspec colwidth="74.59*"/>
+          <colspec colname="colspec0" colwidth="74.59*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>Permission</para>
+              </entry>
+              <entry>
+                <para>File</para>
+              </entry>
+              <entry colname="colspec0">
+                <para>Folder</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry valign="top">
+                <para>Read</para>
+              </entry>
+              <entry valign="top">
+                <para>Permission to read the file.</para>
+              </entry>
+              <entry colname="colspec0" valign="top">
+                <para>Permission to list the contents of the folder.</para>
+              </entry>
+            </row>
+            <row>
+              <entry valign="top">
+                <para>Write</para>
+              </entry>
+              <entry valign="top">
+                <para>Permission to make changes to the file. </para>
+              </entry>
+              <entry colname="colspec0" valign="top">
+                <para>Permission to create and delete files in the folder.</para>
+              </entry>
+            </row>
+            <row>
+              <entry valign="top">
+                <para>Execute</para>
+              </entry>
+              <entry valign="top">
+                <para>Permission to run the file as a program. This is only relevant if the file
+is a program or script.</para>
+              </entry>
+              <entry colname="colspec0" valign="top">
+                <para>Permission to access files in the directory.</para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+      <para>You can set permissions for different types of user. The following table
+lists the types of user that you can set for which you can set permissions:</para>
+      <informaltable frame="topbot">
+        <tgroup cols="2" colsep="0" rowsep="0">
+          <colspec colwidth="27.27*"/>
+          <colspec colwidth="72.73*"/>
+          <thead>
+            <row rowsep="1">
+              <entry>
+                <para>User Category</para>
+              </entry>
+              <entry>
+                <para>Description</para>
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry valign="top">
+                <para>Owner</para>
+              </entry>
+              <entry valign="top">
+                <para>The user that created the file or folder.</para>
+              </entry>
+            </row>
+            <row>
+              <entry valign="top">
+                <para>Group</para>
+              </entry>
+              <entry valign="top">
+                <para>The group to which the owner belongs.</para>
+              </entry>
+            </row>
+            <row>
+              <entry valign="top">
+                <para>Others</para>
+              </entry>
+              <entry valign="top">
+                <para>All other users who are not in the group to which the owner belongs.</para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+      <para><indexterm><primary>file manager</primary><secondary>changing permissions</secondary></indexterm><indexterm><primary>permissions</primary><secondary>changing file and folder</secondary></indexterm>To change the permissions
+on a file or folder perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select the file or folder that you want to change. </para>
+        </listitem>
+        <listitem>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Click on the <guilabel>Permissions</guilabel> tab. In the <guilabel>Permissions</guilabel> tabbed section, use the drop-down lists and check boxes
+to change the permissions for the file or folder. The following table describes
+the dialog elements on the <guilabel>Permissions</guilabel> tabbed section: </para>
+          <informaltable frame="topbot">
+            <tgroup cols="2" colsep="0" rowsep="0">
+              <colspec colwidth="37.78*"/>
+              <colspec colwidth="62.22*"/>
+              <thead>
+                <row rowsep="1">
+                  <entry>
+                    <para>Element</para>
+                  </entry>
+                  <entry>
+                    <para>Description</para>
+                  </entry>
+                </row>
+              </thead>
+              <tbody>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>File owner</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>To change the owner of the file or folder, select
+the owner from the drop-down list. </para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>File group</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>To change the group to which a file or folder belongs,
+select the group from the drop-down list. </para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Owner</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Select the permissions that you want to apply to the owner
+of the file or folder.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Group</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Select the permissions that you want to apply to the group
+to which the owner of the file or folder belongs.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Others</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Select the permissions that you want to apply to
+all other users who are not in the group to which the owner belongs.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Text view</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Displays the permissions that you select from the <guilabel>Read</guilabel>, <guilabel>Write</guilabel>, and <guilabel>Execute</guilabel>
+options, in text format.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Number view</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Displays the permissions that you select from the <guilabel>Read</guilabel>, <guilabel>Write</guilabel>, and <guilabel>Execute</guilabel>
+options, in text format.</para>
+                  </entry>
+                </row>
+                <row>
+                  <entry valign="top">
+                    <para>
+                      <guilabel>Last changed</guilabel>
+                    </para>
+                  </entry>
+                  <entry valign="top">
+                    <para>Displays the date and time that the file or folder
+was last modified.</para>
+                  </entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
+        </listitem>
+        <listitem>
+          <para>Click <guibutton>Close</guibutton> to close the properties
+dialog.</para>
+        </listitem>
+      </orderedlist>
+    </sect2>
+    <sect2 id="gosnautilus-44">
+      <title>Using Trash</title>
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/naut_trash_launcher.png" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase>Trash icon, empty.</phrase>
+          </textobject>
+        </mediaobject>
+      </screenshot>
+      <indexterm>
+        <primary>Trash</primary>
+        <secondary>introduction</secondary>
+      </indexterm>
+      <para>You can move the following items to <guilabel>Trash</guilabel>:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Files</para>
+        </listitem>
+        <listitem>
+          <para>Folders</para>
+        </listitem>
+        <listitem>
+          <para>Desktop objects</para>
         </listitem>
       </itemizedlist>
+      <para>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>. When you empty <guilabel>Trash</guilabel>, you delete the
+contents of <guilabel>Trash</guilabel> permanently. </para>
+      <sect3 id="gosnautilus-107">
+        <title>To Display Trash</title>
+        <indexterm>
+          <primary>Trash</primary>
+          <secondary>displaying</secondary>
+        </indexterm>
+        <para>You can display the contents of <guilabel>Trash</guilabel> in the following
+ways:</para>
+        <itemizedlist>
+          <listitem>
+            <para>From a file manager window</para>
+            <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</para>
+            <para>Double-click on the <guilabel>Trash</guilabel> object on the desktop.</para>
+          </listitem>
+        </itemizedlist>
+      </sect3>
+      <sect3 id="gosnautilus-108">
+        <title>To Empty Trash</title>
+        <indexterm>
+          <primary>Trash</primary>
+          <secondary>emptying</secondary>
+        </indexterm>
+        <para>You can empty the contents of <guilabel>Trash</guilabel> in the following
+ways:</para>
+        <itemizedlist>
+          <listitem>
+            <para>From a file manager window</para>
+            <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Empty
+Trash</guimenuitem></menuchoice>.</para>
+          </listitem>
+          <listitem>
+            <para>From the desktop</para>
+            <para>Right-click on the <guilabel>Trash</guilabel> object, then choose <guimenuitem>Empty Trash</guimenuitem>.</para>
+          </listitem>
+        </itemizedlist>
+      </sect3>
     </sect2>
   </sect1>
   <sect1 id="gosnautilus-460">
@@ -3803,8 +4071,10 @@ that represents the media is added to the desktop. The object is added only
 if your system is configured to mount the device automatically when media
 is detected. </para>
       <para>If your system is not configured to mount the device automatically,
-you must mount the device manually. Right-click on the desktop, then choose <menuchoice><guimenu>Disks</guimenu><guimenuitem><replaceable>device-name</replaceable></guimenuitem></menuchoice>. For example, to mount a floppy diskette, choose <menuchoice><guimenu>Disks</guimenu><guimenuitem>Floppy</guimenuitem></menuchoice>.
-An object that represents the media is added to the desktop. </para>
+you must mount the device manually. Double-click on the <guilabel>Computer</guilabel> icon from the desktop. A <guilabel>Computer </guilabel> dialog
+is displayed. Double-click on the object that represents the media. For example,
+to mount a floppy diskette, double-click on the <guilabel>Floppy</guilabel>
+object. An object that represents the media is added to the desktop. </para>
       <note>
         <para>You cannot change the name of a removable media object.</para>
       </note>
@@ -3862,21 +4132,21 @@ For information on how to mount media, see <xref linkend="gosnautilus-462"/>.</p
         </listitem>
         <listitem>
           <para>Right-click on the object that represents the diskette on
-the desktop, then choose <guimenuitem>Format</guimenuitem>. A <guilabel>Format
-a Floppy</guilabel> dialog is displayed.</para>
+the desktop, then choose <guimenuitem>Format</guimenuitem>. A <guilabel>Floppy
+formatter</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
-          <para>Select your format options in the <guilabel>Format a Floppy</guilabel> dialog. The following table describes the elements on the dialog:</para>
+          <para>Select your format options in the <guilabel>Floppy formatter</guilabel> dialog. The following table describes the elements on the dialog:</para>
           <informaltable frame="topbot">
             <tgroup cols="2" colsep="0" rowsep="0">
               <colspec colname="colspec0" colwidth="34.54*"/>
               <colspec colname="colspec1" colwidth="65.46*"/>
               <thead>
                 <row rowsep="1">
-                  <entry valign="top">
+                  <entry>
                     <para>Dialog Element</para>
                   </entry>
-                  <entry valign="top">
+                  <entry>
                     <para>Description</para>
                   </entry>
                 </row>
@@ -4064,10 +4334,10 @@ dialog to specify how you want to write the CD, as follows:</para>
             <colspec colwidth="50*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Dialog Element</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Description</para>
                 </entry>
               </row>
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index ea697e1..b358561 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -2,81 +2,67 @@
   <title>Overview of the GNOME Desktop</title>
   <highlights>
     <para>This chapter introduces you to the features and main components
-of the GNOME Desktop. Before you start to use the desktop environment read
-this chapter to familiarize yourself with the various features, and how the
-main components work. The desktop environment is very configurable, so this
-chapter describes the typical default configuration, covering the following
-topics.</para>
+of the GNOME Desktop. Before you start to use the GNOME Desktop read this
+chapter to familiarize yourself with the various features, and how the main
+components work. The GNOME Desktop is very configurable, so this chapter describes
+the typical default configuration, covering the following topics.</para>
   </highlights>
   <sect1 id="gosoverview-5">
-    <title>Introducing Desktop Environment Components</title>
+    <title>Introducing GNOME Desktop Components</title>
     <indexterm>
-      <primary>desktop environment components, introducing</primary>
+      <primary>GNOME Desktop components, introducing</primary>
     </indexterm>
-    <para>When you start a desktop environment session for the first
-time, you should see a default startup screen, with panels, windows, and various
-icons. <xref linkend="gosoverview-FIG-1"/> shows a typical desktop environment. </para>
-    <figure id="gosoverview-FIG-1">
-      <title>A Typical Desktop Environment</title>
-      <screenshot>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/typical_anno_desktop.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase>A typical desktop environment. Callouts: Menu Bar, Top edge panel, Desktop, Windows, Window List applet, Bottom edge panel, Workspace Switcher applet.</phrase>
-          </textobject>
-        </mediaobject>
-      </screenshot>
-    </figure>
-    <para>The major components of the desktop environment are as follows: <itemizedlist><listitem><para>Panels</para><para>Panels are areas in your desktop environment from which you can access
-all of your system applications and menus. Panels are very configurable. A
-particularly important panel in <xref linkend="gosoverview-FIG-1"/> is the
-top edge panel. The top edge panel includes the <application>Menu Bar</application>.
-The <application>Menu Bar</application> contains two special menus, as follows:</para><itemizedlist><listitem><para><guimenu>Applications</guimenu> menu: Contains all applications
+    <para>When you start a GNOME Desktop session for the first time, you should
+see a default startup screen, with panels, windows, and various icons. </para>
+    <para>The major components of the GNOME Desktop are as follows: <itemizedlist><listitem><para>Panels</para><para>Panels are areas in the GNOME Desktop from which you can access all
+of your system applications and menus. Panels are very configurable. </para><para>A particularly important panel is the top edge panel. The top edge panel includes
+the <application>Menu Bar</application>. The <application>Menu Bar</application>
+contains 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 the
 help browser. To start the file manager, choose <guimenuitem>Home Folder</guimenuitem>
 from the <guimenu>Applications</guimenu> menu.</para></listitem><listitem><para><guimenu>Actions</guimenu> menu: Contains various commands
-that perform desktop environment functions, for example <guimenuitem>Search
-for Files</guimenuitem> and <guimenuitem>Log Out</guimenuitem>. </para></listitem></itemizedlist><para>Click on the icon at the extreme right of the top edge panel to display
-a list of all open windows.</para></listitem><listitem><para>Menus</para><para>You can access all desktop environment functions through menus. The
-top edge panel contains 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 standard
-applications, commands, and configuration options. </para><para>You can also access almost all of the standard applications, commands,
-and configuration options from the <guimenu>Main Menu</guimenu>. You can access
-the items in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu>
-menus from the <guimenu>Main Menu</guimenu>. You can add the <guimenu>Main
-Menu</guimenu> as a button to your panels.</para></listitem><listitem><para>Windows</para><para>You can display many windows at the same time. You can run different
+that perform various functions, for example <guimenuitem>Search for Files</guimenuitem>
+and <guimenuitem>Log Out</guimenuitem>. </para></listitem></itemizedlist><para>Click on the <guibutton>Window Selector</guibutton> icon
+at the extreme right of the top edge panel to display a list of all open windows.</para></listitem><listitem><para>Menus</para><para>You can access all GNOME Desktop functions through menus. You can use
+the <guimenu>Applications</guimenu> menu to access almost all of the standard
+applications, commands, and configuration options. You can access the <guimenu>Applications</guimenu> menu from the <guimenu>Main Menu</guimenu> and from
+the <application>Menu Bar</application> applet. You can add the <guimenu>Main Menu</guimenu> and the <application>Menu Bar</application> applet to
+your panels.</para><para>The <application>Menu Bar</application> applet contains an <guimenu>Actions</guimenu> menu. The <guimenu>Actions</guimenu> menu contains commands
+that perform various functions, for example <guimenuitem>Search for Files</guimenuitem>
+and <guimenuitem>Log Out</guimenuitem>. The items in the <guimenu>Actions</guimenu> menu are at the top level of the <guimenu>Main Menu</guimenu>.</para></listitem><listitem><para>Windows</para><para>You can display many windows at the same time. You can run different
 applications in each window. The window manager provides frames 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 environment into separate <firstterm>workspaces</firstterm>. A workspace is a discrete area in which you can work.
-You can specify the number of workspaces in your desktop environment. You
-can switch to a different workspace, but you can only display one workspace
-at a time.</para></listitem><listitem><para><application>Nautilus</application> file manager</para><para>The <application>Nautilus</application> file manager provides an integrated
+as move, close, and resize windows. </para></listitem><listitem><para>Workspaces</para><para>You can subdivide the GNOME Desktop into separate <firstterm>workspaces</firstterm>. A workspace is a discrete area in which you can work. You can
+specify the number of workspaces in the GNOME Desktop. You can switch to a
+different workspace, but you can only display one workspace at a time.</para></listitem><listitem><para><application>Nautilus</application> file manager</para><para>The <application>Nautilus</application> file manager provides an integrated
 access point to your files and applications. You can display the contents
 of your files within a file manager window, or open the files in the appropriate
 application from the file manager. You can use the file manager to manage
-your files and folders. </para></listitem><listitem><para>Desktop</para><para>The desktop is behind all of the other components on the desktop. The
+your files and folders. </para><para>The file manager enables you to browse and to navigate your files and
+folders using the following two methods:</para><itemizedlist><listitem><para>Browser display</para><para>The file browser manager enables you to navigate between folders by
+changing the current location of the file manager within a browser window. </para></listitem><listitem><para>Object display</para><para>The file object manager displays every folder as an object, and each
+object is displayed in a file object window. Each folder object has a  separate
+window.</para></listitem></itemizedlist></listitem><listitem><para>Desktop</para><para>The desktop is behind all of the other components on the desktop. The
 desktop is an active component of the user interface. You can place objects
 on the desktop to quickly access  your files and directories, or to start
 applications that you use often. You can also right-click on the desktop 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 desktop environment. You can access your
-GNOME applications and configuration tools from the <guilabel>Start Here</guilabel>
+to some of the key features of the GNOME Desktop. You can access your GNOME
+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 environment preferences</para><para>The desktop environment contains dedicated <firstterm>preference tools</firstterm>. Each tool controls a particular part of the behavior of the
-desktop environment. To start a preference tool, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the item that you want to configure from the submenus.</para></listitem></itemizedlist></para>
-    <para>The most powerful features of the desktop environment are the high degree
+as a server, and to modify other system configuration details.</para></listitem><listitem><para>Preferences</para><para>The GNOME Desktop contains dedicated <firstterm>preference tools</firstterm>.
+Each tool controls a particular part of the behavior of the GNOME Desktop. To
+start a preference tool, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the item that you want to configure
+from the submenus.</para></listitem></itemizedlist></para>
+    <para>The most powerful features of the GNOME Desktop are the high degree
 of configurability and the multiple ways that you can perform tasks.</para>
-    <para>The desktop environment provides interoperability of the desktop environment
-components. Usually, you can perform the same action in several different
-ways. For example, you can start applications from panels, from menus, or
-from the desktop.</para>
+    <para>The components of the GNOME Desktop are interoperable. Usually, you
+can perform the same action in several different ways. For example, you can
+start applications from panels, from menus, or from the desktop.</para>
     <para>Your system administrator can make configuration changes to suit your
-needs, so that the desktop environment might not be exactly the same as described
-in this chapter. Nevertheless, this chapter provides a useful quick guide
-to how to work with the desktop environment. </para>
+needs, so that the GNOME Desktop that you use might not be exactly the same
+as described in this chapter. Nevertheless, this chapter provides a useful
+quick guide to how to work with the GNOME Desktop. </para>
   </sect1>
   <sect1 id="gosoverview-502">
     <title>Panels</title>
@@ -85,8 +71,7 @@ to how to work with the desktop environment. </para>
       <secondary>overview</secondary>
     </indexterm>
     <para>You can add or delete panels at any time. When you start a session for
-the first time, the desktop environment usually contains a panel at the top
-edge of the screen, and a panel at the bottom edge of the screen. </para>
+the first time, the GNOME Desktop contains at least one panel. </para>
     <para>You can perform the following actions with panels:</para>
     <itemizedlist>
       <listitem>
@@ -107,9 +92,9 @@ edge of the screen, and a panel at the bottom edge of the screen. </para>
     </itemizedlist>
     <sect2 id="gosoverview-26">
       <title>To Create Panels</title>
-      <para>To add a panel, right-click on a vacant space on any panel, then choose <guimenuitem>New Panel</guimenuitem>. The new panel is added to your desktop environment.
-The new panel contains no objects. You can customize the new panel to suit
-your preferences. You can add objects to the panel to fit your own requirements.
+      <para>To add a panel, right-click on a vacant space on any panel, then choose <guimenuitem>New Panel</guimenuitem>. The new panel is added to the GNOME Desktop. The
+new panel contains no objects. You can customize the new panel to suit your
+preferences. You can add objects to the panel to fit your own requirements.
 You can also change the background of the panel. You can create as many panels
 as you want.</para>
     </sect2>
@@ -153,9 +138,27 @@ you can operate with the mouse or keyboard. The following applets appear in
 your panels by default:</para>
           <itemizedlist>
             <listitem>
-              <para><application>Menu Bar</application>: Provides access to the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu. You can
-use the menus to access your applications, preference tools, and other desktop
-environment tasks.</para>
+              <para><application>Menu Bar</application>:
+Provides access to the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu. You can use the menus to access your applications,
+preference tools, and other tasks.</para>
+            </listitem>
+            <listitem>
+              <para><application>Browse Filesystem</application>: Displays a file manager browser window. You
+can navigate between folders by changing the current location of the file
+manager within the file manager browser window.</para>
+            </listitem>
+            <listitem>
+              <para><application>Terminal</application>: Displays a <guilabel>Terminal</guilabel>
+window to enable access to the command line.</para>
+            </listitem>
+            <listitem>
+              <para><application>Clock</application>: Displays the time. You can
+also configure <application>Clock</application> to display the date.</para>
+            </listitem>
+            <listitem>
+              <para><application>Window Selector</application>: Lists all your
+open windows. To give focus to a window, click on the window selector icon
+at the extreme right of the top edge panel, then choose the window.</para>
             </listitem>
             <listitem>
               <para><application>Window List</application>: Displays a button
@@ -207,9 +210,9 @@ space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guim
 the launcher to add from the submenus.</para>
         </listitem>
         <listitem>
-          <para>Buttons</para>
+          <para>Action buttons</para>
           <para>You can add buttons to your panels to provide quick access to common
-functions. You can add the following buttons to your panels:</para>
+actions. You can add the following buttons to your panels:</para>
           <itemizedlist>
             <listitem>
               <para><guibutton>Force Quit</guibutton>: Use this button to terminate
@@ -231,7 +234,7 @@ your session</para>
 take a screenshot of the screen.</para>
             </listitem>
             <listitem>
-              <para><guibutton>Search</guibutton>: Click on this button to open
+              <para><guibutton>Search</guibutton>: Click on this button to start
 the <application>Search Tool</application> application, from which you can
 search for files. </para>
             </listitem>
@@ -240,18 +243,18 @@ search for files. </para>
 to minimize all windows and show the desktop.</para>
             </listitem>
           </itemizedlist>
-          <para>To add the buttons to a panel, right-click on a vacant space on the
-panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Actions</guimenuitem></menuchoice>. You can then choose the button you require. </para>
+          <para>To add a button to a panel, right-click on a vacant space on the panel,
+then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Actions</guimenuitem></menuchoice>. You can then choose the button you require. </para>
         </listitem>
         <listitem>
           <para>Menus</para>
-          <para>You can access all desktop environment functions through menus. The
-default panels contain menus, so you can use a combination of menus and panels
-to perform your tasks. To open a menu from a panel, click on the icon that
-represents the menu. To open a menu from the <application>Menu Bar</application>,
-click on the text that represents the menu. </para>
+          <para>You can access all GNOME Desktop functions through menus. To open a
+menu from a panel, click on the icon that represents the menu. To open a menu
+from the <application>Menu Bar</application>, click on the text that represents
+the menu. </para>
           <para>Menus that you add to your panels are represented by an icon with an
-arrow. The arrow indicates that the icon represents a menu. The icon in <xref linkend="gosoverview-FIG-28"/> is the icon that is displayed when you add the <guimenuitem>Desktop Preferences</guimenuitem> menu to a panel.</para>
+arrow. The arrow indicates that the icon represents a menu. For example, see
+the menu icon in <xref linkend="gosoverview-FIG-28"/>.</para>
           <para>You can add the <guimenu>Main Menu</guimenu> to any of your panels.
 To add the <guimenu>Main Menu</guimenu> to a panel, right-click on a vacant
 space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>.</para>
@@ -297,31 +300,36 @@ item is a launcher right-click on the menu item, then choose <guimenuitem>Add th
       <primary>menus</primary>
       <secondary>overview</secondary>
     </indexterm>
-    <para>You can access all desktop environment functions through menus. Your
-default panels contain menus, so you can use a combination of menus and panels
-to perform your tasks. The top edge panel contains the <application>Menu Bar</application>. The <application>Menu Bar</application> contains <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus. </para>
-    <para>You can use the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu to access almost all of the standard applications,
-commands, and configuration options. You can also access the items in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus from the <guimenu>Main Menu</guimenu>.</para>
-    <para>To add a <application>Menu Bar</application> to a panel, right-click
-on the panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Menu Bar</guimenuitem></menuchoice>.</para>
-    <para>To add a <guimenu>Main Menu</guimenu> to a panel, right-click on the
-panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>. The <guimenu>Main Menu</guimenu> is
-represented by a stylized footprint, as follows:</para>
-    <screenshot>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/footprint_icon.png" format="PNG"/>
-        </imageobject>
-        <textobject>
-          <phrase>Main Menu icon.</phrase>
-        </textobject>
-      </mediaobject>
-    </screenshot>
-    <para>Click on the <guibutton>Main Menu</guibutton> button on a panel to open
-the <guimenu>Main Menu</guimenu>. </para>
-    <para>You can add as many additional menus as you want to any of your panels.
+    <para>You can access all GNOME Desktop functions through menus. You can access
+your menus from the following GNOME Desktop components:</para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <guimenu>Main Menu</guimenu>
+        </para>
+        <para>The <guimenu>Main Menu</guimenu> contains the <guimenu>Applications</guimenu> menu, and various other functions. You can use the <guimenu>Applications</guimenu> menu to access almost all of the standard applications, commands,
+and configuration options. </para>
+        <para>To add a <guimenu>Main Menu</guimenu> to a panel, right-click on the
+panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>. Click on the <guibutton>Main Menu</guibutton>
+button on a panel to open the <guimenu>Main Menu</guimenu>. </para>
+      </listitem>
+      <listitem>
+        <para>
+          <application>Menu Bar</application>
+        </para>
+        <para><application>Menu Bar</application> contains <guimenu>Applications</guimenu>
+and <guimenu>Actions</guimenu> menus. You can use the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu to access almost all
+of the standard applications, commands, and configuration options. </para>
+        <para>To add <application>Menu Bar</application> to a panel, right-click on
+the panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Menu Bar</guimenuitem></menuchoice>.</para>
+      </listitem>
+      <listitem>
+        <para>Panels</para>
+        <para>You can add as many additional menus as you want to any of your panels.
 To open a menu that you add to a panel, click on the menu icon on the panel.
 You can perform other actions on your menus, such as copy menu items to panels.</para>
+      </listitem>
+    </itemizedlist>
   </sect1>
   <sect1 id="gosoverview-18">
     <title>Windows</title>
@@ -329,12 +337,12 @@ You can perform other actions on your menus, such as copy menu items to panels.<
       <primary>windows</primary>
       <secondary>overview</secondary>
     </indexterm>
-    <para>You can display many windows at the same time in your desktop environment.
+    <para>You can display many windows at the same time in the GNOME Desktop.
 Each window has a frame. The window frame contains active control elements
 that you can use to work with the window.</para>
     <sect2 id="gosoverview-16">
       <title>Types of Windows</title>
-      <para>The desktop environment features the following types of window:</para>
+      <para>The GNOME Desktop features the following types of window:</para>
       <itemizedlist>
         <listitem>
           <para>Application windows</para>
@@ -524,16 +532,15 @@ Switcher</application> display.</para>
       <primary>workspaces</primary>
       <secondary>overview</secondary>
     </indexterm>
-    <para>You can display many windows at the same time in your desktop environment.
-Your windows are displayed in subdivisions of your desktop environment that
-are called workspaces. A workspace is a discrete area in which you can work. </para>
+    <para>You can display many windows at the same time in your GNOME Desktop.
+Your windows are displayed in subdivisions of the GNOME Desktop that are called
+workspaces. A workspace is a discrete area in which you can work. </para>
     <para>Every workspace contains the same desktop, 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 in
-your desktop environment but you can have windows open in other workspaces.
- </para>
-    <para>Workspaces enable you to organize the desktop environment when you run
-many applications at the same time. When your current workspace becomes crowded
+the GNOME Desktop but you can have windows open in other workspaces.  </para>
+    <para>Workspaces enable you to organize the GNOME 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>Workspaces are displayed in the <application>Workspace Switcher</application>
@@ -580,10 +587,9 @@ workspace.</para>
         <primary>workspaces</primary>
         <secondary>specifying number of</secondary>
       </indexterm>
-      <para>To add workspaces to your desktop environment, 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 that you require.</para>
+      <para>To add workspaces to the GNOME 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 that you require.</para>
     </sect2>
   </sect1>
   <sect1 id="gosoverview-56">
@@ -598,39 +604,33 @@ box to specify the number of workspaces that you require.</para>
     </indexterm>
     <para>The <application>Nautilus</application> file
 manager provides an integrated access point to your files, applications, FTP
-sites, and URIs. To open a file manager window, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Home Folder</guimenuitem></menuchoice>.
-The following figure shows a file manager window that displays the contents
-of a folder.</para>
-    <screenshot>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/naut_iconview_window.png" format="PNG"/>
-        </imageobject>
-        <textobject>
-          <phrase>A sample file manager window. The context describes the graphic.</phrase>
-        </textobject>
-      </mediaobject>
-    </screenshot>
-    <para>A file manager window contains the following panes:</para>
+sites, and URIs. </para>
+    <para>The file manager contains two methods by which you can navigate and
+access your files and folders. </para>
+    <para>The file browser manager enables you to navigate between folders by
+changing the current location of the file manager within a browser window. </para>
+    <para>The file object manager displays every folder as an object, and each
+object is represented by a file object window</para>
+    <para>A file manager window can contain the following panes:</para>
     <variablelist>
       <varlistentry>
         <term>Side pane</term>
         <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>
+file or folder. The side pane is on the left side of the file browser window.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>View pane</term>
         <listitem>
           <para>Displays the contents
-of files and folders. The view pane is on the right side of the window.</para>
+of files and folders. The view pane is on the right side of both the file
+browser and file object windows.</para>
         </listitem>
       </varlistentry>
     </variablelist>
-    <para><application>Nautilus</application> enables you to do
-the following:</para>
+    <para>The file manager enables you to do the following:</para>
     <itemizedlist>
       <listitem>
         <para>View files and folders</para>
@@ -673,14 +673,21 @@ the location to a CD easily.</para>
     <sect2 id="gosoverview-58">
       <title>To Open Files From the File Manager</title>
       <para>To navigate to the folder where the file that you want to open resides,
-double-click on the folder icons in the view pane. When the file that you
-want to open is displayed, double-click on the file icon to open the file.</para>
+double-click on the folder icons in the view pane from the file browser window.
+When the file that you want to open is displayed, double-click on the file
+icon to open the file.</para>
+      <para>To navigate files and folders from the file object window, double-click
+on the object.</para>
+      <para>A file object window is displayed as a separate window for the object.</para>
     </sect2>
     <sect2 id="gosoverview-57">
       <title>To Move Files Between Folders</title>
       <para>You can move files between folders by opening two or more file manager
 windows. Open a different folder in each window, then drag the files from
 one window to the other. </para>
+      <para>From the side pane in the file browser window, select <guilabel>Tree</guilabel> from the drop-down list. Select the files that you want to move
+in the view pane, then drag the files to the appropriate folder displayed
+in the side pane.</para>
     </sect2>
   </sect1>
   <sect1 id="gosgetstarted-11">
@@ -693,8 +700,8 @@ one window to the other. </para>
       <primary>desktop</primary>
       <secondary>overview</secondary>
     </indexterm>
-    <para>The desktop is an active component of the desktop. You can use the desktop
-to perform the following actions:</para>
+    <para>The desktop is an active component of the user interface. You can use
+the desktop to perform the following actions:</para>
     <itemizedlist>
       <listitem>
         <para>Start your applications, and open your files and folders. </para>
@@ -779,11 +786,11 @@ Menu</guimenu>.</para>
           <guilabel>Desktop Preferences</guilabel>
         </para>
         <para>Double-click on <guilabel>Desktop Preferences</guilabel> to customize
-your desktop environment. </para>
+the GNOME Desktop. </para>
       </listitem>
       <listitem>
         <para>Programs that enable you to configure your system as a server,
-and to choose other system settings.</para>
+and to modify other system configuration details.</para>
       </listitem>
     </itemizedlist>
     <para>You can access the <guilabel>Start Here</guilabel> location in the following
@@ -803,34 +810,18 @@ in a file manager window.</para>
     </itemizedlist>
   </sect1>
   <sect1 id="gosoverview-55">
-    <title>Desktop Environment Preferences</title>
+    <title>GNOME Desktop Preferences</title>
     <indexterm>
       <primary>preference tools</primary>
       <secondary>overview</secondary>
     </indexterm>
-    <para>You can use desktop environment preference tools to configure
-almost every feature of the desktop environment. Each tool controls a particular
-part of the behavior of the desktop environment. For example, you can use
-a preference tool to select a theme for your desktop environment. A <firstterm>theme</firstterm> 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>
-      <listitem>
-        <para>
-          <guilabel>Advanced</guilabel>
-        </para>
-      </listitem>
-    </itemizedlist>
-    <para>You can open your desktop environment preference tools in either of
-the following ways:</para>
+    <para>You can use preference tools to configure almost every feature
+of the GNOME Desktop. Each tool controls a particular part of the behavior
+of the GNOME Desktop. For example, you can use a preference tool to select
+a theme for the GNOME Desktop. A <firstterm>theme</firstterm> is a group of
+coordinated settings that specify the visual appearance of a part of your
+interface. </para>
+    <para>You can start your preference tools in either of the following ways:</para>
     <itemizedlist>
       <listitem>
         <para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the item
@@ -911,11 +902,11 @@ editor. </para>
       <primary>help</primary>
       <secondary>how to find</secondary>
     </indexterm>
-    <para>The desktop environment provides help if you want to find out more about
-the following areas: </para>
+    <para>The GNOME Desktop provides help if you want to find out more about the
+following areas: </para>
     <itemizedlist>
       <listitem>
-        <para>Desktop environment topics</para>
+        <para>GNOME Desktop topics</para>
       </listitem>
       <listitem>
         <para>Applets</para>
@@ -925,19 +916,18 @@ the following areas: </para>
       </listitem>
     </itemizedlist>
     <sect2 id="gosoverview-31">
-      <title>To Find Out More About Desktop Environment Topics</title>
+      <title>To Find Out More About GNOME Desktop Topics</title>
       <indexterm>
         <primary>help</primary>
         <secondary>starting help system</secondary>
       </indexterm>
       <indexterm>
         <primary>help</primary>
-        <secondary>desktop environment
-topics</secondary>
+        <secondary>GNOME Desktop topics</secondary>
       </indexterm>
-      <para>You can find out more about particular
-desktop environment topics in the integrated <application>Yelp</application>
-help system. To start the <application>Yelp</application> help system, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Help</guimenuitem></menuchoice>. </para>
+      <para>You can find out more about particular GNOME
+Desktop topics in the integrated help system. To start
+the help system, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Help</guimenuitem></menuchoice>. </para>
     </sect2>
     <sect2 id="gosgetstarted-33">
       <title>To Find Out More About Applets</title>
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index 1782f33..9317355 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -9,48 +9,48 @@
       <primary>panels</primary>
       <secondary>introduction</secondary>
     </indexterm>
-    <para>A panel is an area in your desktop environment from which you can run
-applications and applets, and perform other tasks. When you start a session
-for the first time, the desktop environment contains at least one panel. Your
-system administrator might have set your default panels according to your
-local requirements, so you might see slightly different default panels.</para>
+    <para>A panel is an area in the GNOME Desktop from which you can run applications
+and applets, and perform other tasks. When you start a session for the first
+time, the GNOME Desktop contains at least one panel. Your system administrator
+might have set your default panels according to your local requirements, so
+you might see slightly different default panels.</para>
     <para>You can change the behavior and appearance of your panels to suit your
 requirements. You can also add or remove objects from your panels. You can
 create multiple panels, and choose different properties, objects, and backgrounds
 for each panel. You can also hide panels.</para>
-    <para>Typically, the GNOME Desktop contains a panel at the top edge of the
-screen, and a panel at the bottom edge of the screen. The following sections
-describe these panels.</para>
+    <para>Typically, the GNOME Desktop contains a panel at the top edge of the screen,
+and a panel at the bottom edge of the screen. The following sections describe
+these panels.</para>
     <sect2 id="gospanel-6">
       <title>Top Edge Panel</title>
       <para><indexterm><primary>panels</primary><secondary>top edge panel</secondary><see>top edge panel</see></indexterm><indexterm><primary>top edge panel</primary><secondary>introduction</secondary></indexterm><xref linkend="gospanel-FIG-60"/>
-shows the panel at the top edge of the screen. Your system administrator might
-have set your default top edge panel according to your local requirements,
+shows an example panel at the top edge of the screen. Your system administrator
+might have set your default top edge panel according to your local requirements,
 so you might see a slightly different top edge panel. </para>
       <figure id="gospanel-FIG-60">
-        <title>Typical Top Edge Panel</title>
+        <title>Sample Top Edge Panel</title>
         <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/menu_panel.png" format="PNG"/>
             </imageobject>
             <textobject>
-              <phrase>Typical top edge panel. The context describes the graphic.</phrase>
+              <phrase>Sample top edge panel. The context describes the graphic.</phrase>
             </textobject>
           </mediaobject>
         </screenshot>
       </figure>
-      <para>The typical top edge panel contains the following objects: <indexterm><primary>top edge panel</primary><secondary>default contents</secondary></indexterm></para>
+      <para>A top edge panel may contain the following objects: <indexterm><primary>top edge panel</primary><secondary>default contents</secondary></indexterm></para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colname="colspec3" colwidth="30.95*"/>
           <colspec colname="colspec4" colwidth="69.05*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Object</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Description </para>
               </entry>
             </row>
@@ -61,17 +61,18 @@ so you might see a slightly different top edge panel. </para>
                 <para><application>Menu Bar</application> applet</para>
               </entry>
               <entry colname="colspec4">
-                <para>Contains the <guimenu>Applications</guimenu> and the <guimenu>Actions</guimenu> menu. The <guimenu>Applications</guimenu> menu contains the standard GNOME applications. The <guimenu>Actions</guimenu> menu provides commands that enable you to perform desktop environment
-tasks.</para>
+                <para>Contains the <guimenu>Applications</guimenu> and the <guimenu>Actions</guimenu> menu. The <guimenu>Applications</guimenu> menu contains the standard GNOME applications. The <guimenu>Actions</guimenu> menu provides commands that enable you to various tasks.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec3">
-                <para>Home folder launcher</para>
+                <para>
+                  <application>Browse Filesystem</application>
+                </para>
               </entry>
               <entry colname="colspec4">
-                <para>Click on this launcher to open your home folder in
-a <application>Nautilus</application> file manager window. </para>
+                <para>Click on this launcher to open your home folder
+in a <application>Nautilus</application> file browser manager window.</para>
               </entry>
             </row>
             <row>
@@ -107,13 +108,12 @@ applet</para>
                   <primary>top edge panel</primary>
                   <secondary>window list icon</secondary>
                 </indexterm>
-                <para>Window
-list icon</para>
+                <para><application>Window Selector</application> applet</para>
               </entry>
               <entry colname="colspec4" valign="top">
-                <para>The window
-list is a list of all your open windows. To give focus to a window, click
-on the icon at the extreme right of the top edge panel, then choose the window.</para>
+                <para><application>Window Selector</application> lists all your
+open windows. To give focus to a window, click on the window selector icon
+at the extreme right of the top edge panel, then choose the window.</para>
               </entry>
             </row>
           </tbody>
@@ -184,9 +184,9 @@ you to navigate between your workspaces.</para>
         <primary>panels</primary>
         <secondary>adding new</secondary>
       </indexterm>
-      <para>To add a panel, right-click on a vacant space on any panel, then choose <guimenuitem>New Panel</guimenuitem>. The new panel is added to your desktop environment.
-The new panel contains no objects. You can customize the new panel to suit
-your preferences.</para>
+      <para>To add a panel, right-click on a vacant space on any panel, then choose <guimenuitem>New Panel</guimenuitem>. The new panel is added to the GNOME Desktop. The
+new panel contains no objects. You can customize the new panel to suit your
+preferences.</para>
     </sect2>
     <sect2 id="gospanel-11">
       <title>To Interact With a Panel</title>
@@ -267,12 +267,12 @@ panel to autohide, modify the properties of the panel.</para>
         <secondary>modifying properties</secondary>
       </indexterm>
       <para>To modify preferences for all panels, use the <guilabel>Panel</guilabel> preference tool to make the changes that you require. For
-example, you can specify various settings related to the appearance and behavior
-of panel objects. </para>
+example, you can modify animation preferences for panels. </para>
       <para>You can also modify properties for each individual panel. You can change
-the features for each panel, such as the type of the panel, the hide behavior,
+the features for each panel, such as the position of the panel, the hide behavior,
 and the visual appearance. </para>
-      <para>To modify the properties of a panel perform the following steps: </para>
+      <para>To modify the properties of a panel, perform the following
+steps: </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>
@@ -301,10 +301,10 @@ dialog elements on the <guilabel>General</guilabel> tabbed section: </para>
               <colspec colname="colspec1" colwidth="71.43*"/>
               <thead>
                 <row rowsep="1">
-                  <entry valign="top">
+                  <entry>
                     <para>Dialog Element</para>
                   </entry>
-                  <entry valign="top">
+                  <entry>
                     <para>Description </para>
                   </entry>
                 </row>
@@ -390,9 +390,8 @@ buttons, if the hide button is enabled.</para>
           </informaltable>
         </listitem>
         <listitem>
-          <para>To modify the panel background, click on the <guilabel>Background</guilabel> tab. The <guilabel>Background</guilabel> tabbed section contains
-the following elements: </para>
-          <para>Choose the type of background for the panel. The choices are as follows:</para>
+          <para>To modify the panel background, click on the <guilabel>Background</guilabel> tab. Choose the type of background for the panel. The choices
+are as follows:</para>
           <informaltable frame="topbot">
             <tgroup cols="2" colsep="0" rowsep="0">
               <colspec colwidth="32.32*"/>
@@ -409,42 +408,42 @@ the following elements: </para>
               </thead>
               <tbody>
                 <row>
-                  <entry>
+                  <entry valign="top">
                     <para>
                       <guilabel>None (use system theme)</guilabel>
                     </para>
                   </entry>
-                  <entry>
-                    <para>Select this option to use the default panel background. The default
-panel background depends on the settings in the <application>Theme</application>
-preference tool.</para>
+                  <entry valign="top">
+                    <para>Select this option to use the default panel background.
+The default panel background depends on the settings in the <application>Theme</application> preference tool.</para>
                   </entry>
                 </row>
                 <row>
-                  <entry>
+                  <entry valign="top">
                     <para>
                       <guilabel>Solid color</guilabel>
                     </para>
                   </entry>
-                  <entry>
-                    <para>Select this option to specify a single color for the panel background. Click
-on the <guibutton>Color</guibutton> button to display the color selector dialog.
-Choose the color that you require from the color selector dialog. </para>
-                    <para>Use the <guilabel>Style</guilabel> slider to specify the degree of transparency
-or opaqueness for the color. For example, to make the panel transparent, move
-the slider towards the <guilabel>Transparent</guilabel> end.</para>
+                  <entry valign="top">
+                    <para>Select this option to specify a single color for
+the panel background. Click on the <guibutton>Color</guibutton> button to
+display the color selector dialog. Choose the color that you require from
+the color selector dialog. </para>
+                    <para>Use the <guilabel>Style</guilabel>
+slider to specify the degree of transparency or opaqueness for the color.
+For example, to make the panel transparent, move the slider towards the <guilabel>Transparent</guilabel> end.</para>
                   </entry>
                 </row>
                 <row>
-                  <entry>
+                  <entry valign="top">
                     <para>
                       <guilabel>Background image</guilabel>
                     </para>
                   </entry>
-                  <entry>
-                    <para>Select this option to specify an image for the panel background. Enter the
-filename of the image to use 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 OK. </para>
+                  <entry valign="top">
+                    <para>Select this option to specify an image for the panel
+background. Enter the filename of the image to use 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 OK. </para>
                   </entry>
                 </row>
               </tbody>
@@ -478,13 +477,11 @@ the background of the panel.</para>
         <primary>panels</primary>
         <secondary>deleting</secondary>
       </indexterm>
-      <para>To delete a panel from your desktop environment, right-click on the
-panel that you want to delete, then choose <menuchoice><guimenuitem>Delete
-This Panel</guimenuitem></menuchoice>.</para>
+      <para>To delete a panel from the GNOME Desktop, right-click on the panel that
+you want to delete, then choose <menuchoice><guimenuitem>Delete This Panel</guimenuitem></menuchoice>.</para>
       <note>
-        <para>You must always have at least one panel in your desktop environment.
-If you have only one panel in your desktop environment, you cannot delete
-that panel.</para>
+        <para>You must always have at least one panel in the GNOME Desktop.
+If you have only one panel in the GNOME Desktop, you cannot delete that panel.</para>
       </note>
     </sect2>
   </sect1>
@@ -545,8 +542,9 @@ 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>Applets in the following categories: <guilabel>Accessory</guilabel>, <guilabel>Amusement</guilabel>, <guilabel>Internet</guilabel>, <guilabel>Multimedia</guilabel>, <guilabel>Utility</guilabel>.</para></listitem><listitem><para>Buttons for quick access to common actions: <guibutton>Force
 Quit</guibutton> button, <guibutton>Lock</guibutton> button, <guibutton>Log
-Out</guibutton> button, <guibutton>Run</guibutton> button, <guibutton>Screenshot</guibutton> button, <guibutton>Search</guibutton> button, <guibutton>Show
-Desktop</guibutton> button.</para></listitem><listitem><para>Launchers</para></listitem><listitem><para>Launchers from menus</para></listitem><listitem><para><guimenu>Main Menu</guimenu></para></listitem><listitem><para><application>Menu Bar</application></para></listitem><listitem><para>Drawers</para></listitem></itemizedlist></para>
+Out</guibutton> button, <guibutton>Show Desktop</guibutton> button, <guibutton>Run</guibutton>
+button, <guibutton>Screenshot</guibutton> button, <guibutton>Search</guibutton>
+button .</para></listitem><listitem><para>Launchers</para></listitem><listitem><para>Launchers from menus</para></listitem><listitem><para><guimenu>Main Menu</guimenu></para></listitem><listitem><para><application>Menu Bar</application></para></listitem><listitem><para>Drawers</para></listitem></itemizedlist></para>
         </listitem>
         <listitem>
           <para>From any menu</para>
@@ -625,7 +623,7 @@ as follows: </para>
         <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 in your desktop environment. </para>
+panel that is currently in the GNOME Desktop. </para>
         </listitem>
       </orderedlist>
       <para>Movement of a panel object affects the position of other objects on
@@ -639,13 +637,13 @@ move the panel object:</para>
           <colspec colname="colspec3" colwidth="54.00*"/>
           <thead>
             <row rowsep="1">
-              <entry colname="colspec2" valign="top">
+              <entry colname="colspec2">
                 <para>Key</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Movement Mode</para>
               </entry>
-              <entry colname="colspec3" valign="top">
+              <entry colname="colspec3">
                 <para>Description</para>
               </entry>
             </row>
@@ -877,7 +875,7 @@ particular functions from the file manager. <indexterm><primary>special URI
 locations</primary><secondary>and launchers</secondary></indexterm></para>
       </listitem>
     </itemizedlist>
-    <para>You can find launchers in the following places in the desktop environment:</para>
+    <para>You can find launchers in the following places in the GNOME Desktop:</para>
     <itemizedlist>
       <listitem>
         <para>Panels: On panels, launchers are represented by icons.</para>
@@ -945,10 +943,10 @@ section: </para>
                 <colspec colname="colspec1" colwidth="73.81*"/>
                 <thead>
                   <row rowsep="1">
-                    <entry valign="top">
+                    <entry>
                       <para>Dialog Element</para>
                     </entry>
-                    <entry valign="top">
+                    <entry>
                       <para>Description </para>
                     </entry>
                   </row>
@@ -968,7 +966,7 @@ or to the desktop. </para>
                     </entry>
                   </row>
                   <row>
-                    <entry colname="colspec0">
+                    <entry colname="colspec0" valign="top">
                       <para>
                         <guilabel>Generic name</guilabel>
                       </para>
@@ -1068,10 +1066,10 @@ The following table describes the dialog elements on the top part of the <guilab
                 <colspec colwidth="67.97*"/>
                 <thead>
                   <row rowsep="1">
-                    <entry valign="top">
+                    <entry>
                       <para>Dialog Element</para>
                     </entry>
-                    <entry valign="top">
+                    <entry>
                       <para>Description </para>
                     </entry>
                   </row>
@@ -1115,10 +1113,10 @@ as follows: </para>
                 <colspec colname="colspec1" colwidth="79.22*"/>
                 <thead>
                   <row rowsep="1">
-                    <entry valign="top">
+                    <entry>
                       <para>Field</para>
                     </entry>
-                    <entry valign="top">
+                    <entry>
                       <para>Description </para>
                     </entry>
                   </row>
@@ -1184,10 +1182,10 @@ that the commands perform:</para>
             <colspec colname="colspec1" colwidth="52.64*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Sample Application Command</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Action</para>
                 </entry>
               </row>
@@ -1200,7 +1198,7 @@ that the commands perform:</para>
                   </para>
                 </entry>
                 <entry colname="colspec1" valign="top">
-                  <para>Starts the <application>gedit</application> application.</para>
+                  <para>Starts the <application>gedit</application> text editor application.</para>
                 </entry>
               </row>
               <row>
@@ -1210,19 +1208,12 @@ that the commands perform:</para>
                   </para>
                 </entry>
                 <entry valign="top">
-                  <para>Opens the file <filename>/user123/loremipsum.txt</filename> in the <application>gedit</application> application.</para>
+                  <para>Opens the file <filename>/user123/loremipsum.txt</filename> in the <application>gedit</application> text editor 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 file manager window.</para>
-                </entry>
+                <entry colname="colspec0" valign="top"/>
+                <entry colname="colspec1" valign="top"/>
               </row>
             </tbody>
           </tgroup>
@@ -1236,10 +1227,10 @@ shows some sample link commands and the actions that the commands perform:<index
             <colspec colname="colspec1" colwidth="52.64*"/>
             <thead>
               <row rowsep="1">
-                <entry valign="top">
+                <entry>
                   <para>Sample Link Command</para>
                 </entry>
-                <entry valign="top">
+                <entry>
                   <para>Action</para>
                 </entry>
               </row>
@@ -1325,6 +1316,10 @@ see <xref linkend="gospanel-52"/>. </para>
       <primary>buttons</primary>
       <secondary>adding to panel</secondary>
     </indexterm>
+    <indexterm>
+      <primary>action buttons</primary>
+      <see>buttons</see>
+    </indexterm>
     <para>You can add buttons to your panels to provide quick access
 to common actions and functions. </para>
     <sect2 id="gospanel-563">
@@ -1360,10 +1355,9 @@ to common actions and functions. </para>
       <para>The <guibutton>Force Quit</guibutton> button enables you to select a
 window to terminate an application. This button is useful if you want to terminate
 an application that does not respond to your commands. </para>
-      <para>To add a <guibutton>Force Quit</guibutton> button to a panel, right-click
-on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Force Quit</guimenuitem></menuchoice>. To terminate an application, click on the <guibutton>Force Quit</guibutton> button, then click on a window from the application
-that you want to terminate. If you do not want to terminate an application
-after you click on the <guibutton>Force Quit</guibutton> button, press <keycap>Esc</keycap>.</para>
+      <para>To terminate an application, click on the <guibutton>Force Quit</guibutton>
+button, then click on a window from the application that you want to terminate.
+If you do not want to terminate an application after you click on the <guibutton>Force Quit</guibutton> button, press <keycap>Esc</keycap>.</para>
     </sect2>
     <sect2 id="gospanel-21">
       <title>Lock Button</title>
@@ -1407,10 +1401,10 @@ the commands that are available from the menu.</para>
           <colspec colname="colspec1" colwidth="56.45*"/>
           <thead>
             <row rowsep="1">
-              <entry valign="top">
+              <entry>
                 <para>Menu Item</para>
               </entry>
-              <entry valign="top">
+              <entry>
                 <para>Function</para>
               </entry>
             </row>
@@ -1598,17 +1592,20 @@ the <guibutton>Search</guibutton> button. </para>
 see the <citetitle>Search Tool Manual</citetitle>.</para>
     </sect2>
     <sect2 id="gospanel-564">
-      <title>Show Desktop Button</title>
+      <title>Show Desktop 
+Button</title>
       <indexterm>
         <primary>buttons</primary>
-        <secondary>Show Desktop</secondary>
+        <secondary>Minimise Windows</secondary>
       </indexterm>
       <indexterm>
         <primary>panel objects</primary>
-        <secondary>Show Desktop button</secondary>
+        <secondary>Minimise
+Windows button</secondary>
       </indexterm>
       <indexterm>
-        <primary>Show Desktop button</primary>
+        <primary>Minimise Windows
+button</primary>
       </indexterm>
       <screenshot>
         <mediaobject>
@@ -1620,10 +1617,9 @@ see the <citetitle>Search Tool Manual</citetitle>.</para>
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>You can use the <guibutton>Show Desktop</guibutton> button to minimize
-all open windows and show the desktop.</para>
-      <para>To add a <guibutton>Show Desktop</guibutton> button to a panel, right-click
-on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Show Desktop</guimenuitem></menuchoice>. To minimize all windows and show the desktop,
+      <para>You can use the <guibutton>Show Desktop</guibutton> button to minimize all open windows and show the desktop.</para>
+      <para>To add a <guibutton>Show Desktop</guibutton> button to a panel, right-click on any vacant
+space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Show Desktop</guimenuitem></menuchoice>. To minimize all windows and show the desktop,
 click on the <guibutton>Show Desktop</guibutton> button. </para>
     </sect2>
     <sect2 id="gospanel-567">
@@ -1678,18 +1674,7 @@ the standard applications, commands, and configuration options from the <guimenu
 on any vacant space on the panel, then choose <menuchoice><guimenu>Add to
 Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>.
 You can add as many <guimenu>Main Menu</guimenu> objects to your panels as
-you want. By default, the <guimenu>Main Menu</guimenu> is represented on panels
-by a stylized footprint icon, as follows:</para>
-        <screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/footprint_icon.png" format="PNG"/>
-            </imageobject>
-            <textobject>
-              <phrase>Main Menu icon.</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
+you want. </para>
       </listitem>
       <listitem>
         <para><application>Menu Bar</application>: You can access almost
@@ -1701,7 +1686,7 @@ to your panels as you want. </para>
       </listitem>
       <listitem>
         <para>System menus: System menus contain the standard applications
-and tools that you can use in your desktop environment. The <guimenu>Applications</guimenu> menu and <guimenu>Actions</guimenu> menu are system menus. To add
+and tools that you can use in the GNOME Desktop. The <guimenu>Applications</guimenu> 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>
     </itemizedlist>
@@ -1827,10 +1812,10 @@ table describes the elements on the <guilabel>General</guilabel> tabbed section:
               <colspec colname="colspec1" colwidth="71.43*"/>
               <thead>
                 <row rowsep="1">
-                  <entry valign="top">
+                  <entry>
                     <para>Dialog Element</para>
                   </entry>
-                  <entry valign="top">
+                  <entry>
                     <para>Description </para>
                   </entry>
                 </row>
diff --git a/gnome2-user-guide/C/gosstartsession.xml b/gnome2-user-guide/C/gosstartsession.xml
index 9112639..0334f27 100644
--- a/gnome2-user-guide/C/gosstartsession.xml
+++ b/gnome2-user-guide/C/gosstartsession.xml
@@ -10,10 +10,10 @@ manage, and end a GNOME Desktop session.</para>
       <primary>sessions</primary>
       <secondary>starting</secondary>
     </indexterm>
-    <para>A session occurs between the time that you log in to the desktop environment
-and the time that you log out. The login screen is your gateway to the desktop
-environment. The login screen provides fields for you to enter your username
-and password. The login screen enables you to select login options, for example
+    <para>A session occurs between the time that you log in to the GNOME Desktop
+and the time that you log out. The login screen is your gateway to the GNOME
+Desktop. The login screen provides fields for you to enter your username and
+password. The login screen enables you to select login options, for example
 you can select the language of your session. </para>
     <para>You start a session when you log in. The session manager starts after
 your username and password are authenticated. The session manager enables
@@ -60,7 +60,8 @@ on the login screen, then press <keycap>Return</keycap>.</para>
       <para>When you log in successfully, the session manager starts a session.
 If this is the first time you log in, then the session manager starts a new
 session. If you have logged in before, then the session manager restores your
-previous session, if you saved your session settings when you logged out.</para>
+previous session, if you saved the settings for the previous session when
+you logged out.</para>
       <para>If you want to shut down or restart the system before you log in, click
 on the <guilabel>System</guilabel> icon on the login screen. A dialog is displayed.
 Select the option that you require, then click <guibutton>OK</guibutton>.</para>
@@ -99,7 +100,8 @@ on the login screen, then press <keycap>Return</keycap>.</para>
       <note>
         <para>When you log in to a session in a different language, you choose
 the language for the user interface. You do not specify a keyboard layout
-for the session. To specify a keyboard layout, use the <application>Keyboard Layout Switcher</application> applet.</para>
+for the session. To specify a keyboard layout, use the <application>Keyboard
+Layout Switcher</application> applet.</para>
       </note>
     </sect2>
   </sect1>
@@ -142,7 +144,7 @@ on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Acti
 move your mouse to display the locked screen dialog. Enter your username and
 password in the locked screen dialog, then press <keycap>Return</keycap>.</para>
     <para>For information on configuring your screensaver, see <citetitle>Using
-the Basic Preference Tools</citetitle>.</para>
+Preference Tools</citetitle>.</para>
     <note>
       <para>To lock your screen correctly, you must have a screensaver enabled.</para>
     </note>
@@ -157,7 +159,7 @@ the Basic Preference Tools</citetitle>.</para>
       <primary>sessions</primary>
       <secondary>managing</secondary>
     </indexterm>
-    <para>To configure the session management of the desktop environment,
+    <para>To configure the session management of the GNOME Desktop,
 use the <application>Sessions</application> preference tool. The <application>Sessions</application> preference tool recognizes the following types of application: </para>
     <itemizedlist>
       <listitem>
@@ -292,10 +294,10 @@ perform one of the following actions:</para>
         <para>Click on a <guibutton>Log Out</guibutton> button.</para>
       </listitem>
       <listitem>
-        <para>Choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Log Out</guimenuitem></menuchoice>.</para>
+        <para>Open the <guimenu>Main Menu</guimenu>, then choose <guimenuitem>Log Out</guimenuitem><replaceable>name</replaceable>.</para>
       </listitem>
       <listitem>
-        <para>Open the <guimenu>Main Menu</guimenu>, then choose <guimenuitem>Log Out</guimenuitem>.</para>
+        <para>Choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Log Out</guimenuitem></menuchoice>.</para>
       </listitem>
     </itemizedlist>
     <para>Before you end a session, you might want to save your current settings
diff --git a/gnome2-user-guide/C/l10n-readme.txt b/gnome2-user-guide/C/l10n-readme.txt
index 990a88d..e52cf20 100644
--- a/gnome2-user-guide/C/l10n-readme.txt
+++ b/gnome2-user-guide/C/l10n-readme.txt
@@ -1,4 +1,106 @@
 ________________________________________________________________________________
+GNOME 2.6 Desktop User Guide - L10N Readme
+Written by: Brian O'Casey (brian.casey@sun.com)
+Revision number: 2.8
+Date: 05 March 200
+
+For instructions on how to take screenshots for the UG, see the Screenshot Instructions section in this file. 
+
+Changes between Version 2.7 and 2.8
+===================================
+Fixed the following Bugzilla bugs
+o 133372 RE Nautulis spatial model documentation 
+o BUG 109126
+o Bug 122157
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Manual revision: 2.7
+Date: 05 March 2004
+
+PLAINGNOMESTARTPREFTOOLS.SGM Created new chapter with the list of all the preferences tools available from Applications -> Desktop Preferences
+
+Updated the Makefile.am to reflect this new chapter.
+
+goscustdesk.sgm: 
+=================
+Configuring Keyboard Preferences
+o Added Keyboard Layouts <sect2 id="goscustdesk-100"> 
+o Keyboard Layout Options <sect2 id="goscustdesk-101"> 
+
+o Changed Previewing Fonts to Preview a Font and Added "To add a TrueTpye Font in response to bug 122157
+
+o Updated Customizing Desktop Background (sect1 id="goscustdesk-7)
+o Created new section Setting Your Login Photo (sect1 id="goscustdesk-95)
+
+gosnautilus.sgm:
+=================
+o Restructured chapter to cater for new file system
+o Added Browser File manager and Object File Manager 
+o Created New Section To set List Columns Preferences (sect3 id="gosnautilus-490)
+o Created New section To Access Network Servers sect3 id="gosnautilus-508)
+o Created New section To Add a Network Server sect3 id="gosnautilus-509)
+o Created a new section To Open a Parent Folder sect2 id="gosnautilus-511
+o Created a new section To Create a Document sect2 id="gosnautilus-511
+
+
+goseditmainmenu.sgm
+=================
+o Changed Actions menu section. (removed Lock Screen and changed Open Recent to Recent Documents 
+o deleted open-main-menu in goseditmainmenu.sgm
+ 
+gosdeskback.sgm 
+=================
+o Added info to end of To add a Launcher to the Desktop in response to bug 122157
+o Added naut_computer_launcher icon to Table 8-1 Functions of Default Desktop Objects 
+o Added new Table for community in Using the Desktop Menu section.
+o Added com_file_manager_menu to Using the Desktop Menu section
+
+gospanel.sgm
+=============
+o Created Community Only Marked section for Desktop Buttom sect2 id="gospanel-564 
+o Placed Minimise Windows TITLE Button in MercuryOnly marked section.
+o Removed the footprint-icon from the Menus section
+  
+gosmetacity.sgm
+==================
+o Placed marked section in the windows-menu graphic in the Window Menu section
+o Made the Roll Up table row in Table 6-2 a Mercury ONLY marked section.
+o Included On Top as a Community Only marked section in Table 6-2.
+o Added two additional rows to Table ie: Move to Workspace Right and Move to Another Workspace.
+o Renamed "Using the Top Edge Panel to Work With Windows" to "Window
+Selector Applet" and rewrote the text to refer explicitly to the applet,
+rather than the icon what happens to be at top right of the panel. Also plaCED IN A COMMUNITY ONLY SECTION.
+
+
+
+
+New screenshots:
+------------------
+naut_browser_filesystem
+naut_browser_window
+naut_computer_contents
+com_file_manager_window in gosdeskback.sgm
+naut_computer_launcher (icon)
+
+
+Updated screenshots:
+----------------------
+None
+
+Deleted Screenshots
+=====================
+open-main-menu in goseditmainmenu.sgm
+typical-anno-desktop in gosoverview.sgm
+naut-icon-view-window in gosoverview.sgm
+footprint-icon in gosoverview.sgm
+naut-iconview-anno-window in gosnautilus.sgm
+naut-viewpane-text-window in gosnautilus.sgm
+naut-listview-window in gosnautilus.sgm
+naut-audioview-window in gosnautilus.sgm
+window-menu in gosmetacity.sgm
+
+========================================================================
+========================================================================
 GNOME 2.4 Desktop User Guide - L10N Readme
 Written by: Eugene O'Connor (eugene.oconnor@sun.com)
 Revision number: 2.7
diff --git a/gnome2-user-guide/C/part1.xml b/gnome2-user-guide/C/part1.xml
index df84876..eeec14a 100644
--- a/gnome2-user-guide/C/part1.xml
+++ b/gnome2-user-guide/C/part1.xml
@@ -1,26 +1,24 @@
-<part id="part1-1"><title>A Tour of the GNOME Desktop</title><partintro><para>A <firstterm>desktop environment</firstterm> desktop environment
-is a windows-based environment for users. The desktop environment is the sum
-of all the parts of your working environment. This section introduces the
-core components in the GNOME Desktop environment. </para><para>The GNOME Desktop is very configurable, therefore this section covers
-the main functional possibilities of the GNOME Desktop features.
-If you want to find out how to implement the various configuration possibilities
-that are mentioned in this section, see <emphasis>Customizing Your GNOME Desktop</emphasis>. </para><para>The chapters in this section are as follows: </para><itemizedlist><listitem><para><emphasis>Basic Skills</emphasis></para><para>Read this chapter to find out about mouse usage, shortcut keys, basic
+<part id="part1-1"><title>A Tour of the GNOME Desktop</title><partintro><para>This section introduces the core components in the GNOME
+Desktop. The GNOME Desktop is very configurable, therefore this section covers
+the main functional possibilities of the GNOME Desktop features. If you want
+to find out how to implement the various configuration possibilities that
+are mentioned in this section, see <emphasis>Customizing Your GNOME Desktop</emphasis>. </para><para>The chapters in this section are as follows: </para><itemizedlist><listitem><para><emphasis>Basic Skills</emphasis></para><para>Read this chapter to find out about mouse usage, shortcut keys, basic
 window skills, and basic dialog skills. </para></listitem><listitem><para><emphasis>Overview of the GNOME Desktop</emphasis></para><para>Read this chapter for an introduction to the major components and functions
- of the desktop environment. If you do not read anything else in this manual,
-read this chapter.</para></listitem><listitem><para><emphasis>GNOME Desktop Sessions</emphasis></para><para>Read this chapter for information about how to start, manage, and end
+ of the GNOME Desktop. If you do not read anything else in this manual, read
+this chapter.</para></listitem><listitem><para><emphasis>GNOME Desktop Sessions</emphasis></para><para>Read this chapter for information about how to start, manage, and end
 GNOME Desktop sessions. </para></listitem><listitem><para><emphasis>Working With Panels</emphasis></para><para>Read this chapter to find out more about using panels. Panels are a
 key component of the GNOME Desktop. This chapter tells you how to use the
 different parts of your panels, and how to invoke the available functions
-of the desktop environment using panels.</para></listitem><listitem><para><emphasis>Working With Menus</emphasis></para><para>Read this chapter to find out more about using menus. </para></listitem><listitem><para><emphasis>Working With Windows</emphasis></para><para>Read this chapter to find out more about using windows. This chapter
+of the GNOME Desktop using panels.</para></listitem><listitem><para><emphasis>Working With Menus</emphasis></para><para>Read this chapter to find out more about using menus. </para></listitem><listitem><para><emphasis>Working With Windows</emphasis></para><para>Read this chapter to find out more about using windows. 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><emphasis>Nautilus File Manager</emphasis></para><para>Read this chapter to find out more about the <application>Nautilus</application>
 file manager. This chapter describes how to use the file manager to work with
-your file system. This chapter also describes how to customize the file manager.</para></listitem><listitem><para><emphasis>Using Your Desktop</emphasis></para><para>Read this chapter to find out more about using the <firstterm>desktop</firstterm>. The desktop is the part of the desktop environment where there
-are no interface graphical items, such as panels and windows. This chapter
-describes how to use the desktop 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</guimenu> menu, and how
-to customize the desktop.</para></listitem></itemizedlist></partintro>&gosbasic;
+your file system. This chapter also describes how to customize the file manager.</para></listitem><listitem><para><emphasis>Using Your Desktop</emphasis></para><para>Read this chapter to find out more about using the <firstterm>desktop</firstterm>. The desktop is the part of the GNOME Desktop where there are
+no interface graphical items, such as panels and windows. This chapter describes
+how to use the desktop 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</guimenu> menu, and how to customize
+the desktop.</para></listitem></itemizedlist></partintro>&gosbasic;
 &gosoverview;
 &gosstartsession;
 &gospanel;
diff --git a/gnome2-user-guide/C/part2.xml b/gnome2-user-guide/C/part2.xml
index 9858182..1110c40 100644
--- a/gnome2-user-guide/C/part2.xml
+++ b/gnome2-user-guide/C/part2.xml
@@ -1,23 +1,7 @@
-<part id="part2-1"><title>Customizing Your GNOME Desktop</title><partintro><para>You can customize many of the characteristics of your desktop
-environment. The customization of each aspect of the desktop environment is
-controlled by a dedicated software tool that is called a desktop environment
-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><listitem><para><guilabel>Advanced</guilabel></para></listitem></itemizedlist><para>You can open your preference tools in either of the following ways:</para><itemizedlist><listitem><para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the tool
-that you require from the submenus. </para></listitem><listitem><para>Double-click on the <guilabel>Start Here</guilabel> object
-on the desktop. A <application>Nautilus</application> window opens at the <guilabel>Start Here</guilabel> location. Double-click on the <guilabel>Preferences</guilabel> object in the <application>Nautilus</application> window to display
-your preference tools. Double-click on the tool that you require.</para></listitem></itemizedlist><para>This section describes how to configure the desktop environment in the
-following chapters. </para><itemizedlist><listitem><para><emphasis>Using the Basic Preference Tools</emphasis></para><para>Read this chapter to find out how to customize your desktop background,
-and how to configure your keyboard settings and your mouse settings. This
-chapter also describes how to configure shortcut keys, how to set your sound
-preferences, and how to configure your network proxy. This chapter also contains
-information on how to customize your screensaver, and how to set your screen
-resolution. This chapter also describes how to choose a theme and fonts for
-your desktop environment, and how to customize your application menubars and
-toolbars. This chapter also contains information on how to customize
-window focus behavior.</para></listitem><listitem><para><emphasis>Using the Advanced Preference Tools</emphasis></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><emphasis>Using the Accessibility Preference Tools</emphasis></para><para>Read this chapter to find out how to use the accessibility features
-of the desktop environment. This chapter describes how to set assistive technology
-preferences and how to use the keyboard accessibility features.</para></listitem></itemizedlist></partintro>&goscustdesk;
-&goscustlookandfeel;
-&goscustaccess;</part>
+<part id="part2-1"><title>Customizing Your GNOME Desktop</title><partintro><para>You can customize many of the characteristics of the GNOME
+Desktop. The customization of each aspect of the GNOME Desktop is controlled
+by a dedicated software tool that is called a preference tool. This section
+describes how to configure the GNOME Desktop in the following chapters. </para><itemizedlist><listitem><para><emphasis>Starting Preference Tools</emphasis></para><para>Read this chapter to find out how to start the preference tools in the
+GNOME Desktop.</para></listitem><listitem><para><emphasis>Using Preference Tools</emphasis></para><para>Read this chapter to find out how to use the preference tools to customize
+the GNOME Desktop. This chapter describes all the options in each of the preference
+tools.</para></listitem></itemizedlist></partintro>&plaingnomestartpreftools;&goscustdesk;</part>
diff --git a/gnome2-user-guide/C/plaingnomestartpreftools.xml b/gnome2-user-guide/C/plaingnomestartpreftools.xml
new file mode 100644
index 0000000..6cc68ed
--- /dev/null
+++ b/gnome2-user-guide/C/plaingnomestartpreftools.xml
@@ -0,0 +1,380 @@
+<chapter id="plaingnomestartpreftools-1">
+  <title>Starting Preference Tools</title>
+  <highlights>
+    <para>This chapter describes how to start your preference tools,
+and where to find the preference tools in the GNOME Desktop menu structure.</para>
+  </highlights>
+  <sect1 id="plaingnomestartpreftools-2">
+    <title>Starting a Preference Tool</title>
+    <para>You can start the preference tools in the following ways:</para>
+    <itemizedlist>
+      <listitem>
+        <para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the tool
+that you require from the submenus. </para>
+      </listitem>
+      <listitem>
+        <para>Double-click on the <guilabel>Start Here</guilabel> object
+on the desktop. A <application>Nautilus</application> window opens at the <guilabel>Start Here</guilabel> location. Double-click on the <guilabel>Preferences</guilabel> object in the <application>Nautilus</application> window to display
+your preference tools. Double-click on the tool that you require.</para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="plaingnomestartpreftools-3">
+    <title>Where to Find Preference Tools</title>
+    <para><xref linkend="plaingnomestartpreftools-TBL-4"/> lists the preference
+tools in the GNOME Desktop, and where you can find each preference tool in
+the menu structure.</para>
+    <table frame="topbot" id="plaingnomestartpreftools-TBL-4">
+      <title>Location of Preference Tools in GNOME Desktop Menu Structure</title>
+      <tgroup cols="2" colsep="0" rowsep="0">
+        <colspec colname="colspec0" colwidth="42.83*"/>
+        <colspec colname="colspec1" colwidth="57.17*"/>
+        <thead>
+          <row rowsep="1">
+            <entry>
+              <para>Preference Tool</para>
+            </entry>
+            <entry>
+              <para>Menu
+Path</para>
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry colname="colspec0">
+              <para>
+                <application>Assistive Technology</application>
+              </para>
+            </entry>
+            <entry colname="colspec1">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Accessibility</guisubmenu>
+                  <guimenuitem>Assistive Technology</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>CD Database</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Advanced</guisubmenu>
+                  <guimenuitem>CD Database </guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Desktop Background</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Desktop Background</guisubmenu>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>File Types
+and Programs</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Advanced</guisubmenu>
+                  <guimenuitem>File Types
+and Programs</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>File Management</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>File Management</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Font</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Font</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0">
+              <para>
+                <application>Login Photo</application>
+              </para>
+            </entry>
+            <entry colname="colspec1">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Advanced</guisubmenu>
+                  <guimenuitem>Login Photo</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Keyboard Accessibility</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Accessibility</guisubmenu>
+                  <guimenuitem>Keyboard</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Keyboard Preferences</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Keyboard</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0">
+              <para>
+                <application>Keyboard Shortcuts</application>
+              </para>
+            </entry>
+            <entry colname="colspec1">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Keyboard Shortcuts</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Menus and Toolbars</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Menus &amp; Toolbars</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Mouse</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Mouse</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0">
+              <para>
+                <application>Network Proxy</application>
+              </para>
+            </entry>
+            <entry colname="colspec1">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Network Proxy</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Panel Preferences</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Advanced</guisubmenu>
+                  <guimenuitem>Panel</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Preferred Applications</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Advanced</guisubmenu>
+                  <guimenuitem>Preferred
+Applications</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Screen Resolution
+Preferences</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Screen Resolution</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Sessions</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guisubmenu>Advanced</guisubmenu>
+                  <guimenuitem>Sessions</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Sound preferences</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Sound</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Theme</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Theme</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para>
+                <application>Windows</application>
+              </para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>
+                <menuchoice>
+                  <guimenu>Applications</guimenu>
+                  <guisubmenu>Desktop Preferences</guisubmenu>
+                  <guimenuitem>Windows</guimenuitem>
+                </menuchoice>
+              </para>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </sect1>
+</chapter>
diff --git a/gnome2-user-guide/C/user-guide-C.omf b/gnome2-user-guide/C/user-guide-C.omf
index 97a0f31..8ffa17a 100644
--- a/gnome2-user-guide/C/user-guide-C.omf
+++ b/gnome2-user-guide/C/user-guide-C.omf
@@ -9,20 +9,20 @@
     </maintainer>

 <!--
     <title>

-      GNOME 2.4 Desktop User Guide
+      GNOME 2.6 Desktop User Guide
     </title>
 -->
     <title>

       User Guide
     </title>

     <date>

-      2003-09-08
+      2004-03-09
     </date>

-    <version identifier="2.7" date="2003-09-08" 
-    description="Updates for GNOME 2.4"/>

+    <version identifier="2.8" date="2004-03-09" 
+    description="Updates for GNOME 2.6"/>

     <subject category="GNOME|Desktop"/>

     <description>

-      User Guide for GNOME 2.4. 

+      User Guide for GNOME 2.6. 

     </description>

     <type>

       user's guide

diff --git a/gnome2-user-guide/C/user-guide.xml b/gnome2-user-guide/C/user-guide.xml
index bfc8c7f..6bdb6eb 100644
--- a/gnome2-user-guide/C/user-guide.xml
+++ b/gnome2-user-guide/C/user-guide.xml
@@ -1,9 +1,9 @@
 <?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.4">

-  <!ENTITY manrevision "2.7">

-  <!ENTITY date "September 2003">

+  <!ENTITY gnomeversion "2.6">

+  <!ENTITY manrevision "2.8">

+  <!ENTITY date "March 2004">

   <!ENTITY LEGAL SYSTEM "legal.xml">

   <!ENTITY PART1 SYSTEM "part1.xml">

   <!ENTITY gosbasic SYSTEM "gosbasic.xml">  

@@ -15,16 +15,15 @@
   <!ENTITY gosnautilus SYSTEM "gosnautilus.xml">  

   <!ENTITY gosdeskback SYSTEM "gosdeskback.xml">  

   <!ENTITY PART2 SYSTEM "part2.xml">

+  <!ENTITY plaingnomestartpreftools SYSTEM "plaingnomestartpreftools.xml">
   <!ENTITY goscustdesk SYSTEM "goscustdesk.xml">

-  <!ENTITY goscustlookandfeel SYSTEM "goscustlookandfeel.xml">

-  <!ENTITY goscustaccess SYSTEM "goscustaccess.xml">
   <!ENTITY gloss SYSTEM "glossary.xml">
 ]>

 <book id="index"> 

   <title>GNOME &gnomeversion; Desktop User Guide</title> 

   <bookinfo> 

 	 <copyright> 

-		<year>2003</year> 

+		<year>2004</year> 

 		<holder>Sun Microsystems</holder> 

 	 </copyright>

 

@@ -58,6 +57,14 @@
 		  </revdescription> 
 		</revision> 
 		<revision> 

+		  <revnumber>GNOME 2.4 Desktop User Guide V2.7</revnumber> 

+		  <date>September 2003</date> 

+		  <revdescription> 

+			 <para role="author">Sun Microsystems</para> 
+			 <para role="publisher">GNOME Documentation Project</para> 
+		  </revdescription> 
+		</revision> 
+		<revision> 

 		  <revnumber>GNOME 2.4 Desktop User Guide V2.6</revnumber> 

 		  <date>August 2003</date> 

 		  <revdescription>