- More 2.10 updates

* gnome2-user-guide/C/gosbasic.xml:
* gnome2-user-guide/C/goscustdesk.xml:
* gnome2-user-guide/C/gosnautilus.xml:
* gnome2-user-guide/C/gosoverview.xml:
* gnome2-user-guide/C/gospanel.xml:
* gnome2-user-guide/C/gosstartsession.xml:
* gnome2-user-guide/C/figures/gnome_panel.png:
* gnome2-user-guide/C/figures/menu_panel.png:
* gnome2-user-guide/C/figures/titlebar_anno_window.png:
* gnome2-user-guide/C/figures/titlebar_anno_window.xcf:
- More 2.10 updates

10 files changed, 447 insertions, 847 deletions

diff --git a/gnome2-user-guide/C/figures/gnome_panel.png b/gnome2-user-guide/C/figures/gnome_panel.png
index 3470d00..367089f 100644
--- a/gnome2-user-guide/C/figures/gnome_panel.png
+++ b/gnome2-user-guide/C/figures/gnome_panel.png
diff --git a/gnome2-user-guide/C/figures/menu_panel.png b/gnome2-user-guide/C/figures/menu_panel.png
index f44aa82..c64c6d7 100644
--- a/gnome2-user-guide/C/figures/menu_panel.png
+++ b/gnome2-user-guide/C/figures/menu_panel.png
diff --git a/gnome2-user-guide/C/figures/titlebar_anno_window.png b/gnome2-user-guide/C/figures/titlebar_anno_window.png
index db03e36..69c60c2 100644
--- a/gnome2-user-guide/C/figures/titlebar_anno_window.png
+++ b/gnome2-user-guide/C/figures/titlebar_anno_window.png
diff --git a/gnome2-user-guide/C/figures/titlebar_anno_window.xcf b/gnome2-user-guide/C/figures/titlebar_anno_window.xcf
index 0f82447..28138b2 100644
--- a/gnome2-user-guide/C/figures/titlebar_anno_window.xcf
+++ b/gnome2-user-guide/C/figures/titlebar_anno_window.xcf
diff --git a/gnome2-user-guide/C/gosbasic.xml b/gnome2-user-guide/C/gosbasic.xml
index 73c4bb3..a9d635c 100644
--- a/gnome2-user-guide/C/gosbasic.xml
+++ b/gnome2-user-guide/C/gosbasic.xml
@@ -477,12 +477,11 @@
   <xref linkend="prefs-keyboard-shortcuts"/> for more information about
   configuring keyboard shortcuts.</para>
 
-  <note><para>Many PC keyboars come two keys with a <trademark>Microsoft
-  Windows</trademark> logo and one key for accessing context menus.  The
-  Windows key is often configured to act as an additional modifier key,
-  called the <firstterm>Super key</firstterm>.  The context menu key can
-  be used to access the context menu of the selected item, just as the
-  <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
+  <note><para>Many PC keyboars come two keys with a Microsoft Windows™ logo and
+  one key for accessing context menus.  The Windows key is often configured to
+  act as an additional modifier key, called the <firstterm>Super key</firstterm>.
+  The context menu key can be used to access the context menu of the selected
+  item, just as the <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
   keyboard shortcut can.</para></note>
 
   <para>You can also modify the GNOME Desktop preferences to use keyboard
@@ -529,7 +528,7 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Opens the <guimenu>Applicantions Menu</guimenu>.</para>
+              <para>Open the <guimenu>Applicantions Menu</guimenu>.</para>
             </entry>
           </row>
           <row>
@@ -539,7 +538,7 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Displays the <guilabel>Run Application</guilabel>
+              <para>Display the <guilabel>Run Application</guilabel>
               dialog.  See <xref linkend="tools-run-app"/> for more
               information.</para>
             </entry>
@@ -551,7 +550,7 @@
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Takes a screenshot of the entire desktop.  See
+              <para>Take a screenshot of the entire desktop.  See
               <xref linkend="tools-screenshot"/> for more information.</para>
             </entry>
           </row>
@@ -562,7 +561,7 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Takes a screenshot of the currently focused window.</para>
+              <para>Take a screenshot of the currently focused window.</para>
             </entry>
           </row>
           <row>
@@ -573,7 +572,7 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Switches to the workspace to the specified direction of the
+              <para>Switch to the workspace to the specified direction of the
               current workspace.  See <xref linkend="overview-workspaces"/> for
               more information on working with multiple workspaces.</para>
             </entry>
@@ -586,7 +585,7 @@
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Minimizes all windows, and gives focus to the desktop.</para>
+              <para>Minimize all windows and give focus to the desktop.</para>
             </entry>
           </row>
           <row>
@@ -596,7 +595,7 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Switches between windows.  A list of windows that you can
+              <para>Switch between windows.  A list of windows that you can
               select is displayed. Release the keys to select a window.  You
               can press the <keycap>Shift</keycap> key to cycle through the
               windows in reverse order.</para>
@@ -610,10 +609,10 @@
               </para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Switches the focus between the panels and the desktop.
+              <para>Switch the focus between the panels and the desktop.
               A list of items that you can select is displayed.  Release the
               keys to select an item.  You can press the <keycap>Shift</keycap>
-              key to cycle through the windows in reverse order.</para>
+              key to cycle through the items in reverse order.</para>
             </entry>
           </row>
         </tbody>
@@ -658,7 +657,7 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Switches between windows.  A list of windows that you can
+              <para>Switch between windows.  A list of windows that you can
               select is displayed. Release the keys to select a window.  You
               can press the <keycap>Shift</keycap> key to cycle through the
               windows in reverse order.</para>
@@ -671,7 +670,7 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Closes the currently focused window.</para>
+              <para>Close the currently focused window.</para>
             </entry>
           </row>
           <row>
@@ -737,8 +736,9 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Opens the <guilabel>Window Menu</guilabel> for the
-              currently selected window.</para>
+              <para>Open the window menu for the currently selected window.  The
+              window menu allows you to perform actions on the window, such as
+              minimizing, moving between workspaces, and closing.</para>
             </entry>
           </row>
           <row>
@@ -749,7 +749,7 @@
               </keycombo></para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Moves the current window to another workspace in the
+              <para>Move the current window to another workspace in the
               specified direction.  See <xref linkend="overview-workspaces"/>
               for more information on working with multiple workspaces.</para>
             </entry>
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 603306a..014c290 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -1,5 +1,12 @@
-<chapter id="goscustdesk-6">
+<chapter id="prefs">
   <title>Using Preference Tools</title>
+
+  <!-- Maintained for 2.8 compatibility -->
+  <anchor id="goscustdesk-6"/>
+
+  <!-- Desktop Overview / Desktop Preferences -->
+  <anchor id="gosoverview-55"/>
+
   <highlights>
     <para>This chapter describes how to use the preference tools to
 customize the GNOME Desktop.</para>
diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index 6ad52bb..761c0e5 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -1,5 +1,27 @@
-<chapter id="gosnautilus-1">
+<chapter id="nautilus">
   <title>Nautilus File Manager</title>
+  <!-- Maintained for 2.8 compatibility -->
+  <anchor id="gosnautilus-1"/>
+
+  <!-- Desktop Overview / File Manager -->
+  <anchor id="gosoverview-56"/>
+
+  <!-- MOVE THIS ANCHOR -->
+  <!-- Desktop Overview / File Manager / To Open Files -->
+  <anchor id="gosoverview-58"/>
+
+  <!-- MOVE THIS ANCHOR -->
+  <!-- Desktop Overview / File Manager / To Move Files -->
+  <anchor id="gosoverview-57"/>
+
+  <!-- MOVE THESE ANCHORS -->
+  <!-- Desktop Overview / Desktop -->
+  <anchor id="gosgetstarted-11"/>
+  <!-- Desktop Overview / Desktop / To Open Desktop Objects -->
+  <anchor id="gosoverview-29"/>
+  <!-- Desktop Overview / Desktop / To Add Objects-->
+  <anchor id="gosoverview-19"/>
+
   <highlights>
     <para>This chapter describes how to use the <application>Nautilus</application> file manager.</para>
   </highlights>
@@ -763,6 +785,9 @@ in the side pane.</para>
       </sect3>
     </sect2>
   </sect1>
+  <section id="nautilus-desktop">
+    <title>Using the Desktop</title>
+  </section>
   <sect1 id="gosnautilus-24">
     <title>Navigating Your Files and Folders as Objects</title>
     <indexterm>
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index 0669852..32b510f 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -5,12 +5,23 @@
 <!-- Maintained for 2.8 compatibility -->
 <anchor id="gosoverview-1"/>
 
+<!-- MOVE THESE ANCHORS -->
+<!-- Desktop Overview / To Find Out More -->
+<anchor id="gosoverview-12"/>
+<!-- Desktop Overview / To Find Out More / About GNOME Desktop Topics -->
+<anchor id="gosoverview-31"/>
+<!-- Desktop Overview / To Find Out More / About Applets -->
+<anchor id="gosgetstarted-33"/>
+<!-- Desktop Overview / To Find Out More / About Applications -->
+<anchor id="gosgetstarted-35"/>
+
+
 <highlights>
-  <para>This chapter introduces you to the features and main components
-  of the GNOME Desktop. Before you start to use the GNOME Desktop read this
-  chapter to familiarize yourself with the various features, and how the main
-  components work. The GNOME Desktop is very configurable, so this chapter describes
-  the typical default configuration, covering the following topics.</para>
+  <para>This chapter introduces you to the features and main components of the
+  desktop. You should read this chapter to familiarize yourself with the various
+  features, and how the main components work.  This chapter describes the default
+  configuration.  Your vendor or system administrator may have configured your
+  desktop to look different than what is described here.</para>
 </highlights>
 
 <section id="overview-intro">
@@ -27,417 +38,107 @@
   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>
-    <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>
-  </section>
-  <section id="gosoverview-502">
-    <title>Panels</title>
-    <indexterm>
-      <primary>panels</primary>
-      <secondary>overview</secondary>
-    </indexterm>
-    <para>You can add or delete panels at any time. When you start a session for
-the first time, the GNOME Desktop contains at least one panel. </para>
-    <para>You can perform the following actions with panels:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Create panels.</para>
-      </listitem>
-      <listitem>
-        <para>Delete panels.</para>
-      </listitem>
-      <listitem>
-        <para>Hide panels.</para>
-      </listitem>
-      <listitem>
-        <para>Add objects to panels.</para>
-      </listitem>
-      <listitem>
-        <para>Manipulate panel objects.</para>
-      </listitem>
-    </itemizedlist>
-    <section id="gosoverview-26">
-      <title>To Create Panels</title>
-      <para>To add a panel, right-click on a vacant space on any panel, then choose <guimenuitem>New Panel</guimenuitem>. The new panel is added to the GNOME Desktop. The
-new panel contains no objects. You can customize the new panel to suit your
-preferences. You can add objects to the panel to fit your own requirements.
-You can also change the background of the panel. You can create as many panels
-as you want.</para>
-    </section>
-    <section id="gosoverview-508">
-      <title>To Delete Panels</title>
-      <para>To delete a panel, right-click on the panel then choose <guimenuitem>Delete This Panel</guimenuitem>.</para>
-    </section>
-    <section id="gosoverview-24">
-      <title>To Hide Panels</title>
-      <para>Panels can have hide buttons at each end of the panel. You click on
-the hide buttons to hide or show the panel.</para>
-    </section>
-    <section id="gosoverview-4">
-      <title>To Add Objects to Panels</title>
-      <para>A panel can hold several types of objects. The panel in <xref linkend="gosoverview-FIG-28"/>
-contains each type of panel object. </para>
-      <figure id="gosoverview-FIG-28">
-        <title>A Panel With Various Panel Objects</title>
-        <screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/sample_anno_panel.png" format="PNG"/>
-            </imageobject>
-            <textobject>
-              <phrase>A panel with various panel objects. Callouts: Calculator launcher, Menu, CD Player applet, Drawer, Lock button.</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
-      <para>You can add any of the following objects to all types of panels:</para>
-      <variablelist>
-        <varlistentry>
-         
-          <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>
-    </section>
-    <section id="gosoverview-21">
-      <title>To Manipulate Panel Objects</title>
-      <para>You can manipulate panel objects in the following ways:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Move objects within a panel, or to another panel.</para>
-          <para>You can move any object to another location in the panel. You can also
-move an object from one panel to another panel. Use the middle mouse button
-to drag the panel object to the new location.</para>
-        </listitem>
-        <listitem>
-          <para>Copy menu items to a panel.</para>
-          <para>Drag the item from the menu to the panel. Alternatively, if the menu
-item is a launcher right-click on the menu item, then choose <guimenuitem>Add this launcher to panel</guimenuitem>.</para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-  <section id="gosoverview-42">
-    <title>Menus</title>
-    <indexterm>
-      <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>
+  <para>The major components of the desktop are as follows:</para>
+
+  <variablelist>
+    <varlistentry>
+      <term>Panels</term>
+      <listitem><para>Panels are usually located along the edges of the screen,
+      although they can be configured to float on the desktop.  Panels can
+      contain menus, launchers, and various other tools.  Panels can also
+      contain small utility applications, called
+      <firstterm>panel applets</firstterm>.  For example, you can configure
+      your panel to display the current weather for your location.  For more
+      information on panels, see <xref linkend="panels"/>.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Windows</term>
+      <listitem><para>Most applications run inside of one or more windows.
+      You can display multiple windows on your desktop at the same time.
+      Windows can be resized and moved around to accomodate your workflow.
+      Each window has a <firstterm>titlebar</firstterm> at the top with
+      buttons which allow you to minimize, maximize, and close the window.
+      For more information on working with windows, see
+      <xref linkend="overview-windows"/>.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Workspaces</term>
+      <listitem><para>You can subdivide your desktop into separate
+      <firstterm>workspaces</firstterm>.  Each workspace can contain
+      separate windows, allowing you to group related tasks together.
+      For more information on working with workspaces, see
+      <xref linkend="overview-workspaces"/>.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>File Manager</term>
+      <listitem><para>The <application>Nautilus</application> file manager
+      provides access to your files, folders, and applications.  You can
+      manage the contents of folders in the file manager and open the files
+      in the appropriate applications.  See <xref linkend="nautilus"/> for
+      more information.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Desktop</term>
+      <listitem><para>The desktop is behind all of the other components on the
+      desktop.  You can place objects on the desktop to access your files and
+      directories quickly, or to start applications that you use often.  See
+      <xref linkend="nautilus-desktop"/> for more information.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Preferences</term>
+      <listitem><para>You can customize your desktop using the desktop
+      <firstterm>preference tools</firstterm>.  Each tool controls
+      a particular part of the behavior of the desktop.  The preference
+      tools can be found in the <guimenu>Preferences</guimenu> submenu
+      of the <guimenu>Desktop</guimenu> top-level menu on your panel.
+      See <xref linkend="prefs"/> for more information on the various
+      preference tools.</para></listitem>
+    </varlistentry>
+  </variablelist>
+
+  <para>Your vendor or system administrator can make configuration changes to
+  suit your needs, so your desktop might not match exactly what is described
+  in this manual.  Nevertheless, this manual provides a useful introduction
+  to using the various components of your desktop.</para>
+</section>
+
+<section id="overview-windows">
+  <title>Windows</title>
+
+  <!-- Maintained for 2.8 compatibility -->
+  <anchor id="gosoverview-18"/>
+
+  <indexterm>
+    <primary>windows</primary>
+    <secondary>overview</secondary>
+  </indexterm>
+
+  <para>Each application can run inside of one or more windows.  You can
+  display multiple windows at the same time on your desktop.  Each window
+  has a frame and titlebar which allow you to control the window.</para>
+
+  <para>The following sections describe the types of windows and how you
+  can interact with them.</para>
+
+  <section id="windows-types">
+    <title>Types of Windows</title>
+
+    <!-- Maintained for 2.8 compatibility -->
+    <anchor id="gosoverview-16"/>
+
+    <remark>This section needs work.</remark>
+
+    <para>The GNOME Desktop features the following types of window:</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>
+        <term>Application windows</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>
-  </section>
-
-  <section id="gosoverview-18">
-    <title>Windows</title>
-    <indexterm>
-      <primary>windows</primary>
-      <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>
-
-    <section id="gosoverview-16">
-      <title>Types of Windows</title>
-      <para>The GNOME Desktop features the following types of window:</para>
-      <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
@@ -445,11 +146,11 @@ item is a launcher right-click on the menu item, then choose <guimenuitem>Add th
             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>
+        </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
@@ -457,110 +158,126 @@ item is a launcher right-click on the menu item, then choose <guimenuitem>Add th
             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>
-    </section>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+
+  <section id="windows-manipulating">
+
+    <title>Manipulating Windows</title>
+
+    <!-- Maintained for 2.8 compatibility -->
+    <anchor id="gosoverview-32"/>
+
+    <remark>This section needs work.</remark>
+
+    <para>You use the frame of an application window or dialog window to perform
+    various actions with the window. Most of the control elements are located on
+    the top edge of the window frame. <xref linkend="fig-titlebar-anno-window"/>
+    shows the top edge of a frame for a typical application window.</para>
+
+    <figure id="fig-titlebar-anno-window">
+      <title>Titlebar for a Typical Application Window</title>
+      <!-- Maintained for 2.8 compatibility -->
+      <anchor id="gosoverview-FIG-33"/>
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/titlebar_anno_window.png" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase>Titlebar of application window frame. Callouts: Window Menu
+            button, Titlebar, Minimize, Maximize, Close Window buttons.</phrase>
+          </textobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
+
+    <para>The active control elements of the window frame are as follows: </para>
+
+    <informaltable frame="topbot">
+      <tgroup cols="2" colsep="0" rowsep="0">
+        <colspec colname="colspec0" colwidth="41.65*"/>
+        <colspec colname="colspec1" colwidth="58.35*"/>
+        <thead>
+          <row rowsep="1">
+            <entry valign="top">
+              <para>Control Element</para>
+            </entry>
+            <entry valign="top">
+              <para>Description </para>
+            </entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry colname="colspec0" valign="top">
+              <para><guibutton>Window Menu</guibutton> button</para>
+            </entry>
+            <entry colname="colspec1" valign="top">
+              <para>Click on the <guibutton>Window Menu</guibutton> button to
+              open the <guimenu>Window Menu</guimenu>.</para>
+            </entry>
+          </row>
+          <row>
+            <entry valign="top">
+              <para>Titlebar</para>
+            </entry>
+            <entry valign="top">
+              <para>You can use the titlebar to move and roll up the window.</para>
+            </entry>
+          </row>
+          <row>
+            <entry valign="top">
+              <para><guibutton>Minimize</guibutton> button</para>
+            </entry>
+            <entry valign="top">
+              <para>Click on the <guibutton>Minimize</guibutton> button to
+              minimize the window.</para>
+            </entry>
+          </row>
+          <row>
+            <entry valign="top">
+              <para><guibutton>Maximize</guibutton> button</para>
+            </entry>
+            <entry valign="top">
+              <para>You can use the <guibutton>Maximize</guibutton>
+              button to maximize and restore the window.</para>
+              <para>To maximize a window click on the
+              <guibutton>Maximize</guibutton> button. To restore the window
+              click on the <guibutton>Maximize</guibutton> button again.</para>
+            </entry>
+          </row>
+          <row>
+            <entry valign="top">
+              <para><guibutton>Close Window</guibutton> button</para>
+            </entry>
+            <entry valign="top">
+              <para>Click on the <guibutton>Close Window</guibutton> button to
+              close the window. </para>
+            </entry>
+          </row>
+          <row>
+            <entry colname="colspec0">
+              <para>Border</para>
+            </entry>
+            <entry colname="colspec1">
+              <para>Right-click on the border to open the <guimenu>Window
+              Menu</guimenu>.</para>
+            </entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+
+    <para>To change the size of windows grab the border of the window,
+    but not the titlebar. Drag the border until the window is the size
+    that you require.</para>
+  </section>
 
-    <section id="gosoverview-32">
-      <title>To Manipulate Windows</title>
-      <para>You use the frame of an application window or dialog window to perform
-various actions with the window. Most of the control elements are located
-on the top edge of the window frame. <xref linkend="gosoverview-FIG-33"/> shows
-the top edge of a frame for a typical application window.</para>
-      <figure id="gosoverview-FIG-33">
-        <title>Top Edge of Frame for a Typical Application Window</title>
-        <screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/titlebar_anno_window.png" format="PNG"/>
-            </imageobject>
-            <textobject>
-              <phrase>Top edge of application window frame. Callouts: Window Menu button, Titlebar, Minimize, Maximize, Close Window buttons.</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
-      <para>The active control elements of the window frame are as follows: </para>
-      <informaltable frame="topbot">
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="41.65*"/>
-          <colspec colname="colspec1" colwidth="58.35*"/>
-          <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>Control Element</para>
-              </entry>
-              <entry valign="top">
-                <para>Description </para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para><guibutton>Window Menu</guibutton>
-button</para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Click on
-the <guibutton>Window Menu</guibutton> button to open the <guimenu>Window
-Menu</guimenu>. </para>
-              </entry>
-            </row>
-            <row>
-              <entry valign="top">
-                <para>Titlebar</para>
-              </entry>
-              <entry valign="top">
-                <para>You can use the titlebar to move and shade the window. </para>
-              </entry>
-            </row>
-            <row>
-              <entry valign="top">
-                <para><guibutton>Minimize</guibutton> button</para>
-              </entry>
-              <entry valign="top">
-                <para>Click on the <guibutton>Minimize</guibutton> button
-to minimize the window. </para>
-              </entry>
-            </row>
-            <row>
-              <entry valign="top">
-                <para><guibutton>Maximize</guibutton> button</para>
-              </entry>
-              <entry valign="top">
-                <para>You can use the <guibutton>Maximize</guibutton>
-button to maximize and restore the window.</para>
-                <para>To maximize a window
-click on the <guibutton>Maximize</guibutton> button. To restore the window
-click on the <guibutton>Maximize</guibutton> button again. </para>
-              </entry>
-            </row>
-            <row>
-              <entry valign="top">
-                <para><guibutton>Close Window</guibutton> button</para>
-              </entry>
-              <entry valign="top">
-                <para>Click on the <guibutton>Close Window</guibutton> button to close the window. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0">
-                <para>Border</para>
-              </entry>
-              <entry colname="colspec1">
-                <para>Right-click on the border to open the <guimenu>Window Menu</guimenu>.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-      <para>To change the size of windows grab the border of the window, but not
-the titlebar. Drag the border until the window is the size that you require.</para>
-    </section>
     <section id="gosoverview-20">
-      <title>To Give Focus to a Window</title>
+      <title>Giving Focus to a Window</title>
       <para>A window that has focus can receive input from the mouse and the keyboard.
 Only one window can have focus at a time. The window that has focus has a
 different appearance than other windows. </para>
@@ -637,7 +354,10 @@ Switcher</application> display.</para>
   </section>
   <section id="overview-workspaces">
     <title>Workspaces</title>
+
+    <!-- Maintained for 2.8 compatibility -->
     <anchor id="gosoverview-39"/>
+
     <indexterm>
       <primary>workspaces</primary>
       <secondary>overview</secondary>
@@ -702,166 +422,6 @@ is displayed. Use the <guilabel>Number of workspaces</guilabel> spin box to
 specify the number of workspaces that you require.</para>
     </section>
   </section>
-  <section id="gosoverview-56">
-    <title>File Manager</title>
-    <indexterm>
-      <primary>Nautilus file manager</primary>
-      <see>file manager</see>
-    </indexterm>
-    <indexterm>
-      <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>The file manager enables you to do the following:</para>
-    <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>
-
-    <section 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
-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>
-    </section>
-    <section 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.  Drag the files from one window to the other. </para>
-    </section>
-  </section>
-
-  <section id="gosgetstarted-11">
-    <title>Desktop and Desktop Objects</title>
-    <indexterm>
-      <primary>Nautilus desktop</primary>
-      <see>desktop</see>
-    </indexterm>
-    <indexterm>
-      <primary>desktop</primary>
-      <secondary>overview</secondary>
-    </indexterm>
-    <para>The desktop is an active component of the user interface. You can use
-the desktop to perform the following actions:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Start your applications, and open your files and folders. </para>
-        <para>You can add <firstterm>desktop objects</firstterm> for convenient access
-to the files, folders, and applications that you use frequently. For example,
-you add a launcher for an application that you use often.</para>
-      </listitem>
-      <listitem>
-        <para>Open the <guimenu>Desktop</guimenu> menu.</para>
-        <para>Right-click on the desktop to open the <guimenu>Desktop</guimenu> menu.
-You can use the <guimenu>Desktop</guimenu> menu to perform actions on the
-desktop.</para>
-      </listitem>
-    </itemizedlist>
-    <para>The file manager manages the desktop.</para>
-    <section id="gosoverview-29">
-      <title>To Open Desktop Objects</title>
-      <para>To open an object from the desktop, double-click on the object. You
-can set your preferences in a <application>Nautilus</application> window so
-that you click once on an object to execute the default action.</para>
-    </section>
-    <section id="gosoverview-19">
-      <title>To Add Objects to the Desktop</title>
-      <para>You can add desktop objects for convenient access to files, folders,
-and applications that you use frequently. You can add objects to your desktop
-in the following ways:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Use the <guimenu>Desktop</guimenu> menu to add a launcher
-to the desktop.</para>
-        </listitem>
-        <listitem>
-          <para>Drag an object from a file manager window to the desktop.
-For example, you can create a symbolic link to a file that you use often,
-then drag the link to your desktop. The icon for the link is moved to the
-desktop. To open the file, double-click on the icon. You can also drag files
-and folders to the desktop. </para>
-        </listitem>
-        <listitem>
-          <para>Drag an application launcher from a menu to the desktop. For
-example, you can open a menu that contains a launcher for an application that
-you use often, then drag the launcher to your desktop. </para>
-        </listitem>
-      </itemizedlist>
-    </section>
-  </section>
-
-  <section id="gosoverview-55">
-    <title>GNOME Desktop Preferences</title>
-    <indexterm>
-      <primary>preference tools</primary>
-      <secondary>overview</secondary>
-    </indexterm>
-    <para>You can use preference tools to configure almost every feature
-of the GNOME Desktop. Each tool controls a particular part of the behavior
-of the GNOME Desktop. For example, you can use a preference tool to select
-a theme for the GNOME Desktop. A <firstterm>theme</firstterm> is a group of
-coordinated settings that specify the visual appearance of a part of your
-interface. </para>
-    <para>You can start your preference tools in either of the following ways:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Desktop Preferences</guimenuitem></menuchoice>. Choose the item
-that you require from the submenus. </para>
-      </listitem>
-    </itemizedlist>
-  </section>
 
   <section id="gosoverview-54">
     <title>Applications</title>
@@ -869,6 +429,9 @@ that you require from the submenus. </para>
       <primary>applications</primary>
       <secondary>overview</secondary>
     </indexterm>
+
+    <remark>This section needs work.</remark>
+
     <para>The applications that are provided with the GNOME Desktop
 share several characteristics. For example, the applications have a consistent
 look-and-feel. The applications share characteristics because the applications
@@ -925,64 +488,5 @@ editor. </para>
       </listitem>
     </itemizedlist>
   </section>
-  <section id="gosoverview-12">
-    <title>To Find Out More</title>
-    <indexterm>
-      <primary>help</primary>
-      <secondary>how to find</secondary>
-    </indexterm>
-    <para>The GNOME Desktop provides help if you want to find out more about the
-following areas: </para>
-    <itemizedlist>
-      <listitem>
-        <para>GNOME Desktop topics</para>
-      </listitem>
-      <listitem>
-        <para>Applets</para>
-      </listitem>
-      <listitem>
-        <para>Applications</para>
-      </listitem>
-    </itemizedlist>
-    <section id="gosoverview-31">
-      <title>To Find Out More About GNOME Desktop Topics</title>
-      <indexterm>
-        <primary>help</primary>
-        <secondary>starting help system</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>help</primary>
-        <secondary>GNOME Desktop topics</secondary>
-      </indexterm>
-      <para>You can find out more about particular GNOME
-Desktop topics in the integrated help system. To start
-the help system, choose <menuchoice><guimenu>Applications</guimenu><guimenuitem>Help</guimenuitem></menuchoice>. </para>
-    </section>
-    <section id="gosgetstarted-33">
-      <title>To Find Out More About Applets</title>
-      <indexterm>
-        <primary>applets</primary>
-        <secondary>getting help</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>help</primary>
-        <secondary>applets</secondary>
-      </indexterm>
-      <para>To find out more about a specific applet, right-click on the applet,
-then choose <guimenuitem>Help</guimenuitem>. </para>
-    </section>
-    <section id="gosgetstarted-35">
-      <title>To Find Out More About Applications</title>
-      <indexterm>
-        <primary>applications</primary>
-        <secondary>help</secondary>
-      </indexterm>
-      <indexterm>
-        <primary>help</primary>
-        <secondary>applications</secondary>
-      </indexterm>
-      <para>To find out more about a specific application, start the application,
-then choose <menuchoice><guimenu>Help</guimenu><guimenuitem>Contents</guimenuitem></menuchoice>. Alternatively, start the application then press <keycap>F1</keycap>.</para>
-    </section>
-  </section>
+
 </chapter>
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index c425169..c6f4059 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -1,14 +1,56 @@
-<chapter id="gospanel-1">
+<chapter id="panels">
   <title>Working With Panels</title>
+
+  <!-- Maintained for 2.8 compatibility -->
+  <anchor id="gospanel-1"/>
+
+  <!-- Desktop Overview / Panels -->
+  <anchor id="gosoverview-502"/>
+
+<!--
+        <para>By default, the top edge panel contains the <application>Menu
+        Bar</application>, which provides access to your applications and
+        folders.  The <application>Menu Bar</application> provides the
+        following menus:</para>
+
+        <itemizedlist>
+          <listitem><para>The <guimenu>Applications</guimenu> menu allows you
+          to access all of the applications installed on your system.  The
+          applications are categorized for easier access.  For example, the
+          <application>Sound Juicer CD Ripper</application> is located under
+          the <guimenu>Multimedia</guimenu> submenu.</para>
+          <para>The <guimenu>Applications</guimenu> also provides access to
+          the <application>Run Application</application> dialog.  This dialog
+          allows you to run any program installed on your system, regardless
+          of whether it appears in the menus.  See <xref linkend="tools-run-app"/>
+          for more information.</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>
+-->
   <highlights>
     <para>The information in this chapter describes how to use panels. </para>
   </highlights>
-  <sect1 id="gospanel-2">
-    <title>Introducing Panels</title>
+
+  <section id="panels-intro">
+    <title>Introduction</title>
+
+    <!-- Maintained for 2.8 compatibility -->
+    <anchor id="gospanel-2"/>
+
     <indexterm>
       <primary>panels</primary>
       <secondary>introduction</secondary>
     </indexterm>
+
     <para>A panel is an area in the GNOME Desktop from which you can run applications
 and applets, and perform other tasks. When you start a session for the first
 time, the GNOME Desktop contains at least one panel. Your system administrator
@@ -21,7 +63,7 @@ for each panel. You can also hide panels.</para>
     <para>Typically, the GNOME Desktop contains a panel at the top edge of the screen,
 and a panel at the bottom edge of the screen. The following sections describe
 these panels.</para>
-    <sect2 id="gospanel-6">
+    <section id="gospanel-6">
       <title>Top Edge Panel</title>
       <para><indexterm><primary>panels</primary><secondary>top edge panel</secondary><see>top edge panel</see></indexterm><indexterm><primary>top edge panel</primary><secondary>introduction</secondary></indexterm><xref linkend="gospanel-FIG-60"/>
 shows an example panel at the top edge of the screen. Your system administrator
@@ -119,8 +161,8 @@ at the extreme right of the top edge panel, then select the window.</para>
           </tbody>
         </tgroup>
       </informaltable>
-    </sect2>
-    <sect2 id="gospanel-3">
+    </section>
+    <section id="gospanel-3">
       <title>Bottom Edge Panel</title>
       <indexterm>
         <primary>panels</primary>
@@ -137,7 +179,7 @@ your default bottom edge panel according to your local requirements, so you
 might see a slightly different bottom edge panel. </para>
       <figure id="gospanel-FIG-58">
         <title>Typical Bottom Edge Panel</title>
-        <screenshot>
+	<screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/gnome_panel.png" format="PNG"/>
@@ -169,16 +211,20 @@ enables you to minimize and restore windows.</para>
 you to navigate between your workspaces.</para>
         </listitem>
       </itemizedlist>
-    </sect2>
-  </sect1>
-  <sect1 id="gospanel-5">
+    </section>
+  </section>
+  <section id="gospanel-5">
     <title>Managing Your Panels</title>
+
+    <!-- Desktop Overview / Panels / To Create Panels -->
+    <anchor id="gosoverview-26"/>
+
     <indexterm>
       <primary>panels</primary>
       <secondary>managing</secondary>
     </indexterm>
     <para>The following sections describe how to manage your panels.</para>
-    <sect2 id="gospanel-10">
+    <section id="gospanel-10">
       <title>To Add a New Panel</title>
       <indexterm>
         <primary>panels</primary>
@@ -187,8 +233,8 @@ you to navigate between your workspaces.</para>
       <para>To add a panel, right-click on a vacant space on any panel, then choose <guimenuitem>New Panel</guimenuitem>. The new panel is added to the GNOME Desktop. The
 new panel contains no objects. You can customize the new panel to suit your
 preferences.</para>
-    </sect2>
-    <sect2 id="gospanel-11">
+    </section>
+    <section id="gospanel-11">
       <title>To Interact With a Panel</title>
       <indexterm>
         <primary>panels</primary>
@@ -217,8 +263,8 @@ menu.</para>
           </listitem>
         </varlistentry>
       </variablelist>
-    </sect2>
-    <sect2 id="gospanel-12">
+    </section>
+    <section id="gospanel-12">
       <title>To Move a Panel</title>
       <indexterm>
         <primary>panels</primary>
@@ -227,8 +273,8 @@ menu.</para>
       <para>You can move panels to different locations. To move a panel, middle-click
 and hold on any vacant space on the panel, then drag the panel to the new
 location.</para>
-    </sect2>
-    <sect2 id="gospanel-7">
+    </section>
+    <section id="gospanel-7">
       <title>To Hide a Panel</title>
       <indexterm>
         <primary>panels</primary>
@@ -259,8 +305,8 @@ buttons are now visible.</para>
 automatically when the mouse is not pointing to the panel. The panel reappears
 when you point to the part of the screen where the panel resides. To set your
 panel to autohide, modify the properties of the panel.</para>
-    </sect2>
-    <sect2 id="gospanel-28">
+    </section>
+    <section id="gospanel-28">
       <title>To Modify Panel Properties</title>
       <indexterm>
         <primary>panels</primary>
@@ -469,9 +515,11 @@ of the panel. You can also drag a color from any color selector dialog.</para>
 of the panel. You can also drag pattern images from the file manager to set
 the background of the panel.</para>
       </sect3>
-    </sect2>
-    <sect2 id="gospanel-31">
+    </section>
+    <section id="gospanel-31">
       <title>To Delete a Panel</title>
+      <!-- Desktop Overview / Panels / To Delete Panels -->
+      <anchor id="gosoverview-508"/>
       <indexterm>
         <primary>panels</primary>
         <secondary>deleting</secondary>
@@ -482,10 +530,12 @@ you want to delete, then choose <menuchoice><guimenuitem>Delete This Panel</guim
         <para>You must always have at least one panel in the GNOME Desktop.
 If you have only one panel in the GNOME Desktop, you cannot delete that panel.</para>
       </note>
-    </sect2>
-  </sect1>
-  <sect1 id="gospanel-8">
+    </section>
+  </section>
+  <section id="gospanel-8">
     <title>Panel Objects</title>
+    <!-- Desktop Overview / Panels / To Manipulate Panel Objects -->
+    <anchor id="gosoverview-21"/>
     <indexterm>
       <primary>panels</primary>
       <secondary>panel objects</secondary>
@@ -493,7 +543,7 @@ If you have only one panel in the GNOME Desktop, you cannot delete that panel.</
     </indexterm>
     <para>This section describes the objects that
 you can add to your panels, and use from your panels.</para>
-    <sect2 id="gospanel-100">
+    <section id="gospanel-100">
       <title>Interacting With Panel Objects</title>
       <indexterm>
         <primary>panel objects</primary>
@@ -525,9 +575,11 @@ popup menu.</para>
       </variablelist>
       <para>You interact with applet panel objects in a different
 way. For more information, see <xref linkend="gospanel-39"/>.</para>
-    </sect2>
-    <sect2 id="gospanel-15">
+    </section>
+    <section id="gospanel-15">
       <title>To Add an Object to a Panel</title>
+      <!-- Desktop Overview / Panels / To Add Objects to Panels -->
+      <anchor id="gosoverview-4"/>
       <indexterm>
         <primary>panel objects</primary>
         <secondary>adding</secondary>
@@ -559,8 +611,8 @@ launcher to the panel. </para>
 <!--Each menu corresponds to a directory. You can drag the directory on to your panels to add the directory to the panel as a menu object. Is this still true?-->
         </listitem>
       </itemizedlist>
-    </sect2>
-    <sect2 id="gospanel-9">
+    </section>
+    <section id="gospanel-9">
       <title>To Modify the Properties of an Object</title>
       <indexterm>
         <primary>panel objects</primary>
@@ -601,8 +653,8 @@ in step 1. </para>
 close the <guilabel>Properties</guilabel> dialog.</para>
         </listitem>
       </orderedlist>
-    </sect2>
-    <sect2 id="gospanel-32">
+    </section>
+    <section id="gospanel-32">
       <title>To Move a Panel Object</title>
       <indexterm>
         <primary>panel objects</primary>
@@ -687,8 +739,8 @@ further along the panel. </para>
           </tbody>
         </tgroup>
       </informaltable>
-    </sect2>
-    <sect2 id="gospanel-566">
+    </section>
+    <section id="gospanel-566">
       <title>To Lock a Panel Object</title>
       <indexterm>
         <primary>panel objects</primary>
@@ -703,8 +755,8 @@ to change position when you move other panel objects.</para>
       <para>To lock an object to the current location of the object in the panel,
 right-click on the object to open the panel object popup menu, then choose <guimenuitem>Lock</guimenuitem>. To unlock the object, right-click on the object, then
 choose <guimenuitem>Unlock</guimenuitem>. </para>
-    </sect2>
-    <sect2 id="gospanel-33">
+    </section>
+    <section id="gospanel-33">
       <title>To Remove a Panel Object</title>
       <indexterm>
         <primary>panel objects</primary>
@@ -713,9 +765,9 @@ choose <guimenuitem>Unlock</guimenuitem>. </para>
       <para>To remove an object from a panel right-click on the object
 to open the panel object popup menu, then choose <guimenuitem>Remove From
 Panel</guimenuitem>. </para>
-    </sect2>
-  </sect1>
-  <sect1 id="gospanel-17">
+    </section>
+  </section>
+  <section id="gospanel-17">
     <title>Applets</title>
     <indexterm>
       <primary>applets</primary>
@@ -754,7 +806,7 @@ control the volume of the speaker on your system.</para>
         </textobject>
       </mediaobject>
     </screenshot>
-    <sect2 id="gospanel-40">
+    <section id="gospanel-40">
       <title>To Add an Applet to a Panel</title>
       <indexterm>
         <primary>applets</primary>
@@ -792,8 +844,8 @@ to add from one of the following submenus:</para>
         </listitem>
       </itemizedlist>
       <para>Alternatively, drag the applet from the submenu on to the panel. </para>
-    </sect2>
-    <sect2 id="gospanel-39">
+    </section>
+    <section id="gospanel-39">
       <title>To Select an Applet</title>
       <indexterm>
         <primary>applets</primary>
@@ -822,8 +874,8 @@ on this field to select the applet. Instead, middle-click or right-click on
 another part of the applet. </para>
         </listitem>
       </itemizedlist>
-    </sect2>
-    <sect2 id="gospanel-41">
+    </section>
+    <section id="gospanel-41">
       <title>To Modify Preferences for an Applet</title>
       <indexterm>
         <primary>applets</primary>
@@ -841,9 +893,9 @@ the applet.</para>
           <para>Click <guibutton>Close</guibutton> to close the <guilabel>Preferences</guilabel> dialog.</para>
         </listitem>
       </orderedlist>
-    </sect2>
-  </sect1>
-  <sect1 id="gospanel-16">
+    </section>
+  </section>
+  <section id="gospanel-16">
     <title>Launchers</title>
     <indexterm>
       <primary>panel objects</primary>
@@ -890,7 +942,7 @@ The menu items usually have an icon beside the menu item.</para>
     <para>You can modify the properties of a launcher. For example, the properties
 of a launcher include the name of the launcher, the icon that represents the
 launcher, and how the launcher runs. </para>
-    <sect2 id="gospanel-34">
+    <section id="gospanel-34">
       <title>To Add a Launcher to a Panel</title>
       <indexterm>
         <primary>launchers</primary>
@@ -1291,8 +1343,8 @@ the preference tool.</para>
           </tgroup>
         </informaltable>
       </sect3>
-    </sect2>
-    <sect2 id="gospanel-36">
+    </section>
+    <section id="gospanel-36">
       <title>To Modify the Properties of a Launcher</title>
       <indexterm>
         <primary>launchers</primary>
@@ -1314,9 +1366,9 @@ see <xref linkend="gospanel-52"/>. </para>
           <para>Click <guibutton>Close</guibutton> to close the <guilabel>Launcher Properties</guilabel> dialog.</para>
         </listitem>
       </orderedlist>
-    </sect2>
-  </sect1>
-  <sect1 id="gospanel-557">
+    </section>
+  </section>
+  <section id="gospanel-557">
     <title>Buttons</title>
     <indexterm>
       <primary>buttons</primary>
@@ -1328,7 +1380,7 @@ see <xref linkend="gospanel-52"/>. </para>
     </indexterm>
     <para>You can add buttons to your panels to provide quick access
 to common actions and functions. </para>
-    <sect2 id="gospanel-563">
+    <section id="gospanel-563">
       <title>Force Quit Button</title>
       <indexterm>
         <primary>buttons</primary>
@@ -1364,8 +1416,8 @@ an application that does not respond to your commands. </para>
       <para>To terminate an application, click on the <guibutton>Force Quit</guibutton>
 button, then click on a window from the application that you want to terminate.
 If you do not want to terminate an application after you click on the <guibutton>Force Quit</guibutton> button, press <keycap>Esc</keycap>.</para>
-    </sect2>
-    <sect2 id="gospanel-21">
+    </section>
+    <section id="gospanel-21">
       <title>Lock Button</title>
       <screenshot>
         <mediaobject>
@@ -1475,8 +1527,8 @@ tool. </para>
           </tbody>
         </tgroup>
       </table>
-    </sect2>
-    <sect2 id="gospanel-20">
+    </section>
+    <section id="gospanel-20">
       <title>Log Out Button</title>
       <screenshot>
         <mediaobject>
@@ -1504,8 +1556,8 @@ a GNOME session. </para>
       <para>To add a <guibutton>Log Out</guibutton> button to a panel, right-click
 on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Log Out</guimenuitem></menuchoice>. To log out of your session or shut down your system, click
 on the <guibutton>Log Out</guibutton> button. </para>
-    </sect2>
-    <sect2 id="gospanel-555">
+    </section>
+    <section id="gospanel-555">
       <title>Run Button</title>
       <screenshot>
         <mediaobject>
@@ -1535,8 +1587,8 @@ any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu
 on the <guibutton>Run</guibutton> button. </para>
       <para>For more information on the <guilabel>Run Application</guilabel> dialog,
 see <citetitle>Working With Menus</citetitle>.</para>
-    </sect2>
-    <sect2 id="gospanel-553">
+    </section>
+    <section id="gospanel-553">
       <title>Screenshot Button</title>
       <screenshot>
         <mediaobject>
@@ -1566,8 +1618,8 @@ on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guim
 the <guibutton>Screenshot</guibutton> button.</para>
       <para>For more information on how to take screenshots, see <citetitle>Working
 With Menus</citetitle>.</para>
-    </sect2>
-    <sect2 id="gospanel-554">
+    </section>
+    <section id="gospanel-554">
       <title>Search Button</title>
       <screenshot>
         <mediaobject>
@@ -1596,8 +1648,8 @@ on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guim
 the <guibutton>Search</guibutton> button. </para>
       <para>For more information on the <application>Search Tool</application>,
 see the <citetitle>Search Tool Manual</citetitle>.</para>
-    </sect2>
-    <sect2 id="gospanel-564">
+    </section>
+    <section id="gospanel-564">
       <title>Show Desktop 
 Button</title>
       <indexterm>
@@ -1627,8 +1679,8 @@ button</primary>
       <para>To add a <guibutton>Show Desktop</guibutton> button to a panel, right-click on any vacant
 space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Actions</guisubmenu><guimenuitem>Show Desktop</guimenuitem></menuchoice>. To minimize all windows and show the desktop,
 click on the <guibutton>Show Desktop</guibutton> button. </para>
-    </sect2>
-    <sect2 id="gospanel-567">
+    </section>
+    <section id="gospanel-567">
       <title>Notification Area Applet</title>
       <indexterm>
         <primary>applets</primary>
@@ -1660,10 +1712,14 @@ applet. The graphic above illustrates the CD icon in the <application>Notificati
 Area</application> applet. </para>
       <para>To add a <application>Notification Area</application> applet to a panel,
 right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guisubmenu>Utility</guisubmenu><guimenuitem>Notification Area</guimenuitem></menuchoice>.</para>
-    </sect2>
-  </sect1>
-  <sect1 id="gospanel-37">
+    </section>
+  </section>
+  <section id="gospanel-37">
     <title>Menus</title>
+
+    <!-- Desktop Overview / Menus -->
+    <anchor id="gosoverview-42"/>
+
     <indexterm>
       <primary>menus</primary>
       <secondary>adding to panel</secondary>
@@ -1711,8 +1767,8 @@ arrow. The arrow indicates that the icon represents a menu or drawer. <xref link
         </mediaobject>
       </screenshot>
     </figure>
-  </sect1>
-  <sect1 id="gospanel-18">
+  </section>
+  <section id="gospanel-18">
     <title>Drawers</title>
     <indexterm>
       <primary>panel objects</primary>
@@ -1739,7 +1795,7 @@ the objects in the same way that you use objects on a panel. </para>
 or menu.</para>
     <para>You can add, move, and remove objects from drawers in the same way that
 you add, move, and remove objects from panels. </para>
-    <sect2 id="gospanel-42">
+    <section id="gospanel-42">
       <title>To Open and Close a Drawer</title>
       <indexterm>
         <primary>drawers</primary>
@@ -1759,8 +1815,8 @@ a drawer in the following ways: </para>
           <para>Click on the drawer hide button.</para>
         </listitem>
       </itemizedlist>
-    </sect2>
-    <sect2 id="gospanel-420">
+    </section>
+    <section id="gospanel-420">
       <title>To Add a Drawer to a Panel</title>
       <indexterm>
         <primary>drawers</primary>
@@ -1779,8 +1835,8 @@ a drawer in the following ways: </para>
 Right-click on any launcher in the menu, then choose <menuchoice><guimenu>Entire menu</guimenu><guimenuitem>Add this as drawer to panel</guimenuitem></menuchoice>.</para>
         </listitem>
       </itemizedlist>
-    </sect2>
-    <sect2 id="gospanel-54">
+    </section>
+    <section id="gospanel-54">
       <title>To Add an Object to a Drawer</title>
       <indexterm>
         <primary>drawers</primary>
@@ -1788,8 +1844,8 @@ Right-click on any launcher in the menu, then choose <menuchoice><guimenu>Entire
       </indexterm>
       <para>You add an object to a drawer in the same way that you add
 objects to panels. For more information, see <xref linkend="gospanel-15"/>.</para>
-    </sect2>
-    <sect2 id="gospanel-550">
+    </section>
+    <section id="gospanel-550">
       <title>To Modify Drawer Properties</title>
       <indexterm>
         <primary>drawers</primary>
@@ -1897,6 +1953,6 @@ to set the color or image as the background of the drawer. For more information,
           <para>Click <guibutton>Close</guibutton> to close the <guilabel>Panel Properties</guilabel> dialog.</para>
         </listitem>
       </orderedlist>
-    </sect2>
-  </sect1>
+    </section>
+  </section>
 </chapter>
diff --git a/gnome2-user-guide/C/gosstartsession.xml b/gnome2-user-guide/C/gosstartsession.xml
index 66ed663..ca7c3ec 100644
--- a/gnome2-user-guide/C/gosstartsession.xml
+++ b/gnome2-user-guide/C/gosstartsession.xml
@@ -1,9 +1,17 @@
-<chapter id="gosgetstarted-1">
-  <title>GNOME Desktop Sessions</title>
+<chapter id="sessions">
+  <title>Desktop Sessions</title>
+
+  <!-- Maintained for 2.8 compatibility -->
+  <anchor id="gosgetstarted-1"/>
+
+  <remark>Needs better intro</remark>
+  <remark>This chapter needs work</remark>
+
   <highlights>
     <para>This chapter provides the information you need to start,
-manage, and end a GNOME Desktop session.</para>
+    manage, and end a desktop session.</para>
   </highlights>
+
   <sect1 id="gosgetstarted-69">
     <title>Starting a Session</title>
     <indexterm>
@@ -106,7 +114,7 @@ Layout Switcher</application> applet.</para>
     </sect2>
   </sect1>
   <sect1 id="gosstartsession-1">
-    <title>To Lock Your Screen</title>
+    <title>Locking Your Screen</title>
     <screenshot>
       <mediaobject>
         <imageobject>