Further updates to User Guide for GNOME 2.6

12 files changed, 503 insertions, 621 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index bc92cba..2e1ef8c 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-18  Brian Casey <brian.casey@sun.com>
+
+    * Further updates to User Guide for GNOME 2.6.
+
 2004-03-09  Brian Casey <brian.casey@sun.com>
 
    * Updated User Guide for GNOME 2.6.
diff --git a/gnome2-user-guide/C/figures/naut_starthere_launcher.png b/gnome2-user-guide/C/figures/naut_starthere_launcher.png
index 3821743..eed7b3d 100644
--- a/gnome2-user-guide/C/figures/naut_starthere_launcher.png
+++ b/gnome2-user-guide/C/figures/naut_starthere_launcher.png
diff --git a/gnome2-user-guide/C/gosbasic.xml b/gnome2-user-guide/C/gosbasic.xml
index 0dc3cde..752fc90 100644
--- a/gnome2-user-guide/C/gosbasic.xml
+++ b/gnome2-user-guide/C/gosbasic.xml
@@ -580,7 +580,7 @@ shortcut keys:</para>
                 <para><keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo></para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens the <guimenu>Main Menu</guimenu>.</para>
+                <para>Opens the <guimenu>Applicantions Menu</guimenu>.</para>
               </entry>
             </row>
             <row>
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 8cd0e24..e24a5b0 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -138,7 +138,7 @@ that you can modify.</para>
           <row>
             <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
               <para>
-                <guibutton>Add Wallpaper</guibutton>
+                <guibutton>Desktop Wallpaper</guibutton>
               </para>
             </entry>
             <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
@@ -178,6 +178,29 @@ meets the screen edges, and maintains the relative dimensions of the image.</par
             </entry>
           </row>
           <row>
+            <entry colname="colspec0" colsep="0" rowsep="0">
+              <para>
+                <guilabel>Add Wallpaper</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec1" colsep="0" rowsep="0">
+              <para/>
+              <para>Click on <guilabel>Add Wallpaper</guilabel> to display the <guilabel>Add Wallpapers</guilabel> dialog. Choose the wallpaper that you want to appear as the background,
+then click <guibutton>OK</guibutton>.</para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0" colsep="0" rowsep="0">
+              <para>
+                <guilabel>Remove</guilabel>
+              </para>
+            </entry>
+            <entry colname="colspec1" colsep="0" rowsep="0">
+              <para>Choose the <guibutton>Desktop Wallpaper</guibutton> that you want to remove,
+then click <guilabel>Remove</guilabel>.</para>
+            </entry>
+          </row>
+          <row>
             <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
               <para>
                 <guilabel>Desktop Colors</guilabel>
@@ -873,7 +896,7 @@ render fonts smoothly. Use this option for LCD or flat-screen displays.</para>
             </entry>
             <entry colname="colspec19" colsep="0" rowsep="0" valign="top">
               <para>Click on this button to specify further details of how
-to render fonts on your screen. </para>
+to render fonts on your screen.</para>
               <itemizedlist>
                 <listitem>
                   <para><guilabel>Resolution (dots per inch)</guilabel>: Use the spin
@@ -897,6 +920,18 @@ or flat-screen displays.</para>
               </itemizedlist>
             </entry>
           </row>
+          <row>
+            <entry colname="colspec18" colsep="0" rowsep="0">
+              <para>
+                <guibutton>Go
+to font folder</guibutton>
+              </para>
+            </entry>
+            <entry colname="colspec19" colsep="0" rowsep="0">
+              <para>Click on this button to open the <guilabel>Fonts</guilabel>
+folder.</para>
+            </entry>
+          </row>
         </tbody>
       </tgroup>
     </table>
@@ -931,11 +966,10 @@ font, perform the following steps:</para>
 you want to add.</para>
         </listitem>
         <listitem>
-          <para>Navigate to the <guilabel>fonts:///</guilabel> location. The
-fonts are displayed as icons.</para>
+          <para>From a file browser window, access 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>
+          <para>Copy the TrueType font file that you want to add to the <guilabel>fonts:///</guilabel> location.</para>
         </listitem>
       </orderedlist>
     </sect2>
@@ -957,9 +991,9 @@ tools</see>
     </indexterm>
     <para>The <application>Login Photo </application>
 preference tool enables you to change the picture that is displayed in your
-login window. </para>
+login screen. </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
+image to display in your login screen. 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>
@@ -1275,7 +1309,8 @@ keypresses.</para>
             <row>
               <entry colname="colspec0" valign="top">
                 <para>
-                  <guilabel>Repeat Keys</guilabel>
+                  <guilabel>Enable Repeat
+Keys</guilabel>
                 </para>
                 <indexterm>
                   <primary>accessibility</primary>
@@ -1283,9 +1318,8 @@ keypresses.</para>
                 </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>
+                <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
@@ -1588,8 +1622,8 @@ that you can modify.</para>
             <row>
               <entry colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Keyboard repeats
-when key is held down</guilabel>
+                  <guilabel>Key presses
+repeat when key is held down</guilabel>
                 </para>
               </entry>
               <entry colsep="0" rowsep="0" valign="top">
@@ -1623,7 +1657,7 @@ that the action repeats.</para>
             <row>
               <entry colname="colspec18" colsep="0" rowsep="0" valign="top">
                 <para>
-                  <guilabel>Blinks in text boxes and fields</guilabel>
+                  <guilabel>Cursor blinks in text boxes and fields</guilabel>
                 </para>
               </entry>
               <entry colname="colspec19" colsep="0" rowsep="0" valign="top">
@@ -1642,6 +1676,19 @@ cursor to blink in fields and text boxes.</para>
 blinks in fields and text boxes.</para>
               </entry>
             </row>
+            <row>
+              <entry colname="colspec18" colsep="0" rowsep="0">
+                <para>
+                  <guilabel>Type
+to test settings</guilabel>
+                </para>
+              </entry>
+              <entry colname="colspec19" colsep="0" rowsep="0">
+                <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>
@@ -2048,59 +2095,6 @@ action.</para>
       </table>
     </sect2>
   </sect1>
-  <sect1 id="goscustdesk-67">
-    <title>Configuring Multimedia Keys</title>
-    <indexterm>
-      <primary>preference tools</primary>
-      <secondary>Multimedia Keys</secondary>
-    </indexterm>
-    <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 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>Multimedia keys table</para>
-            </entry>
-            <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 valign="top">
-              <para>
-                <guilabel>Use PCM volume instead of Master
-volume</guilabel>
-              </para>
-            </entry>
-            <entry>
-              <para>Select this option if you want
-to use Pulse Code Modulation (PCM) volume instead of Master volume.</para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </sect1>
   <sect1 id="goscustdesk-10">
     <title>Customizing Your Panels</title>
     <indexterm>
@@ -2980,7 +2974,7 @@ lists the keyboard shortcut settings that you can customize.</para>
 one of the following settings:</para>
               <itemizedlist>
                 <listitem>
-                  <para><guilabel>Default</guilabel>: Use this setting for standard
+                  <para><guilabel>GNOME Default</guilabel>: Use this setting for standard
 shortcut keys.</para>
                 </listitem>
                 <listitem>
@@ -3389,8 +3383,8 @@ be a <filename>.tar.gz</filename> file.</para>
           <para>Start the <application>Theme</application> preference tool.</para>
         </listitem>
         <listitem>
-          <para>Click on the <guibutton>Install theme</guibutton> button.
-An <guilabel>Install New Theme</guilabel> dialog is displayed.</para>
+          <para>Click on the <guibutton>Install Theme</guibutton> button.
+A <guilabel>Theme Installation</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
           <para>Enter the location of the theme archive file in the drop-down
@@ -3413,7 +3407,8 @@ perform the following steps:</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>
+          <para>Click on the <guibutton>Theme Details</guibutton> button.
+An <guilabel>Theme Details</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
           <para>Click on the tab for the type of theme that you want to install.
@@ -3421,8 +3416,8 @@ For example, to install an icons option, click on the <guilabel>Icons</guilabel>
 tab.</para>
         </listitem>
         <listitem>
-          <para>Click on the <guibutton>Install new theme</guibutton> button.
-An <guilabel>Install New Theme</guilabel> dialog is displayed.</para>
+          <para>Click on the <guibutton>Install Theme</guibutton> button.
+A <guilabel>Theme Installation</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
           <para>Enter the location of the option archive file in the drop-down
@@ -3444,13 +3439,14 @@ the following steps:</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>
+          <para>Click on the <guibutton>Theme Details</guibutton> button.
+A <guilabel>Theme Details</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
           <para>Click on the tab for the type of option that you want to delete. </para>
         </listitem>
         <listitem>
-          <para>Click on the <guibutton>Go to theme folder</guibutton> button.
+          <para>Click on the <guibutton>Go To Theme Folder</guibutton> button.
 A file manager window opens on the default option folder.</para>
         </listitem>
         <listitem>
@@ -3460,18 +3456,15 @@ A file manager window opens on the default option folder.</para>
     </sect2>
     <sect2 id="goscustdesk-82">
       <title>Previewing Themes</title>
-      <para>You can use the file manager to preview themes. To preview themes, perform
-the following steps:</para>
+      <para>You can use the file manager to preview and change themes. To change
+themes, perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>Open a file manager window.</para>
-        </listitem>
-        <listitem>
-          <para>Enter the URI <command>themes:///</command> in the location
-bar. The themes are displayed as icons in the view pane.</para>
+          <para>Use the file manager to access the <command>themes:///</command>
+URI. The themes are displayed as icons.</para>
         </listitem>
         <listitem>
-          <para>Double-click on a theme to display a preview of the theme.</para>
+          <para>Double-click on a theme to change the theme.</para>
         </listitem>
       </orderedlist>
     </sect2>
@@ -3486,8 +3479,8 @@ bar. The themes are displayed as icons in the view pane.</para>
       <primary>preference tools</primary>
       <secondary>Windows</secondary>
     </indexterm>
-    <para>Use the <application>Windows</application> preference
-tool to customize window behavior for the GNOME Desktop.</para>
+    <para>Use the <application>Windows</application>
+preference 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">
@@ -3552,10 +3545,10 @@ that you want to occur when you double-click on a window titlebar. Select
 one of the following options:</para>
               <itemizedlist>
                 <listitem>
-                  <para><guilabel>Roll up</guilabel>: Shades the window.</para>
+                  <para><guilabel>Maximize</guilabel>: Maximizes the window.</para>
                 </listitem>
                 <listitem>
-                  <para><guilabel>Maximize</guilabel>: Maximizes the window.</para>
+                  <para><guilabel>Roll up</guilabel>: Roll up the window.</para>
                 </listitem>
               </itemizedlist>
             </entry>
diff --git a/gnome2-user-guide/C/gosdeskback.xml b/gnome2-user-guide/C/gosdeskback.xml
index 0187639..e5cd42a 100644
--- a/gnome2-user-guide/C/gosdeskback.xml
+++ b/gnome2-user-guide/C/gosdeskback.xml
@@ -80,8 +80,8 @@ describes the functions of the default objects on the desktop.</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>
+file manager window, and displays your CD-ROM drive, floppy drive, file system,
+and network.</para>
             </entry>
           </row>
           <row>
@@ -755,10 +755,15 @@ ways:</para>
 The contents of <guilabel>Trash</guilabel> are displayed in a <application>Nautilus</application> window.</para>
         </listitem>
         <listitem>
-          <para>From a file manager window</para>
+          <para>From a file browser 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 a file object window</para>
+          <para>Choose <menuchoice><guimenu>Places</guimenu><guimenuitem>Trash</guimenuitem></menuchoice>. The contents of <guilabel>Trash</guilabel> are
+displayed in the window.</para>
+        </listitem>
       </itemizedlist>
     </sect2>
     <sect2 id="gosdeskback-10">
@@ -775,7 +780,7 @@ ways:</para>
           <para>Right-click on the <guilabel>Trash</guilabel> object, then choose <guimenuitem>Empty Trash</guimenuitem>.</para>
         </listitem>
         <listitem>
-          <para>From a file manager window</para>
+          <para>From a file browser window</para>
           <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Empty
 Trash</guimenuitem></menuchoice>.</para>
         </listitem>
@@ -866,8 +871,9 @@ information, see <xref linkend="gosdeskback-3"/>.</para>
               </para>
             </entry>
             <entry valign="top">
-              <para>Create a document. You can select to create an empty
-document or select a document from a template.</para>
+              <para>Creates a document. You can create templates from
+documents that you frequently create. For example, if you often create invoices,
+you can create an empty invoice document and save the document as <literal>invoice.doc</literal> in the <literal>$HOME/Templates</literal> folder.</para>
             </entry>
           </row>
           <row>
@@ -899,7 +905,7 @@ on the desktop are aligned.</para>
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Puts the file or files into the selected folder or the desktop.</para>
+              <para>Puts file or files into a selected folder or the desktop.</para>
             </entry>
           </row>
           <row>
diff --git a/gnome2-user-guide/C/goseditmainmenu.xml b/gnome2-user-guide/C/goseditmainmenu.xml
index 406c893..504c350 100644
--- a/gnome2-user-guide/C/goseditmainmenu.xml
+++ b/gnome2-user-guide/C/goseditmainmenu.xml
@@ -106,20 +106,6 @@ as a drawer object. </para>
           <para>Change the properties of submenus and menu items.</para>
         </listitem>
       </itemizedlist>
-      <para><xref linkend="goseditmainmenu-FIG-39"/> shows the popup menu.</para>
-      <figure id="goseditmainmenu-FIG-39">
-        <title>Menu Item Popup Menu<indexterm><primary>menu item popup menu</primary><secondary>illustration</secondary></indexterm></title>
-        <screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/launcher_popup.png" format="PNG"/>
-            </imageobject>
-            <textobject>
-              <phrase>Menu item popup menu. The context describes the graphic.</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
       <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>
@@ -174,16 +160,6 @@ dialog. </para>
             <row>
               <entry colname="colspec0">
                 <para>
-                  <guimenuitem>Help on <replaceable>application-name</replaceable></guimenuitem>
-                </para>
-              </entry>
-              <entry colname="colspec1">
-                <para>Opens the online help for the application.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0">
-                <para>
                   <guimenuitem>Properties</guimenuitem>
                 </para>
               </entry>
@@ -353,13 +329,25 @@ dialog to save the screenshot.</para>
             </entry>
           </row>
           <row>
+            <entry colname="colspec0">
+              <para>
+                <guimenuitem>Lock Screen</guimenuitem>
+              </para>
+            </entry>
+            <entry colname="colspec1">
+              <para>Lock Screen locks your screen.</para>
+            </entry>
+          </row>
+          <row>
             <entry valign="top">
               <para>
                 <guimenuitem>Log Out</guimenuitem>
+                <emphasis>username</emphasis>
               </para>
             </entry>
             <entry valign="top">
-              <para>Logs you out of the current session. </para>
+              <para>Logs you out of
+the current session. </para>
             </entry>
           </row>
         </tbody>
@@ -392,7 +380,7 @@ 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
+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>
@@ -400,10 +388,10 @@ dialog opens with the command from the menu in the command field.</para></listit
           <para>The <guilabel>Run Application</guilabel> dialog is displayed.</para>
         </listitem>
         <listitem>
-          <para>Enter the command that you want to run in the blank field.
-Alternatively, to choose  a command that you ran previously, click the down
-arrow button beside the command field, then choose the command to run.</para>
-          <para>Alternatively, select the <guibutton>Show list of known applications</guibutton> option to display a list of available applications.</para>
+          <para>Enter the command that you want to run in the blank field. </para>
+          <para>Alternatively, to choose  a command that you ran previously, click the
+down arrow button beside the command field, then choose the command to run.</para>
+          <para>Alternatively, select the <guilabel>Show list of known applications</guilabel> option to display a list of available applications.</para>
           <para>You can also use the <guibutton>Run with file</guibutton> button to
 choose a file to append to the command line. For example, you can enter <application>emacs</application> as the command, then choose a file to edit.</para>
           <para>Select the <guilabel>Run in terminal</guilabel> option to run the application
@@ -486,6 +474,9 @@ 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>
+          <para>You can also save the screenshot to a web page. To save the screenshot
+to a web page, select the <guilabel>Save screenshot to web page</guilabel>
+option. </para>
         </listitem>
         <listitem>
           <para>Use a command</para>
@@ -566,28 +557,8 @@ Menu</see>
     <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>
-        <primary>Main Menu</primary>
-        <secondary>opening</secondary>
-      </indexterm>
-      <para>You can open the <guimenu>Main Menu</guimenu> in the following ways: </para>
-      <itemizedlist>
-        <listitem>
-          <para>From a panel with a <guimenu>Main Menu</guimenu></para>
-          <para>Click on the <guimenu>Main Menu</guimenu>. </para>
-        </listitem>
-        <listitem>
-          <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>
-        </listitem>
-      </itemizedlist>
-    </sect2>
+    <para>You can add <guimenu>Main Menu</guimenu> buttons to your panels. Click
+on the <guimenu>Main Menu</guimenu> button to open the <guimenu>Main Menu</guimenu>.</para>
     <sect2 id="goseditmainmenu-29">
       <title>To Add a Main Menu to a Panel</title>
       <indexterm>
@@ -666,8 +637,7 @@ 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>
+in the file manager, access one of the following URIs in the file manager:</para>
     <informaltable frame="topbot">
       <tgroup cols="2" colsep="0" rowsep="0">
         <colspec colwidth="50*"/>
@@ -706,8 +676,8 @@ on the location bar:</para>
         </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>
+    <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>
@@ -718,12 +688,11 @@ on the location bar:</para>
       <orderedlist>
         <listitem>
           <para>In a file manager window, access the location where you want
-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>
+to add the menu. For example, if you want to add a menu to the <guimenu>Applications</guimenu> menu, enter <command>applications:///</command> URI.</para>
         </listitem>
         <listitem>
           <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>
+is added to the menu. The name of the folder is selected.</para>
         </listitem>
         <listitem>
           <para>Type a name for the folder, then press <keycap>Return</keycap>. </para>
@@ -789,7 +758,7 @@ steps:</para>
         <listitem>
           <para>In a file manager window, access the location from which you
 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>
+the <guimenu>Applications</guimenu> menu, enter <command>applications:///</command> URI.</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 b16be8d..e5059a5 100644
--- a/gnome2-user-guide/C/gosmetacity.xml
+++ b/gnome2-user-guide/C/gosmetacity.xml
@@ -107,17 +107,6 @@ that enable you to do the following:</para>
 you open a dialog window, the window is usually raised and has focus. Some
 dialog windows do not allow you to use the application until you close the
 dialog. </para>
-        <para>The following figure shows a typical dialog window. </para>
-        <screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/gedit_pref_dialog.png" format="PNG"/>
-            </imageobject>
-            <textobject>
-              <phrase>Dialog window in Simple theme.</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
       </listitem>
     </itemizedlist>
     <sect2 id="gosmetacity-16">
@@ -200,8 +189,8 @@ the button to open the <guimenu>Window Menu</guimenu>. </para>
 the new location. </para>
                     </listitem>
                     <listitem>
-                      <para>To shade the window, double-click on the titlebar. To unshade
-the window, double-click on the titlebar again.</para>
+                      <para>To maximize the window, double-click on the titlebar. To restore
+the window to the  previous size, double-click on the titlebar again.</para>
                     </listitem>
                   </itemizedlist>
                 </entry>
@@ -413,9 +402,8 @@ to Workspace Right</guimenuitem>  or <guimenuitem>Move to Workspace Left</guimen
               <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>
+in the last workspace at the right of the Workspace Switcher, 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>
@@ -426,8 +414,8 @@ 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>
+                <para>Moves the window to another workspace. Select the workspace to which you want
+to move the window from the submenu.</para>
               </entry>
             </row>
           </tbody>
@@ -476,9 +464,7 @@ which application windows are open. You can view which windows are open even
 if some windows are minimized, or other windows overlap a window. <application>Window List</application> can display buttons for the windows in your current
 workspace, or in all workspaces. To select this option, you must change the
 preferences of <application>Window List</application>.</para>
-      <para>You can also right-click on a window list button to open the <guimenu>Window Menu</guimenu> for the window that the button represents. When you
-open the <guimenu>Window Menu</guimenu> from <application>Window List</application>,
-the <guimenu>Window Menu</guimenu> does not contain the workspace commands.
+      <para>You can also right-click on a window list button to open the <guimenu>Window Menu</guimenu> for the window that the button represents.
 For more information on the <guimenu>Window Menu</guimenu> commands, see <xref linkend="gosmetacity-24"/>.</para>
       <para><xref linkend="gosmetacity-FIG-8"/> shows <application>Window List</application>
 when the following windows are open:</para>
@@ -626,10 +612,8 @@ focus to windows, minimize windows, and restore windows.</para>
         <para>To open the <guimenu>Window Menu</guimenu> for a window in a button
 group, right-click on the window list button that represents the group. A
 list of the windows in the group is displayed. To open the <guimenu>Window
-Menu</guimenu> for a window in the group, click on the item in the list. When
-you open the <guimenu>Window Menu</guimenu> from the <application>Window List</application>, the <guimenu>Window Menu</guimenu> does not contain the workspace
-commands. For more information on the <guimenu>Window Menu</guimenu> commands,
-see <xref linkend="gosmetacity-24"/>.</para>
+Menu</guimenu> for a window in the group, point to the item in the list.
+For more information on the <guimenu>Window Menu</guimenu> commands, see <xref linkend="gosmetacity-24"/>.</para>
       </sect3>
     </sect2>
     <sect2 id="gosmetacity-20">
@@ -698,11 +682,10 @@ applet. The following figure shows an example of the <application>Window Selecto
           </textobject>
         </mediaobject>
       </screenshot>
-      <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>
+      <para>To give focus to a window, select the window from the <application>Window Selector</application> applet.</para>
+      <para>The <application>Window Selector</application> 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>
   <sect1 id="gosmetacity-715">
@@ -769,25 +752,26 @@ default shortcut keys to switch between windows are <keycombo><keycap>Alt</keyca
               </entry>
             </row>
             <row>
-              <entry colname="colspec0" valign="top">
+              <entry colname="colspec0">
                 <para>
-                  <application>Workspace Switcher</application>
+                  <application>Window Selector</application>
                 </para>
               </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Click on the window that you want to give focus to in the <application>Workspace
-Switcher</application> display. If you click on a window in another workspace, <application>Workspace Switcher</application> switches to the new workspace, and gives
-focus to the window. </para>
+              <entry colname="colspec1">
+                <para>Click on the <application>Window Selector</application> icon. A list of your open windows is displayed. Select the
+window from the list.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para>Top edge panel</para>
+                <para>
+                  <application>Workspace Switcher</application>
+                </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <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>
+                <para>Click on the window that you want to give focus to in the <application>Workspace
+Switcher</application> display. If you click on a window in another workspace, <application>Workspace Switcher</application> switches to the new workspace, and gives
+focus to the window. </para>
               </entry>
             </row>
           </tbody>
@@ -804,7 +788,7 @@ windows is displayed. Choose the window from the list.</para>
         <primary>minimizing</primary>
         <secondary>windows</secondary>
       </indexterm>
-      <para>To minimize a window perform one of the following actions: </para>
+      <para>To minimize a window, perform one of the following actions: </para>
       <itemizedlist>
         <listitem>
           <para>Click on the <guibutton>Minimize</guibutton> button on the
@@ -834,7 +818,7 @@ from the popup menu.</para>
         <primary>maximizing windows</primary>
       </indexterm>
       <para>When you
-maximize a window, the window expands as much as possible. To maximize a window
+maximize a window, the window expands as much as possible. To maximize a window,
 perform one of the following actions: </para>
       <itemizedlist>
         <listitem>
@@ -858,7 +842,7 @@ from the <guimenu>Window Menu</guimenu>.</para>
         <primary>restoring</primary>
         <secondary>windows</secondary>
       </indexterm>
-      <para>To restore a maximized window perform one of the following actions: </para>
+      <para>To restore a maximized window, perform one of the following actions: </para>
       <itemizedlist>
         <listitem>
           <para>Click on the <guibutton>Maximize</guibutton> button on the
@@ -875,18 +859,9 @@ window frame.</para>
 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>
+      <title>To Place a Window on Top of Other Windows</title>
+      <para>To place a window on top of other windows, open the <guimenu>Window
+Menu</guimenu>, then choose <guimenuitem>On Top</guimenuitem>.</para>
     </sect2>
     <sect2 id="gosmetacity-32">
       <title>To Close a Window</title>
@@ -1023,8 +998,8 @@ rolled-up state so that the full window is displayed.</para>
         <listitem>
           <para>Double-click on the titlebar of the window. To roll down the
 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>
+up</guilabel> in the <application>Windows</application> preferences tool 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>
@@ -1061,8 +1036,9 @@ window to the workspace you require.</para>
         </listitem>
         <listitem>
           <para>Use the <guimenu>Window Menu</guimenu></para>
-          <para>Open the <guimenu>Window Menu</guimenu>. To move the window to the next
-workspace choose <guimenuitem>Move to Workspace Right</guimenuitem> or <guimenuitem>Move to Another Workspace <replaceable>workspace-name</replaceable></guimenuitem>.</para>
+          <para>Open the <guimenu>Window Menu</guimenu>. To move the window to another
+workspace, choose <guimenuitem>Move to Workspace Right</guimenuitem> or <guimenuitem>Move to Workspace Left</guimenuitem>. Alternatively, <guimenuitem>Move to
+Another Workspace <replaceable>workspace-name</replaceable></guimenuitem>.</para>
         </listitem>
       </itemizedlist>
     </sect2>
diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index 397b6ab..6ad52bb 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -10,43 +10,20 @@
       <secondary>introduction</secondary>
     </indexterm>
     <para>The <application>Nautilus</application> file manager provides
-an integrated access point to your files and applications. The file manager
-enables you to browse and to navigate your files and folders using the following:</para>
+an integrated access point to your files and applications. You can use the
+file manager to do the following:<itemizedlist><listitem><para>Create folders and documents.</para></listitem><listitem><para>Display your files and folders.</para></listitem><listitem><para>Manage your files and folders.</para></listitem><listitem><para>Run scripts.</para></listitem><listitem><para>Customize your files and folders.</para></listitem><listitem><para>Open special URI locations.</para></listitem><listitem><para>Write data to a CD.</para></listitem></itemizedlist>You can access your files and folders in the following ways:</para>
     <itemizedlist>
       <listitem>
-        <para>File browser window</para>
+        <para>Browse your files and folders</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>
-        <para>Manage your files and folders.</para>
-      </listitem>
-      <listitem>
-        <para>Run scripts.</para>
-      </listitem>
-      <listitem>
-        <para>Customize your files and folders.</para>
-      </listitem>
-      <listitem>
-        <para>Open special URI locations.</para>
-      </listitem>
-      <listitem>
-        <para>Write data to a CD.</para>
+        <para>Navigate your files and folders as objects</para>
+        <para>The file manager can also represent your files and folders as individual
+objects. Each file or folder is displayed in an individual file object window.
+When you open files or folders from file object windows, each file or folder
+opens a new window.</para>
       </listitem>
     </itemizedlist>
     <para><application>Nautilus</application> also manages the desktop. The desktop
@@ -59,14 +36,14 @@ is an active component of the user interface. </para>
       <primary>file manager</primary>
       <secondary>windows</secondary>
     </indexterm>
-    <para>You can browse your file system and navigate between directories by
-changing the current location of the file manager. </para>
+    <para>You can use file browser windows to browse your file system.</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>
+      <para>You can access file browser windows in the following ways:<itemizedlist><listitem><para>Click on the the file browser window launcher 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>.
+A file browser window displays the contents of your folder in the view pane.</para></listitem></itemizedlist></para>
+      <para><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>
@@ -80,9 +57,12 @@ window that displays the contents of the Home folder.</para>
           </mediaobject>
         </screenshot>
       </figure>
+      <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-493">
-      <title>Browser Window Components</title>
+      <title>File 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">
@@ -219,18 +199,14 @@ options:</para>
           </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 access files and folders from a file browser window in the following
+ways:<itemizedlist><listitem><para>Enter a path to the file or folder 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>
@@ -259,10 +235,10 @@ of the following:</para>
           <para>Locations that correspond to special URIs</para>
         </listitem>
       </itemizedlist>
-      <para><indexterm><primary>viewer components</primary></indexterm>The file
-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><indexterm><primary>viewer components</primary></indexterm>File browser
+windows contain <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>
@@ -273,9 +249,10 @@ can use a text viewer to display text files in the view pane.</para>
         </listitem>
       </itemizedlist>
       <para>However, you cannot edit a file in the view pane.</para>
-      <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>
+      <para>File browser windows also include <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>
         <listitem>
           <para>Icon view: Shows the items in the folder as icons. </para>
@@ -346,7 +323,7 @@ use the <guilabel>Tree</guilabel> to navigate through your files.</para>
 at the top right of the side pane.</para>
     </sect2>
     <sect2 id="gosnautilus-18">
-      <title>To Show and Hide Browser Window Components</title>
+      <title>To Show and Hide File Browser Window Components</title>
       <indexterm>
         <primary>file manager</primary>
         <secondary>window components, showing
@@ -375,16 +352,6 @@ statusbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Statusba
     </sect2>
     <sect2 id="gosnautilus-499">
       <title>To Display Your Home Folder</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>Home location</secondary>
@@ -395,7 +362,7 @@ statusbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Statusba
         <secondary>displaying</secondary>
       </indexterm>
       <para>To display your home location,
-perform one of the following actions from the file browser window:</para>
+perform one of the following actions from file browser windows:</para>
       <itemizedlist>
         <listitem>
           <para>Enter the home path in the <guilabel>Location</guilabel> field.</para>
@@ -621,6 +588,42 @@ items.</para>
 the item in the <guilabel>History</guilabel> list.</para>
       </sect3>
     </sect2>
+    <sect2 id="gosnautilus-447">
+      <title>Viewing Files in a File Browser Window</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 a file browser window. For
+example, you can display the following types of files in a file browser window:</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 a file browser window, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Reload</guimenuitem></menuchoice>.
+To stop loading an item, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Stop</guimenuitem></menuchoice>.</para>
+      <para>When you display a file in a file browser window, 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 a file browser window,
+you can use the file manager zoom buttons to change the size of the item.</para>
+    </sect2>
     <sect2 id="gosnautilus-36">
       <title>To Bookmark Your Favorite Locations</title>
       <indexterm>
@@ -779,30 +782,11 @@ following:</para>
       <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>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>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>
-      </itemizedlist>
+      <para>To access a file object window, double-click on any of the default desktop
+objects.</para>
       <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">
@@ -821,7 +805,7 @@ manager</primary><secondary>icon view</secondary><tertiary>illustration</tertiar
       </figure>
     </sect2>
     <sect2 id="gosnautilus-4">
-      <title>To Display Your Home Location</title>
+      <title>To Display Your Home Location in a File Object Window</title>
       <screenshot>
         <mediaobject>
           <imageobject>
@@ -842,14 +826,14 @@ manager</primary><secondary>icon view</secondary><tertiary>illustration</tertiar
         <secondary>displaying</secondary>
       </indexterm>
       <para>To display your home location,
-perform one of the following actions: </para>
+perform one of the following actions:</para>
       <itemizedlist>
         <listitem>
           <para>Double-click on the <guilabel>Home</guilabel> object on the
 desktop.</para>
         </listitem>
         <listitem>
-          <para>On a file manager window, choose <menuchoice><guimenu>Places</guimenu><guimenuitem>Home</guimenuitem></menuchoice>. </para>
+          <para>On a file object window, choose <menuchoice><guimenu>Places</guimenu><guimenuitem>Home</guimenuitem></menuchoice>. </para>
         </listitem>
       </itemizedlist>
       <para>The file object window displays the contents of your home location.
@@ -861,11 +845,11 @@ To reload the display,  choose <menuchoice><guimenu>View</guimenu><guimenuitem>R
         <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 a file object
+window in any of the following ways:</para>
       <itemizedlist>
         <listitem>
-          <para>Double-click on the folder in the file object window.</para>
+          <para>Double-click on the folder.</para>
         </listitem>
         <listitem>
           <para>Highlight the folder, then choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>. </para>
@@ -873,12 +857,13 @@ ways: </para>
       </itemizedlist>
     </sect2>
     <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>
+      <title>To Display a Parent Folder</title>
+      <para>A parent folder is a top level folder that depicts a hierarchical representation
+of your file system. To display the contents of a parent folder, perform the
+following steps:</para>
       <orderedlist>
         <listitem>
-          <para>Highlight a folder that is below the top level folder in a
-hierarchical representation of your file system.</para>
+          <para>Highlight the folder whose parent folder you want to display.</para>
         </listitem>
         <listitem>
           <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open Parent</guimenuitem></menuchoice>. </para>
@@ -887,15 +872,14 @@ hierarchical representation of your file system.</para>
     </sect2>
     <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>
+      <para>To display the contents of a folder in a file browser window, perform
+the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>Select a folder in the file object window.</para>
+          <para>Select a folder in a file object window.</para>
         </listitem>
         <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Browse Folder</guimenuitem></menuchoice> to open a file browser window for
-the folder.</para>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Browse Folder</guimenuitem></menuchoice>. </para>
         </listitem>
       </orderedlist>
     </sect2>
@@ -947,9 +931,7 @@ server, and to modify other system configuration details.</para>
 ways:</para>
       <itemizedlist>
         <listitem>
-          <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>
+          <para>From a file manager window, access the <command>start-here:///</command> URI.</para>
         </listitem>
         <listitem>
           <para>From the desktop</para>
@@ -1409,11 +1391,6 @@ of a folder in the following types of view: </para>
           <para>List view</para>
           <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.</para>
-        </listitem>
       </itemizedlist>
       <para>Use the <guilabel>View</guilabel> menu to choose how to display a file
 or folder. You can also use the <guilabel>View as</guilabel> drop-down list
@@ -2076,23 +2053,11 @@ for items beside the icon rather than under the icon.</para>
               <row>
                 <entry colname="colspec0">
                   <para>
-                    <guilabel>Use manual layout</guilabel>
-                  </para>
-                </entry>
-                <entry colname="colspec1">
-                  <para>Select this option if you want to arrange
-the items in icon view manually.</para>
-                </entry>
-              </row>
-              <row>
-                <entry colname="colspec0">
-                  <para>
                     <guilabel>Show only folders</guilabel>
                   </para>
                 </entry>
                 <entry colname="colspec1">
-                  <para>Select this option to display only folders
-in the <guilabel>Tree</guilabel> in the side pane.</para>
+                  <para>Select this option to display only folders in the <guilabel>Tree</guilabel> in the side pane.</para>
                 </entry>
               </row>
             </tbody>
@@ -2154,23 +2119,10 @@ on the item.</para>
               <row>
                 <entry colname="colspec6">
                   <para>
-                    <guilabel>Open activated item in a new
-window</guilabel>
+                    <guilabel>Run executable files when they are clicked</guilabel>
                   </para>
                 </entry>
                 <entry colname="colspec7">
-                  <para>Select this
-option to open a new window when you open a file or folder.</para>
-                </entry>
-              </row>
-              <row>
-                <entry colname="colspec6" valign="top">
-                  <para>
-                    <guilabel>Run executable
-files when they are clicked</guilabel>
-                  </para>
-                </entry>
-                <entry colname="colspec7" valign="top">
                   <para>Select this option to run an executable file when you choose
 the executable file. An executable file is a text file that can execute, that
 is, a shell script.</para>
@@ -2401,10 +2353,10 @@ 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>To specify a column to display in list view, select the option that
+corresponds to the column, then click on the <guibutton>Show</guibutton> button.
+To remove a column from the list view, select the option that corresponds
+to 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>
@@ -2736,11 +2688,6 @@ to the screen component. </para>
       </orderedlist>
       <para>To reset the background of the view pane or side pane to the default
 background, right-click on the background of the pane, then choose <guimenuitem>Use Default Background</guimenuitem>.</para>
-      <para>When you change the background of the side pane or the view pane of
-a particular folder, the file manager remembers the background that you chose.
-The next time that you display the folder, the background that you selected
-is displayed.  In other words, when you change the background of a folder,
-you customize the folder to display the background. </para>
       <sect3 id="gosnautilus-63">
         <title>To Add a Pattern</title>
         <indexterm>
@@ -2787,42 +2734,6 @@ 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>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>
-    </sect2>
     <sect2 id="gosnautilus-29">
       <title>To Execute the Default Action</title>
       <indexterm>
@@ -2901,8 +2812,14 @@ pane if the actions are excluded in either of the following dialogs:</para>
         </itemizedlist>
       </note>
     </sect2>
+  </sect1>
+  <sect1 id="gosnautilus-515">
+    <title>Navigating Your Computer</title>
+    <para>The <application>Nautilus</application> file manager provides an integrated
+access point to your files, applications, FTP sites, and URIs. </para>
+    <para>This section describes the following: <itemizedlist><listitem><para>How to access FTP sites.</para></listitem><listitem><para>How to access special URI locations.</para></listitem></itemizedlist></para>
     <sect2 id="gosnautilus-37">
-      <title>To Access FTP Sites</title>
+      <title>To Access an FTP Site</title>
       <indexterm>
         <primary>FTP sites</primary>
         <secondary>accessing</secondary>
@@ -2913,17 +2830,17 @@ pane if the actions are excluded in either of the following dialogs:</para>
         <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>
+FTP sites. To access an FTP site, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Connect to Server</guimenuitem></menuchoice>. Enter
+the URL in the <guilabel>Connect to Server</guilabel> dialog, then click on
+the<guibutton>Connect</guibutton> button. The contents of the site are displayed.</para>
+      <para>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>
+      <para>To reload the FTP site, 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>
@@ -3072,144 +2989,144 @@ 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
+    <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
+      </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
+      <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
+              </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
+              </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
+              </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
+              </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
+              </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
+              </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
+              </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>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </sect2>
   </sect1>
   <sect1 id="gosnautilus-8">
     <title>Managing Your Files and Folders</title>
@@ -3458,8 +3375,7 @@ you can move a file or folder.</para>
         <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>
+            <para>Open two file manager windows. </para>
           </listitem>
           <listitem>
             <para>In one window, select the folder from which you want to move
@@ -3497,15 +3413,14 @@ Files</guimenuitem></menuchoice>.</para>
         <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>
+      <para>The following sections describe the ways that
+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>
+        <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>
+            <para>Open two file manager windows. </para>
           </listitem>
           <listitem>
             <para>In one window, select the folder from which you want to copy
@@ -3545,7 +3460,7 @@ Files</guimenuitem></menuchoice>.</para>
 folders</secondary>
       </indexterm>
       <para>To create a copy of a file or folder
-in the current folder perform the following steps:</para>
+in the current folder, perform the following steps:</para>
       <orderedlist>
         <listitem>
           <para>Select the file or folder that you want to duplicate.</para>
@@ -3563,14 +3478,14 @@ or folder, then choose <guimenuitem>Duplicate</guimenuitem>.</para>
         <primary>file manager</primary>
         <secondary>creating folders</secondary>
       </indexterm>
-      <para>To create a folder perform the following steps:</para>
+      <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>
+on the background of the window, 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>
@@ -3580,28 +3495,47 @@ name of the folder is selected.</para>
       </orderedlist>
     </sect2>
     <sect2 id="gosnautilus-512">
-      <title>To Create a Document</title>
+      <title>Templates and Documents</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
+      <para>You can create templates from documents that you frequently
+create. For example, if you often create invoices, you can create an empty
+invoice document and save the document as <literal>invoice.doc</literal> in
+the <literal>$HOME/Templates</literal> folder.</para>
+      <para>You can also access the templates folder from a file browser window.
+Choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Templates</guimenuitem></menuchoice>.</para>
+      <para>The template name is displayed as a submenu item in the <guilabel>Create
+Document</guilabel> menu.</para>
+      <para>You can also create subfolders in the template folder. Subfolders display
+as submenus in the menu. </para>
+      <para>You can also share templates. Create a symbolic link from the template
+folder to the folder containing the shared templates. </para>
+      <sect3 id="gosnautilus-514">
+        <title>To Create a Document</title>
+        <para>If you have document templates, you can choose to create a document
+from one of the installed templates. </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>
+            <para>The names of any available templates are displayed as submenu items
+from the <guilabel>Create Document</guilabel> menu.</para>
+          </listitem>
+          <listitem>
+            <para>Double-click on the template name for the document that you
+want to create. </para>
+          </listitem>
+          <listitem>
+            <para>Rename the document before saving to the appropriate folder.</para>
+          </listitem>
+        </orderedlist>
+      </sect3>
     </sect2>
     <sect2 id="gosnautilus-12">
       <title>To Rename a File or Folder</title>
@@ -3644,11 +3578,10 @@ to <guilabel>Trash</guilabel> perform the following steps:</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>
+file or folder, 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>
+      <para>Alternatively, you can drag the file or folder 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
@@ -4007,11 +3940,16 @@ contents of <guilabel>Trash</guilabel> permanently. </para>
 ways:</para>
         <itemizedlist>
           <listitem>
-            <para>From a file manager window</para>
+            <para>From a file browser 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 a file object window</para>
+            <para>Choose <menuchoice><guimenu>Places</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>
@@ -4027,7 +3965,7 @@ the window.</para>
 ways:</para>
         <itemizedlist>
           <listitem>
-            <para>From a file manager window</para>
+            <para>From a file browser window</para>
             <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Empty
 Trash</guimenuitem></menuchoice>.</para>
           </listitem>
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index b358561..4f133b8 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -37,12 +37,8 @@ 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><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
+application from the file manager. </para><para>You can
+access your files and folders in the following ways: </para><itemizedlist><listitem><para>Browse your files and folders</para></listitem><listitem><para>Navigate your files and folders as objects</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
@@ -143,15 +139,6 @@ Provides access to the <guimenu>Applications</guimenu> menu and the <guimenu>Act
 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>
@@ -511,6 +498,17 @@ default shortcut keys to switch between windows are <keycombo><keycap>Alt</keyca
               </entry>
             </row>
             <row>
+              <entry colname="colspec0">
+                <para>
+                  <application>Window Selector</application>
+                </para>
+              </entry>
+              <entry colname="colspec1">
+                <para>Click on the Window Selector icon, then select
+the window that you want to give focus to from the list.</para>
+              </entry>
+            </row>
+            <row>
               <entry colname="colspec0" valign="top">
                 <para>
                   <application>Workspace Switcher</application>
@@ -605,38 +603,24 @@ specify the number of workspaces that you require.</para>
     <para>The <application>Nautilus</application> file
 manager provides an integrated access point to your files, applications, FTP
 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
+    <para>You can access your files and folders in
+the following ways:<itemizedlist><listitem><para>Browse your files and folders</para><para>You can use file browser windows to browse your files and folders. When
+you open a file or folder in a file browser window, the file or folder opens
+in the window.</para><para>File browser windows can contain the following panes:<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 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 both the file
-browser and file object windows.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+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 file browser
+window.</para></listitem></varlistentry></variablelist></para></listitem><listitem><para>Navigate your files and folders as objects</para><para>The file manager can also represent your files and folders as individual
+objects. Each file or folder is displayed in an individual file object window.
+When you open files or folders from file object windows, each file or folder
+opens a new window.</para></listitem></itemizedlist></para>
     <para>The file manager enables you to do the following:</para>
     <itemizedlist>
       <listitem>
         <para>View files and folders</para>
         <para>You can view your files and folders as icons or as a list. You can view
-the contents of some types of file within a file manager window. Alternatively,
-you can open the files in the appropriate application from the file manager. </para>
+the contents of some types of file within a file browser window. Alternatively,
+you can open the files in the appropriate application from a file object manager. </para>
       </listitem>
       <listitem>
         <para>Manage your files and folders</para>
@@ -653,7 +637,7 @@ and folders on which to run your scripts.</para>
         <para>You can add emblems to your files and folders to indicate particular
 states. For example, you can add an <guilabel>Important</guilabel> emblem
 to a file to indicate that the file is important. You can also customize folders
-in the following ways: <itemizedlist><listitem><para>Add a note to a folder.</para></listitem><listitem><para>Specify a custom background pattern for a folder.</para></listitem><listitem><para>Specify a zoom setting for a folder.</para></listitem></itemizedlist></para>
+in the following ways: <itemizedlist><listitem><para>Add a note to a folder.</para></listitem><listitem><para>Specify a custom background or pattern for a folder.</para></listitem><listitem><para>Specify a zoom setting for a folder.</para></listitem></itemizedlist></para>
       </listitem>
       <listitem>
         <para>Open special <firstterm>Uniform Resource Identifiers</firstterm>
@@ -670,24 +654,25 @@ the location to a CD easily.</para>
       </listitem>
     </itemizedlist>
     <para>The file manager also creates the desktop.</para>
+    <sect2 id="gosoverview-511">
+      <title>To View Files from the File Manager</title>
+      <para>To browse to the file that you want to view, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Browse Filesystem </guimenuitem></menuchoice>. A file browser window opens.  To access the folder where the
+file that you want to view resides, double-click on the folder icons in the
+view pane. When the file that you want to view is displayed, double-click
+on the file icon to view the file in the file browser window.</para>
+    </sect2>
     <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 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>
+      <title>To Open Files from the File Manager</title>
+      <para>To navigate to the file that you want to open, double-click on the <guilabel>Home</guilabel> object on the desktop. A file object window opens.  To navigate
+to the folder where the file that you want to open resides, double-click on
+the folder icons in the file object window. When the file that you want to
+open is displayed, double-click on the file icon to open the file in an application.</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">
@@ -756,7 +741,7 @@ you use often, then drag the launcher to your desktop. </para>
           <imagedata fileref="figures/naut_starthere_launcher.png" format="PNG"/>
         </imageobject>
         <textobject>
-          <phrase>Start Here icon.</phrase>
+          <phrase> Start Here icon.</phrase>
         </textobject>
       </mediaobject>
     </screenshot>
@@ -798,8 +783,9 @@ 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>
+        <para>Access the <command>start-here:///</command> URI in a file manager window.
+The contents of the <guilabel>Start Here</guilabel> location are displayed
+in the window.</para>
       </listitem>
       <listitem>
         <para>From the desktop</para>
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index 9317355..c425169 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -67,12 +67,12 @@ so you might see a slightly different top edge panel. </para>
             <row>
               <entry colname="colspec3">
                 <para>
-                  <application>Browse Filesystem</application>
+                  <application>File Browser Launcher</application>
                 </para>
               </entry>
               <entry colname="colspec4">
                 <para>Click on this launcher to open your home folder
-in a <application>Nautilus</application> file browser manager window.</para>
+in a <application>Nautilus</application> file browser window.</para>
               </entry>
             </row>
             <row>
@@ -108,12 +108,12 @@ applet</para>
                   <primary>top edge panel</primary>
                   <secondary>window list icon</secondary>
                 </indexterm>
-                <para><application>Window Selector</application> applet</para>
+                <para><application>Window Selector</application> icon</para>
               </entry>
               <entry colname="colspec4" valign="top">
                 <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>
+at the extreme right of the top edge panel, then select the window.</para>
               </entry>
             </row>
           </tbody>
@@ -271,8 +271,7 @@ 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 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>
@@ -542,9 +541,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>Show Desktop</guibutton> button, <guibutton>Run</guibutton>
+Out</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>
+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>
         </listitem>
         <listitem>
           <para>From any menu</para>
@@ -864,7 +863,7 @@ one of the following actions: </para>
         <para>Open a folder in a file manager window.</para>
       </listitem>
       <listitem>
-        <para>Open a browser at a particular <firstterm>Uniform Resource
+        <para>Open a Web browser at a particular <firstterm>Uniform Resource
 Locator</firstterm> (URL). A URL is the address of a particular location on
 the Web.</para>
       </listitem>
@@ -1040,7 +1039,7 @@ you choose an icon, click <guibutton>OK</guibutton>. </para>
                   <row>
                     <entry valign="top">
                       <para>
-                        <guilabel>Run in Terminal</guilabel>
+                        <guilabel>Run in terminal</guilabel>
                       </para>
                     </entry>
                     <entry valign="top">
@@ -1212,8 +1211,15 @@ that the commands perform:</para>
                 </entry>
               </row>
               <row>
-                <entry colname="colspec0" valign="top"/>
-                <entry colname="colspec1" valign="top"/>
+                <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 object window.</para>
+                </entry>
               </row>
             </tbody>
           </tgroup>
diff --git a/gnome2-user-guide/C/gosstartsession.xml b/gnome2-user-guide/C/gosstartsession.xml
index 0334f27..66ed663 100644
--- a/gnome2-user-guide/C/gosstartsession.xml
+++ b/gnome2-user-guide/C/gosstartsession.xml
@@ -294,15 +294,16 @@ perform one of the following actions:</para>
         <para>Click on a <guibutton>Log Out</guibutton> button.</para>
       </listitem>
       <listitem>
-        <para>Open the <guimenu>Main Menu</guimenu>, then choose <guimenuitem>Log Out</guimenuitem><replaceable>name</replaceable>.</para>
+        <para>Open the <guimenu>Main Menu</guimenu>, then choose <guimenuitem>Log Out</guimenuitem><replaceable>username</replaceable>.</para>
       </listitem>
       <listitem>
-        <para>Choose <menuchoice><guimenu>Actions</guimenu><guimenuitem>Log Out</guimenuitem></menuchoice>.</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
-so that you can restore the session later. During the logout process, a dialog
-asks if you want to save your current settings. In the <application>Sessions</application> preference tool, you can select an option to automatically
+    <para>Before you end a session, you might want to save your current
+settings so that you can restore the session later. During the logout process,
+a dialog asks if you want to save your current settings. In the <application>Sessions</application> preference tool, you can select an option to automatically
 save your current settings.</para>
   </sect1>
 </chapter>
diff --git a/gnome2-user-guide/C/user-guide.xml b/gnome2-user-guide/C/user-guide.xml
index fd70958..1d63afa 100644
--- a/gnome2-user-guide/C/user-guide.xml
+++ b/gnome2-user-guide/C/user-guide.xml
@@ -27,7 +27,10 @@
 		<year>2004</year> 

 		<holder>Sun Microsystems</holder> 

 	 </copyright>

-

+	 <copyright> 
+      	<year>2003</year> 
+         <holder>Sun Microsystems</holder> 
+ 	 </copyright>

 <!-- translators: uncomment this:

   <copyright>

    <year>2002</year>