- All I can manage to change before the deadline. ugh.

* gnome2-user-guide/C/gosbasic.xml:
* gnome2-user-guide/C/gosoverview.xml:
- All I can manage to change before the deadline.  ugh.

3 files changed, 433 insertions, 392 deletions

diff --git a/ChangeLog b/ChangeLog
index e301bf4..e8fb872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-13  Shaun McCance  <shaunm@gnome.org>
+
+	* gnome2-user-guide/C/gosbasic.xml:
+	* gnome2-user-guide/C/gosoverview.xml:
+	- All I can manage to change before the deadline.  ugh.
+
 2004-09-10  Irene Ryan <irene.ryan@sun.com>
 
 	* gnome2-accessibility-guide/C/*.xml 
diff --git a/gnome2-user-guide/C/gosbasic.xml b/gnome2-user-guide/C/gosbasic.xml
index 752fc90..feb73ab 100644
--- a/gnome2-user-guide/C/gosbasic.xml
+++ b/gnome2-user-guide/C/gosbasic.xml
@@ -31,8 +31,9 @@ types of mouse devices:</para>
         </listitem>
         <listitem>
           <para>Three button devices. If you have a two-button mouse device,
-then you press the two buttons simultaneously to simulate the effect of a
-middle mouse button. </para>
+	  then your system may be configured to allow you to press the left
+	  and right mouse buttons simultaneously to simulate the effect of
+	  a middle mouse button press.</para>
         </listitem>
       </itemizedlist>
       <para>The mouse button conventions used in this manual are as follows:</para>
@@ -699,7 +700,8 @@ you can select is displayed. Release the keys to select a window.</para>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para><keycombo><keycap>Alt</keycap><keycap>Esc</keycap></keycombo></para>
+                <para><keycombo><keycap>Shift</keycap><keycap>Alt</keycap>
+		<keycap>Tab</keycap></keycombo></para>
               </entry>
               <entry colname="colspec1" valign="top">
                 <para>Switches
@@ -756,34 +758,42 @@ in a menu.</para>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo></para>
+                <para><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap>
+		<keycap>Alt</keycap><keycap>right arrow</keycap></keycombo></para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Switches to the workspace to the right of the current workspace.</para>
+                <para>Moves the current window to the workspace to the right of
+		the current workspace.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo></para>
+                <para><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap>
+		<keycap>Alt</keycap><keycap>left arrow</keycap></keycombo></para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Switches to the workspace to the left of the current workspace.</para>
+                <para>Moves the current window to the workspace to the left of
+		the current workspace.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>up arrow</keycap></keycombo></para>
+                <para><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap>
+		<keycap>Alt</keycap><keycap>up arrow</keycap></keycombo></para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Switches to the workspace above the current workspace.</para>
+                <para>Moves the current window to the workspace above the
+		current workspace.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>down arrow</keycap></keycombo></para>
+                <para><keycombo><keycap>Shift</keycap><keycap>Ctrl</keycap>
+		<keycap>Alt</keycap><keycap>down arrow</keycap></keycombo></para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Switches to the workspace below the current workspace.</para>
+                <para>Moves the current window to the workspace below the
+		current workspace.</para>
               </entry>
             </row>
             <row>
@@ -833,20 +843,11 @@ Release the keys to select an item.</para>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Esc</keycap></keycombo></para>
+                <para><keycombo><keycap>Ctrl</keycap>
+		<keycap>F10</keycap></keycombo></para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Switches the focus between the panels and the desktop.
-Release the keys to select an item.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para><keycombo><keycap>Ctrl</keycap><keycap>F10</keycap></keycombo></para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Opens
-the popup menu for the selected panel.</para>
+                <para>Opens the popup menu for the selected panel.</para>
               </entry>
             </row>
             <row>
@@ -1149,10 +1150,11 @@ your selection, for example, within a group of radio buttons in a dialog.</para>
         <secondary>resizing</secondary>
       </indexterm>
       <para>Some windows contain more than one <firstterm>pane</firstterm>.
-A pane is a subdivision of a window. For example, the <application>Nautilus</application> file manager window contains a side pane and a view pane. A
-window that contains panes has a resize handle on the edge between the panes.
-To resize the pane, grab the resize handle, then drag the edge to the size
-you require.</para>
+      A pane is a subdivision of a window.  For instance, the
+      <application>Help</application> window contains a side pane with a list
+      of sections and a pane for viewing help.  A window that contains panes
+      has a resize handle on the edge between the panes.  To resize the pane,
+      grab the resize handle, then drag the edge to the size you require.</para>
     </sect2>
     <sect2 id="gosbasic-49">
       <title>Using Tables</title>
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index 4f133b8..bedb492 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -1,4 +1,4 @@
-<chapter id="gosoverview-1">
+<chapter id="gosoverview-1"><!-- -*- indent-tabs-mode: nil -*- -->
   <title>Overview of the GNOME Desktop</title>
   <highlights>
     <para>This chapter introduces you to the features and main components
@@ -12,53 +12,109 @@ the typical default configuration, covering the following topics.</para>
     <indexterm>
       <primary>GNOME Desktop components, introducing</primary>
     </indexterm>
-    <para>When you start a GNOME Desktop session for the first time, you should
-see a default startup screen, with panels, windows, and various icons. </para>
-    <para>The major components of the GNOME Desktop are as follows: <itemizedlist><listitem><para>Panels</para><para>Panels are areas in the GNOME Desktop from which you can access all
-of your system applications and menus. Panels are very configurable. </para><para>A particularly important panel is the top edge panel. The top edge panel includes
-the <application>Menu Bar</application>. The <application>Menu Bar</application>
-contains two special menus, as follows:</para><itemizedlist><listitem><para><guimenu>Applications</guimenu> menu: Contains all applications
-and configuration tools. This menu also includes the file manager and the
-help browser. To start the file manager, choose <guimenuitem>Home Folder</guimenuitem>
-from the <guimenu>Applications</guimenu> menu.</para></listitem><listitem><para><guimenu>Actions</guimenu> menu: Contains various commands
-that perform various functions, for example <guimenuitem>Search for Files</guimenuitem>
-and <guimenuitem>Log Out</guimenuitem>. </para></listitem></itemizedlist><para>Click on the <guibutton>Window Selector</guibutton> icon
-at the extreme right of the top edge panel to display a list of all open windows.</para></listitem><listitem><para>Menus</para><para>You can access all GNOME Desktop functions through menus. You can use
-the <guimenu>Applications</guimenu> menu to access almost all of the standard
-applications, commands, and configuration options. You can access the <guimenu>Applications</guimenu> menu from the <guimenu>Main Menu</guimenu> and from
-the <application>Menu Bar</application> applet. You can add the <guimenu>Main Menu</guimenu> and the <application>Menu Bar</application> applet to
-your panels.</para><para>The <application>Menu Bar</application> applet contains an <guimenu>Actions</guimenu> menu. The <guimenu>Actions</guimenu> menu contains commands
-that perform various functions, for example <guimenuitem>Search for Files</guimenuitem>
-and <guimenuitem>Log Out</guimenuitem>. The items in the <guimenu>Actions</guimenu> menu are at the top level of the <guimenu>Main Menu</guimenu>.</para></listitem><listitem><para>Windows</para><para>You can display many windows at the same time. You can run different
-applications in each window. The window manager provides frames and buttons
-for windows. The window manager enables you to perform standard actions such
-as move, close, and resize windows. </para></listitem><listitem><para>Workspaces</para><para>You can subdivide the GNOME Desktop into separate <firstterm>workspaces</firstterm>. A workspace is a discrete area in which you can work. You can
-specify the number of workspaces in the GNOME Desktop. You can switch to a
-different workspace, but you can only display one workspace at a time.</para></listitem><listitem><para><application>Nautilus</application> file manager</para><para>The <application>Nautilus</application> file manager provides an integrated
-access point to your files and applications. You can display the contents
-of your files within a file manager window, or open the files in the appropriate
-application from the file manager. </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
-open a menu.</para></listitem><listitem><para><guilabel>Start Here</guilabel> location</para><para>The <guilabel>Start Here</guilabel> location provides an access point
-to some of the key features of the GNOME Desktop. You can access your GNOME
-applications and configuration tools from the <guilabel>Start Here</guilabel>
-location. You can also access programs that enable you to configure your system
-as a server, and to modify other system configuration details.</para></listitem><listitem><para>Preferences</para><para>The GNOME Desktop contains dedicated <firstterm>preference tools</firstterm>.
-Each tool controls a particular part of the behavior of the GNOME Desktop. To
-start a preference tool, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the item that you want to configure
-from the submenus.</para></listitem></itemizedlist></para>
-    <para>The most powerful features of the GNOME Desktop are the high degree
-of configurability and the multiple ways that you can perform tasks.</para>
+    <para>When you start a GNOME Desktop session for the first time,
+    you should see a default startup screen, with panels, windows, and
+    various icons.</para>
+    <para>The major components of the GNOME Desktop are as follows:</para>
+    <variablelist>
+      <varlistentry>
+        <term>Panels</term>
+        <listitem>
+          <para>Panels are areas in the GNOME Desktop from which you
+          can access all of your system applications and menus. Panels are very
+          configurable.</para>
+          <para>A particularly important panel is the top edge panel. The top
+          edge panel includes the <application>Menu Bar</application>. The
+          <application>Menu Bar</application> contains two special menus, as
+          follows:</para>
+          <itemizedlist>
+            <listitem><para><guimenu>Applications</guimenu> menu: Contains all
+            applications and configuration tools. This menu also includes the
+            file browser and the help browser.</para></listitem>
+            <listitem><para><guimenu>Actions</guimenu> menu: Contains various
+            commands that perform various functions, for example
+            <guimenuitem>Search for Files</guimenuitem> and <guimenuitem>Log
+            Out</guimenuitem>.</para></listitem>
+          </itemizedlist>
+          <para>Click on the <guibutton>Window Selector</guibutton> icon at the
+          extreme right of the top edge panel to display a list of all open
+          windows.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Menus</term>
+        <listitem>
+          <para>You can access all GNOME Desktop functions through menus. You
+          can use the <guimenu>Applications</guimenu> menu to access almost all
+          of the standard applications, commands, and configuration options.
+          You can access the <guimenu>Applications</guimenu> menu from the
+          <guimenu>Main Menu</guimenu> and from the <application>Menu
+          Bar</application> applet.  You can add the <guimenu>Main
+          Menu</guimenu> and the <application>Menu Bar</application>
+          applet to your panels.</para>
+          <para>The <application>Menu Bar</application> applet contains an
+          <guimenu>Actions</guimenu> menu.  The <guimenu>Actions</guimenu>
+          menu contains commands that perform various functions, for example
+          <guimenuitem>Search for Files</guimenuitem> and <guimenuitem>Log
+          Out</guimenuitem>.  The items in the <guimenu>Actions</guimenu>
+          menu are at the top level of the
+          <guimenu>Main Menu</guimenu>.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Windows</term>
+        <listitem><para>You can display many windows at the same time.  You
+        can run different applications in each window. The window manager
+        provides frames and buttons for windows. The window manager enables
+        you to perform standard actions such as move, close, and resize
+        windows.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Workspaces</term>
+        <listitem><para>You can subdivide the GNOME Desktop into separate
+        <firstterm>workspaces</firstterm>. A workspace is a discrete area
+        in which you can work. You can specify the number of workspaces
+        in the GNOME Desktop. You can switch to a different workspace,
+        but you can only display one workspace at a time.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><application>Nautilus</application> file manager</term>
+        <listitem>
+          <para>The <application>Nautilus</application> file manager
+          provides an integrated access point to your files and
+          applications.  You can manage the contents of folders in
+          the file manager and open the files in the appropriate
+          applications.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Desktop</term>
+        <listitem>
+          <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 access your files and
+          directories quickly, or to start applications that you use often.
+          You can also right-click on the desktop to open a menu.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Preferences</term>
+        <listitem><para>The GNOME Desktop contains dedicated
+        <firstterm>preference tools</firstterm>. Each tool controls
+        a particular part of the behavior of the GNOME Desktop.  To
+        start a preference tool, choose <menuchoice>
+        <guimenu>Applications</guimenu><guimenuitem>Desktop
+        Preferences</guimenuitem></menuchoice>. Choose the item
+        that you want to configure from the submenus.</para></listitem>
+      </varlistentry>
+    </variablelist>
     <para>The components of the GNOME Desktop are interoperable. Usually, you
-can perform the same action in several different ways. For example, you can
-start applications from panels, from menus, or from the desktop.</para>
+    can perform the same action in several different ways. For example, you can
+    start applications from panels, from menus, or from the desktop.</para>
     <para>Your system administrator can make configuration changes to suit your
-needs, so that the GNOME Desktop that you use might not be exactly the same
-as described in this chapter. Nevertheless, this chapter provides a useful
-quick guide to how to work with the GNOME Desktop. </para>
+    needs, so that the GNOME Desktop that you use might not be exactly the same
+    as described in this chapter. Nevertheless, this chapter provides a useful
+    quick guide to how to work with the GNOME Desktop.</para>
   </sect1>
   <sect1 id="gosoverview-502">
     <title>Panels</title>
@@ -121,147 +177,171 @@ contains each type of panel object. </para>
         </screenshot>
       </figure>
       <para>You can add any of the following objects to all types of panels:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Applets</para>
+      <variablelist>
+        <varlistentry>
           <indexterm>
             <primary>applets</primary>
             <secondary>overview</secondary>
           </indexterm>
-          <para><firstterm>Applets</firstterm> are small, interactive applications that
-reside within a panel, for example <application>CD Player</application> in <xref linkend="gosoverview-FIG-28"/>. Each applet has a simple user interface that
-you can operate with the mouse or keyboard. The following applets appear in
-your panels by default:</para>
-          <itemizedlist>
-            <listitem>
-              <para><application>Menu Bar</application>:
-Provides access to the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu. You can use the menus to access your applications,
-preference tools, and other tasks.</para>
-            </listitem>
-            <listitem>
-              <para><application>Clock</application>: Displays the time. You can
-also configure <application>Clock</application> to display the date.</para>
-            </listitem>
-            <listitem>
-              <para><application>Window Selector</application>: Lists all your
-open windows. To give focus to a window, click on the window selector icon
-at the extreme right of the top edge panel, then choose the window.</para>
-            </listitem>
-            <listitem>
-              <para><application>Window List</application>: Displays a button
-for each window that is open. You can click on a window list button to minimize
-and restore windows. By default, <application>Window List</application> appears
-in the edge panel at the bottom of the screen.</para>
-            </listitem>
-            <listitem>
-              <para><application>Workspace Switcher</application>: Displays a
-visual representation of your workspaces. You can use <application>Workspace
-Switcher</application> to switch between workspaces. By default, <application>Workspace Switcher</application> appears in the edge panel at the bottom of
-the screen.</para>
-            </listitem>
-          </itemizedlist>
-          <para>To add an applet to a panel, right-click on a vacant space on the panel,
-then choose <guimenuitem>Add to Panel</guimenuitem>. Choose the applet that
-you require from one of the following submenus:</para>
-          <itemizedlist>
-            <listitem>
-              <para>Accessories</para>
-            </listitem>
-            <listitem>
-              <para>Amusements</para>
-            </listitem>
-            <listitem>
-              <para>Internet</para>
-            </listitem>
-            <listitem>
-              <para>Multimedia</para>
-            </listitem>
-            <listitem>
-              <para>Utility</para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-        <listitem>
-          <para>Launchers</para>
-          <para>A <firstterm>launcher</firstterm> starts a particular application, executes
-a command, or opens a file. The calculator icon in <xref linkend="gosoverview-FIG-28"/>
-is a launcher for the <application>Calculator</application> application. A
-launcher can reside in a panel or in a menu. Click on the launcher to perform
-the action that is associated with the launcher.</para>
-          <para>You can create your own launchers for applications. For example, you
-can create a launcher for a word processor application that you use frequently,
-and place the launcher in a panel for convenient access. To add a new launcher
-to a panel, right-click on a vacant space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Launcher</guimenuitem></menuchoice>. </para>
-          <para>Alternatively, to add a launcher from a menu, right-click on a vacant
-space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Launcher from menu</guimenuitem></menuchoice>. Choose
-the launcher to add from the submenus.</para>
-        </listitem>
-        <listitem>
-          <para>Action buttons</para>
-          <para>You can add buttons to your panels to provide quick access to common
-actions. You can add the following buttons to your panels:</para>
-          <itemizedlist>
-            <listitem>
-              <para><guibutton>Force Quit</guibutton>: Use this button to terminate
-applications that do not respond to your commands.</para>
-            </listitem>
-            <listitem>
-              <para><guibutton>Lock</guibutton>: Click on this button to lock
-your screen. The lock icon in <xref linkend="gosoverview-FIG-28"/> is the <guibutton>Lock</guibutton> button. </para>
-            </listitem>
-            <listitem>
-              <para><guibutton>Log Out</guibutton>: Click on this button to end
-your session</para>
-            </listitem>
-            <listitem>
-              <para><guibutton>Run</guibutton>: Click on this button to open the <guilabel>Run Application</guilabel> dialog, from which you can run commands.</para>
-            </listitem>
-            <listitem>
-              <para><guibutton>Screenshot</guibutton>: Click on this button to
-take a screenshot of the screen.</para>
-            </listitem>
-            <listitem>
-              <para><guibutton>Search</guibutton>: Click on this button to start
-the <application>Search Tool</application> application, from which you can
-search for files. </para>
-            </listitem>
-            <listitem>
-              <para><guibutton>Show Desktop</guibutton>: Click on this button
-to minimize all windows and show the desktop.</para>
-            </listitem>
-          </itemizedlist>
-          <para>To add a button to a panel, right-click on a vacant space on the panel,
-then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Actions</guimenuitem></menuchoice>. You can then choose the button you require. </para>
-        </listitem>
-        <listitem>
-          <para>Menus</para>
-          <para>You can access all GNOME Desktop functions through menus. To open a
-menu from a panel, click on the icon that represents the menu. To open a menu
-from the <application>Menu Bar</application>, click on the text that represents
-the menu. </para>
-          <para>Menus that you add to your panels are represented by an icon with an
-arrow. The arrow indicates that the icon represents a menu. For example, see
-the menu icon in <xref linkend="gosoverview-FIG-28"/>.</para>
-          <para>You can add the <guimenu>Main Menu</guimenu> to any of your panels.
-To add the <guimenu>Main Menu</guimenu> to a panel, right-click on a vacant
-space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>.</para>
-          <para>You can also add the <application>Menu Bar</application> to any of your
-panels. To add the <application>Menu Bar</application> to a panel, right-click
-on a vacant space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Menu Bar</guimenuitem></menuchoice>.</para>
-        </listitem>
-        <listitem>
-          <para>Drawers</para>
-          <para><firstterm>Drawers</firstterm> are sliding extensions to a panel that
-you can open or close from a drawer icon, as shown in <xref linkend="gosoverview-FIG-28"/>.
- Drawers can help you to organize your work when you run a lot of applications
-simultaneously. You can place all the same functional elements in a drawer
-that you can put in any other type of panel. </para>
-          <para>To add a drawer to a panel, right-click on a vacant space on the panel,
-then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Drawer</guimenuitem></menuchoice>. </para>
-          <para>To open a drawer click on the drawer. To close a drawer click on the
-drawer again.</para>
-        </listitem>
-      </itemizedlist>
+          <term>Applets</term>
+          <listitem>
+            <para><firstterm>Applets</firstterm> are small, interactive
+            applications that reside within a panel, for example <application>CD
+            Player</application> in <xref linkend="gosoverview-FIG-28"/>.
+            Each applet has a simple user interface that you can operate with
+            the mouse or keyboard. The following applets appear in your panels
+            by default:</para>
+
+            <itemizedlist>
+              <listitem><para><application>Menu Bar</application>: Provides
+              access to the <guimenu>Applications</guimenu> menu and the
+              <guimenu>Actions</guimenu> menu. You can use the menus
+              to access your applications, preference tools, and other
+              tasks.</para></listitem>
+
+              <listitem><para><application>Clock</application>: Displays the time.
+              You can also configure <application>Clock</application> to display
+              the date.</para></listitem>
+
+              <listitem><para><application>Window Selector</application>: Lists
+              all your open windows. To give focus to a window, click on the
+              window selector icon at the extreme right of the top edge panel,
+              then choose the window.</para></listitem>
+
+              <listitem><para><application>Window List</application>: Displays
+              a button for each window that is open. You can click on a window
+              list button to minimize and restore windows. By default,
+              <application>Window List</application> appears in the edge panel
+              at the bottom of the screen.</para></listitem>
+
+              <listitem><para><application>Workspace Switcher</application>:
+              Displays a visual representation of your workspaces. You can use
+              <application>Workspace Switcher</application> to switch between
+              workspaces. By default, <application>Workspace
+              Switcher</application> appears in the edge panel
+              at the bottom of the screen.</para></listitem>
+            </itemizedlist>
+
+            <para>To add an applet to a panel, right-click on a vacant space
+            on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>.
+            Choose the applet from the <application>Add to the panel</application>
+            dialog.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>Launchers</term>
+          <listitem>
+            <para>A <firstterm>launcher</firstterm> starts a particular
+            application, executes a command, or opens a file. The calculator
+            icon in <xref linkend="gosoverview-FIG-28"/> is a launcher for
+            the <application>Calculator</application> application.  A launcher
+            can reside in a panel or in a menu. Click on the launcher to perform
+            the action that is associated with the launcher.</para>
+
+            <para>You can create your own launchers for applications.  For
+            example, you can create a launcher for a word processor application
+            that you use frequently, and place the launcher in a panel for
+            convenient access. To add a new launcher to a panel, right-click
+            on a vacant space on the panel, then choose <menuchoice>
+            <guimenu>Add to Panel</guimenu><guimenuitem>Launcher</guimenuitem>
+            </menuchoice>.</para>
+
+            <para>Alternatively, to add a launcher from a menu, right-click
+            on a vacant space on the panel, then choose <guimenuitem>Add
+            to Panel</guimenuitem>.  Select <guilabel>Application
+            Launcher</guilabel> in the <application>Add to the
+            panel</application> dialog and click <guibutton>Forward</guibutton>.
+            On the following screen, select the application launcher to add
+            and click <guibutton>Add</guibutton>.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>Action buttons</term>
+          <listitem>
+            <para>You can add buttons to your panels to provide quick access
+            to common actions.  You can add the following buttons to your
+            panels:</para>
+            <itemizedlist>
+              <listitem><para><guibutton>Force Quit</guibutton>: Use this
+              button to terminate applications that do not respond to your
+              commands.</para></listitem>
+
+              <listitem><para><guibutton>Lock</guibutton>: Click on this button
+              to lock your screen.  The lock icon in <xref
+              linkend="gosoverview-FIG-28"/> is the <guibutton>Lock</guibutton>
+              button.</para></listitem>
+
+              <listitem><para><guibutton>Log Out</guibutton>: Click on this
+              button to end your session</para></listitem>
+
+              <listitem><para><guibutton>Run</guibutton>: Click on this button
+              to open the <guilabel>Run Application</guilabel> dialog, from
+              which you can run commands.</para></listitem>
+
+              <listitem><para><guibutton>Screenshot</guibutton>: Click on this
+              button to take a screenshot of the screen.</para></listitem>
+
+              <listitem><para><guibutton>Search</guibutton>: Click on this
+              button to start the <application>Search Tool</application>
+              application, from which you can search for files.</para></listitem>
+
+              <listitem><para><guibutton>Show Desktop</guibutton>: Click
+              on this button to minimize all windows and show the
+              desktop.</para></listitem>
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>Menus</term>
+          <listitem>
+            <para>You can access all GNOME Desktop functions through menus.
+            To open a menu from a panel, click on the icon that represents
+            the menu. To open a menu from the <application>Menu
+            Bar</application>, click on the text that represents
+            the menu.</para>
+
+            <para>Menus that you add to your panels are represented by an
+            icon with an arrow. The arrow indicates that the icon represents
+            a menu. For example, see the menu icon in <xref
+            linkend="gosoverview-FIG-28"/>.</para>
+
+            <para>You can add the <guimenu>Main Menu</guimenu> to any of your
+            panels. To add the <guimenu>Main Menu</guimenu> to a panel,
+            right-click on a vacant space on the panel, then choose
+            <guimenuitem>Add to Panel</guimenuitem>.  In the
+            <application>Add to the panel</application> dialog,
+            select <guilabel>Main Menu</guilabel> and click
+            <guibutton>Add</guibutton>.</para>
+
+            <para>You can also add the <application>Menu Bar</application>
+            to any of your panels. To add the <application>Menu Bar</application>
+            to a panel, right-click on a vacant space on the panel, then choose
+            <guimenuitem>Add to Panel</guimenuitem>.  In the
+            <application>Add to the panel</application> dialog,
+            select <guilabel>Menu Bar</guilabel> and click
+            <guibutton>Add</guibutton>.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>Drawers</term>
+          <listitem>
+            <para><firstterm>Drawers</firstterm> are sliding extensions to
+            a panel that you can open or close from a drawer icon, as shown
+            in <xref linkend="gosoverview-FIG-28"/>.  Drawers can help you to
+            organize your work when you run a lot of applications
+            simultaneously.  You can place all the same functional elements
+            in a drawer that you can put in any other type of panel.</para>
+
+            <para>To add a drawer to a panel, right-click on a vacant space
+            on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>.
+            In the <application>Add to the panel</application> dialog,
+            select <guilabel>Drawer</guilabel> and click
+            <guibutton>Add</guibutton>.</para>
+
+            <para>To open a drawer click on the drawer. To close a drawer
+            click on the drawer again.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
     <sect2 id="gosoverview-21">
       <title>To Manipulate Panel Objects</title>
@@ -287,37 +367,51 @@ item is a launcher right-click on the menu item, then choose <guimenuitem>Add th
       <primary>menus</primary>
       <secondary>overview</secondary>
     </indexterm>
-    <para>You can access all GNOME Desktop functions through menus. You can access
-your menus from the following GNOME Desktop components:</para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          <guimenu>Main Menu</guimenu>
-        </para>
-        <para>The <guimenu>Main Menu</guimenu> contains the <guimenu>Applications</guimenu> menu, and various other functions. You can use the <guimenu>Applications</guimenu> menu to access almost all of the standard applications, commands,
-and configuration options. </para>
-        <para>To add a <guimenu>Main Menu</guimenu> to a panel, right-click on the
-panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>. Click on the <guibutton>Main Menu</guibutton>
-button on a panel to open the <guimenu>Main Menu</guimenu>. </para>
-      </listitem>
-      <listitem>
-        <para>
-          <application>Menu Bar</application>
-        </para>
-        <para><application>Menu Bar</application> contains <guimenu>Applications</guimenu>
-and <guimenu>Actions</guimenu> menus. You can use the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu to access almost all
-of the standard applications, commands, and configuration options. </para>
-        <para>To add <application>Menu Bar</application> to a panel, right-click on
-the panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Menu Bar</guimenuitem></menuchoice>.</para>
-      </listitem>
-      <listitem>
-        <para>Panels</para>
-        <para>You can add as many additional menus as you want to any of your panels.
-To open a menu that you add to a panel, click on the menu icon on the panel.
-You can perform other actions on your menus, such as copy menu items to panels.</para>
-      </listitem>
-    </itemizedlist>
+    <para>You can access all GNOME Desktop functions through menus. You can
+    access your menus from the following GNOME Desktop components:</para>
+    <variablelist>
+      <varlistentry>
+        <term><application>Main Menu</application></term>
+        <listitem>
+          <para>The <application>Main Menu</application> contains the
+          <guimenu>Applications</guimenu> menu, and various other functions.
+          You can use the <guimenu>Applications</guimenu> menu to access
+          almost all of the standard applications, commands, and configuration
+          options.</para>
+          <para>To add the <guimenu>Main Menu</guimenu> to a panel, right-click
+          on a vacant space on the panel, then choose <guimenuitem>Add to
+          Panel</guimenuitem>.  In the <application>Add to the
+          panel</application> dialog, select <guilabel>Main Menu</guilabel>
+          and click <guibutton>Add</guibutton>.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><application>Menu Bar</application></term>
+        <listitem>
+          <para>The <application>Menu Bar</application> contains
+          <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus.
+          You can use the <guimenu>Applications</guimenu> menu and the
+          <guimenu>Actions</guimenu> menu to access almost all of the standard
+          applications, commands, and configuration options.</para>
+          <para>To add the <guimenu>Main Menu</guimenu> to a panel, right-click
+          on a vacant space on the panel, then choose <guimenuitem>Add to
+          Panel</guimenuitem>.  In the <application>Add to the
+          panel</application> dialog, select <guilabel>Menu Bar</guilabel>
+          and click <guibutton>Add</guibutton>.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Panels</term>
+        <listitem>
+          <para>You can add as many additional menus as you want to any of your
+          panels.  To open a menu that you add to a panel, click on the menu
+          icon on the panel.  You can perform other actions on your menus,
+          such as copy menu items to panels.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </sect1>
+
   <sect1 id="gosoverview-18">
     <title>Windows</title>
     <indexterm>
@@ -325,32 +419,40 @@ You can perform other actions on your menus, such as copy menu items to panels.<
       <secondary>overview</secondary>
     </indexterm>
     <para>You can display many windows at the same time in the GNOME Desktop.
-Each window has a frame. The window frame contains active control elements
-that you can use to work with the window.</para>
+    Each window has a frame. The window frame contains active control elements
+    that you can use to work with the window.</para>
+
     <sect2 id="gosoverview-16">
       <title>Types of Windows</title>
       <para>The GNOME Desktop features the following types of window:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Application windows</para>
-          <para>When you run an application, a frame usually borders the window. The
-top edge of the application window contains a titlebar. The titlebar contains
-buttons that you can use to work with the window. The buttons in an application
-window frame enable you to perform actions such as open the <guimenu>Window
-Menu</guimenu>, or close the window. The <guimenu>Window Menu</guimenu> provides
-commands that you can perform on the window.</para>
-        </listitem>
-        <listitem>
-          <para>Dialog windows</para>
-          <para>Dialog windows are associated with interactive processes. A dialog window
-consists of the window frame, and a single interactive pane that provides
-information and controls for the user. This manual refers to the interactive
-part of a dialog window as a dialog. The frame of a dialog window contains
-buttons that enable you to open the <guimenu>Window Menu</guimenu>, or to
-close the dialog window.</para>
-        </listitem>
-      </itemizedlist>
+      <variablelist>
+        <varlistentry>
+          <term>Application windows</term>
+          <listitem>
+            <para>When you run an application, a frame usually borders the
+            window.  The top edge of the application window contains a titlebar.
+            The titlebar contains buttons that you can use to work with the
+            window.  The buttons in an application window frame enable you to
+            perform actions such as open the <guimenu>Window Menu</guimenu>,
+            or close the window. The <guimenu>Window Menu</guimenu> provides
+            commands that you can perform on the window.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>Dialog windows</term>
+          <listitem>
+            <para>Dialog windows are associated with interactive processes.
+            A dialog window consists of the window frame, and a single
+            interactive pane that provides information and controls for the
+            user. This manual refers to the interactive part of a dialog
+            window as a dialog. The frame of a dialog window contains buttons
+            that enable you to open the <guimenu>Window Menu</guimenu>, or to
+            close the dialog window.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
+
     <sect2 id="gosoverview-32">
       <title>To Manipulate Windows</title>
       <para>You use the frame of an application window or dialog window to perform
@@ -591,7 +693,7 @@ specify the number of workspaces that you require.</para>
     </sect2>
   </sect1>
   <sect1 id="gosoverview-56">
-    <title>Nautilus File Manager</title>
+    <title>File Manager</title>
     <indexterm>
       <primary>Nautilus file manager</primary>
       <see>file manager</see>
@@ -600,67 +702,63 @@ specify the number of workspaces that you require.</para>
       <primary>file manager</primary>
       <secondary>overview</secondary>
     </indexterm>
-    <para>The <application>Nautilus</application> file
-manager provides an integrated access point to your files, applications, FTP
-sites, and URIs. </para>
-    <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 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 <application>Nautilus</application> file manager provides an
+    integrated access point to your files, applications, FTP sites, and
+    URIs.</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 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>
-        <para>You can use the file manager to create, move, copy, rename, and remove
-files and folders.</para>
-      </listitem>
-      <listitem>
-        <para>Run scripts</para>
-        <para>You can run scripts from the file manager, and you can select files
-and folders on which to run your scripts.</para>
-      </listitem>
-      <listitem>
-        <para>Customize your files and folders</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 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>
-(URIs)</para>
-        <para>The GNOME Desktop contains special URIs 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 the file manager.</para>
-      </listitem>
-      <listitem>
-        <para>Write CDs</para>
-        <para>The file manager provides a special location where you can copy files
-and folders that you want to write to a CD. You can write the contents of
-the location to a CD easily.</para>
-      </listitem>
-    </itemizedlist>
+    <variablelist>
+      <varlistentry>
+        <term>View files and folders</term>
+        <listitem><para>You can view your files and folders as icons or as
+        a list.  You can use the file manager to launch applications to
+        view or edit your files.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Manage your files and folders</term>
+        <listitem><para>You can use the file manager to create, move, copy,
+        rename, and remove files and folders.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Run scripts</term>
+        <listitem><para>You can run scripts from the file manager,
+        and you can select files and folders on which to run your
+        scripts.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Customize your files and folders</term>
+        <listitem>
+          <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:</para>
+
+          <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>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Open special <firstterm>Uniform Resource Identifiers</firstterm>
+        (URIs)</term
+        <listitem><para>The GNOME Desktop contains special URIs that enable
+        you to access particular functions from the file manager. For example,
+        to access the preference tools, you can access the
+        <systemitem role="protocol">preferences:///</systemitem>
+        URI in the file manager.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Write CDs</term>
+        <listitem><para>The file manager provides a special location where
+        you can copy files and folders that you want to write to a CD. You
+        can write the contents of the location to a CD easily.</para></listitem>
+      </varlistentry>
+    </variablelist>
     <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 file that you want to open, double-click on the <guilabel>Home</guilabel> object on the desktop. A file object window opens.  To navigate
@@ -670,11 +768,11 @@ open is displayed, double-click on the file icon to open the file in an applicat
     </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>You can move files between folders by opening two or more file
+      manager windows.  Drag the files from one window to the other. </para>
     </sect2>
   </sect1>
+
   <sect1 id="gosgetstarted-11">
     <title>Desktop and Desktop Objects</title>
     <indexterm>
@@ -733,68 +831,7 @@ you use often, then drag the launcher to your desktop. </para>
       </itemizedlist>
     </sect2>
   </sect1>
-  <sect1 id="gosoverview-509">
-    <title>Start Here Location</title>
-    <screenshot>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/naut_starthere_launcher.png" format="PNG"/>
-        </imageobject>
-        <textobject>
-          <phrase> Start Here icon.</phrase>
-        </textobject>
-      </mediaobject>
-    </screenshot>
-    <indexterm>
-      <primary>Start Here location</primary>
-      <secondary>overview</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>file manager</primary>
-      <secondary>Start Here
-location</secondary>
-      <see>Start Here location</see>
-    </indexterm>
-    <para>The <guilabel>Start Here</guilabel> location enables you to access the following functions:</para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          <guilabel>Applications</guilabel>
-        </para>
-        <para>Double-click on <guilabel>Applications</guilabel> to access your key
-GNOME applications. You can also access the <guimenu>Applications</guimenu>
-menu through the <application>Menu Bar</application> and the <guimenu>Main
-Menu</guimenu>.</para>
-      </listitem>
-      <listitem>
-        <para>
-          <guilabel>Desktop Preferences</guilabel>
-        </para>
-        <para>Double-click on <guilabel>Desktop Preferences</guilabel> to customize
-the GNOME Desktop. </para>
-      </listitem>
-      <listitem>
-        <para>Programs that enable you to configure your system as a server,
-and to modify other system configuration details.</para>
-      </listitem>
-    </itemizedlist>
-    <para>You can access the <guilabel>Start Here</guilabel> location in the following
-ways:</para>
-    <itemizedlist>
-      <listitem>
-        <para>From a file manager 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>
-        <para>Double-click on the <guilabel>Start Here</guilabel> object on the desktop.
-The contents of the <guilabel>Start Here</guilabel> location are displayed
-in a file manager window.</para>
-      </listitem>
-    </itemizedlist>
-  </sect1>
+
   <sect1 id="gosoverview-55">
     <title>GNOME Desktop Preferences</title>
     <indexterm>
@@ -813,13 +850,9 @@ interface. </para>
         <para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the item
 that you require from the submenus. </para>
       </listitem>
-      <listitem>
-        <para>Double-click on the <guilabel>Start Here</guilabel> object
-on the desktop. A <application>Nautilus</application> window opens at the <guilabel>Start Here</guilabel> location. Double-click on the <guilabel>Desktop Preferences</guilabel> object in the <application>Nautilus</application> window to display
-the preference tools. Double-click on the item that you require.</para>
-      </listitem>
     </itemizedlist>
   </sect1>
+
   <sect1 id="gosoverview-54">
     <title>Applications</title>
     <indexterm>