Further updates to User Guide for GNOME 2.6

1 files changed, 42 insertions, 56 deletions

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>