Updated User Guide for GNOME 2.2.1.

1 files changed, 51 insertions, 39 deletions

diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index d75b812..defea89 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <chapter id="gosoverview-1">
   <title>Overview of the Desktop</title>
   <highlights>
@@ -40,15 +39,17 @@ that perform desktop functions, for example <guimenuitem>Search for Files</guime
 a list of all open windows.</para></listitem><listitem><para>Menus</para><para>You can access all desktop functions through menus. The Menu Panel contains
 menus, so you can use a combination of menus and panels to perform your tasks.
 You can use the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu to access almost all of the standard applications, commands,
-and configuration options. </para><para>You can also access the items in the <guimenu>Applications</guimenu>
-and <guimenu>Actions</guimenu> menus from the <guimenu>GNOME Menu</guimenu>.
-The items in the <guimenu>Actions</guimenu> menu are at the top level of the <guimenu>GNOME Menu</guimenu>. </para></listitem><listitem><para>Windows</para><para>You can display many windows at the same time. You can run different
+and configuration options. </para><para>You can also access almost all of the standard applications, commands,
+and configuration options from the <guimenu>Main Menu</guimenu>. You can access
+the items in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu>
+menus from the <guimenu>Main Menu</guimenu>. You can add the <guimenu>Main
+Menu</guimenu> as a button to your panels.</para></listitem><listitem><para>Windows</para><para>You can display many windows at the same time. You can run different
 applications in each window. The window manager provides frames and buttons
 for windows. The window manager enables you to perform standard actions such
 as move, close, and resize windows. </para></listitem><listitem><para>Workspaces</para><para>You can subdivide your desktop into separate <firstterm>workspaces</firstterm>.
-A workspace is a discrete area on the desktop in which you can work. You can
-specify the number of workspaces on your 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
+A workspace is a discrete area in which you can work. You can specify the
+number of workspaces on your 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 <application>Nautilus</application> window, or open
 the files in the appropriate application from <application>Nautilus</application>.
@@ -215,6 +216,35 @@ space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guim
 the launcher to add from the submenus.</para>
         </listitem>
         <listitem>
+          <para>Buttons</para>
+          <para>You can add buttons to your panels to provide quick access to common
+functions. You can add the following buttons to your panels:</para>
+          <itemizedlist>
+            <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>Screenshot</guibutton>: Click on this button to
+take a screenshot of the desktop.</para>
+            </listitem>
+            <listitem>
+              <para><guibutton>Search</guibutton>: Click on this button to open
+the <application>Search Tool</application> application, from which you can
+search for files. </para>
+            </listitem>
+            <listitem>
+              <para><guibutton>Run</guibutton>: Click on this button to open the <guilabel>Run Program</guilabel> dialog, from which you can run commands.</para>
+            </listitem>
+          </itemizedlist>
+          <para>To add the buttons to a panel, right-click on a vacant space on the
+panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Button</guimenuitem></menuchoice>. You can then choose the button you require. </para>
+        </listitem>
+        <listitem>
           <para>Menus</para>
           <para>You can access all desktop functions through menus. The default panels
 contain menus, so you can use a combination of menus and panels to perform
@@ -223,9 +253,9 @@ the menu. To open a menu from the Menu Panel, click on the text that represents
 the menu. </para>
           <para>Menus that you add to your panels are represented by an icon with an
 arrow. The arrow indicates that the icon represents a menu. The icon in <xref linkend="gosoverview-FIG-28"/> is the icon that is displayed when you add the <guimenuitem>Desktop Preferences</guimenuitem> menu to a panel.</para>
-          <para>You can also add the <guimenu>GNOME Menu</guimenu> to any of your panels.
-To add the <guimenu>GNOME Menu</guimenu> to a panel, right-click on a vacant
-space on the panel, then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>GNOME Menu</guimenuitem></menuchoice>.</para>
+          <para>You can also 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>
         </listitem>
         <listitem>
           <para>Drawers</para>
@@ -239,22 +269,6 @@ then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Drawer</guim
           <para>To open a drawer click on the drawer. To close a drawer click on the
 drawer again.</para>
         </listitem>
-        <listitem>
-          <para><guibutton>Lock</guibutton> button and <guibutton>Log Out</guibutton> button</para>
-          <para>The <guibutton>Lock</guibutton> button enables you to lock your screen.
-The lock icon in <xref linkend="gosoverview-FIG-28"/> is the <guibutton>Lock</guibutton> button. The <guibutton>Lock</guibutton> button enables you to
-end your session. </para>
-          <para>To add the buttons to a panel, right-click on a vacant space on the
-panel, then choose <guimenuitem>Add to Panel</guimenuitem>. You can then choose
-the button you require. </para>
-        </listitem>
-        <listitem>
-          <para><guibutton>Screenshot</guibutton> button, <guibutton>Search</guibutton> button, and <guibutton>Run</guibutton> button</para>
-          <para>The <guibutton>Screenshot</guibutton> button enables you to take a screenshot
-of the desktop. The <guibutton>Search</guibutton> button opens the <application>Search Tool</application> application, from which you can search for files.
-The <guibutton>Run</guibutton> button opens the <guilabel>Run Program</guilabel>
-dialog, from which you can run commands.</para>
-        </listitem>
       </itemizedlist>
     </sect2>
     <sect2 id="gosoverview-21">
@@ -283,12 +297,12 @@ item is a launcher right-click on the menu item, then choose <guimenuitem>Add th
     </indexterm>
     <para>You can access all desktop functions through menus. Your default panels
 contain menus, so you can use a combination of menus and panels to perform
-your tasks. The Menu Panel contains <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus. You can also add the <guimenu>GNOME Menu</guimenu>
+your tasks. The Menu Panel contains <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus. You can also add the <guimenu>Main Menu</guimenu>
 to your panels. </para>
     <para>You can use the <guimenu>Applications</guimenu> menu and the <guimenu>Actions</guimenu> menu to access almost all of the standard applications,
-commands, and configuration options. You can also access the items in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus from the <guimenu>GNOME Menu</guimenu>.</para>
-    <para>To add a <guimenu>GNOME Menu</guimenu> to a panel, right-click on the
-panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>GNOME Menu</guimenuitem></menuchoice>. The <guimenu>GNOME Menu</guimenu> is
+commands, and configuration options. You can also access the items in the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus from the <guimenu>Main Menu</guimenu>.</para>
+    <para>To add a <guimenu>Main Menu</guimenu> to a panel, right-click on the
+panel then choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>. The <guimenu>Main Menu</guimenu> is
 represented by a stylized footprint, as follows:</para>
     <screenshot>
       <mediaobject>
@@ -296,12 +310,12 @@ represented by a stylized footprint, as follows:</para>
           <imagedata fileref="figures/footprint_icon.png" format="PNG"/>
         </imageobject>
         <textobject>
-          <phrase>GNOME Menu icon.</phrase>
+          <phrase>Main Menu icon.</phrase>
         </textobject>
       </mediaobject>
     </screenshot>
-    <para>Click on the <guibutton>GNOME Menu</guibutton> button on a panel to
-open the <guimenu>GNOME Menu</guimenu>. </para>
+    <para>Click on the <guibutton>Main Menu</guibutton> button on a panel to open
+the <guimenu>Main Menu</guimenu>. </para>
     <para>You can add as many additional menus as you want to any of your panels.
 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>
@@ -338,7 +352,6 @@ buttons that enable you to open the <guimenu>Window Menu</guimenu>, or to
 close the dialog window.</para>
         </listitem>
       </itemizedlist>
-<!--<para>To change the theme of your window frames, choose <menuchoice><guimenu>Applications</guimenu><guisubmenu>Desktop Preferences</guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>FIXME</guimenuitem></menuchoice>, then choose the theme that you require. </para>-->
     </sect2>
     <sect2 id="gosoverview-32">
       <title>To Manipulate Windows</title>
@@ -510,7 +523,7 @@ Switcher</application> display.</para>
     </indexterm>
     <para>You can display many windows at the same time on your desktop. Your
 windows are displayed in subdivisions of your desktop that are called workspaces.
-A workspace is a discrete area on the desktop in which you can work. </para>
+A workspace is a discrete area in which you can work. </para>
     <para>Every workspace on the desktop contains the same desktop background,
 the same panels, and the same menus. However, you can run different applications,
 and open different windows in each workspace. You can display only one workspace
@@ -549,9 +562,8 @@ open windows. The last workspace does not contain currently active windows.</par
 the workspace where you want to work.</para>
         </listitem>
         <listitem>
-          <para>Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo>
- to switch to the workspace on the right of
-the current workspace.</para>
+          <para>Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo> to switch to the workspace on the right of the current
+workspace.</para>
         </listitem>
         <listitem>
           <para>Press <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo> to switch to the workspace on the left of the current
@@ -738,7 +750,7 @@ location</secondary>
         </para>
         <para>Double-click on <guilabel>Applications</guilabel> to access your key
 GNOME applications. You can also access the <guimenu>Applications</guimenu>
-menu through the <guimenu>GNOME Menu</guimenu> and the Menu Panel.</para>
+menu through the <guimenu>Main Menu</guimenu> and the Menu Panel.</para>
       </listitem>
       <listitem>
         <para>