Further updates to User Guide for GNOME 2.6

1 files changed, 35 insertions, 59 deletions

diff --git a/gnome2-user-guide/C/gosmetacity.xml b/gnome2-user-guide/C/gosmetacity.xml
index b16be8d..e5059a5 100644
--- a/gnome2-user-guide/C/gosmetacity.xml
+++ b/gnome2-user-guide/C/gosmetacity.xml
@@ -107,17 +107,6 @@ that enable you to do the following:</para>
 you open a dialog window, the window is usually raised and has focus. Some
 dialog windows do not allow you to use the application until you close the
 dialog. </para>
-        <para>The following figure shows a typical dialog window. </para>
-        <screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/gedit_pref_dialog.png" format="PNG"/>
-            </imageobject>
-            <textobject>
-              <phrase>Dialog window in Simple theme.</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
       </listitem>
     </itemizedlist>
     <sect2 id="gosmetacity-16">
@@ -200,8 +189,8 @@ the button to open the <guimenu>Window Menu</guimenu>. </para>
 the new location. </para>
                     </listitem>
                     <listitem>
-                      <para>To shade the window, double-click on the titlebar. To unshade
-the window, double-click on the titlebar again.</para>
+                      <para>To maximize the window, double-click on the titlebar. To restore
+the window to the  previous size, double-click on the titlebar again.</para>
                     </listitem>
                   </itemizedlist>
                 </entry>
@@ -413,9 +402,8 @@ to Workspace Right</guimenuitem>  or <guimenuitem>Move to Workspace Left</guimen
               <entry colname="colspec3">
                 <para>Move the window to the
 workspace to the right of the current workspace. If the window is already
-on the workspace to the right of your workspace, choose <guimenuitem>Move
-to Workspace Left</guimenuitem> to move the window to the workspace to the
-left of the current workspace.</para>
+in the last workspace at the right of the Workspace Switcher, choose <guimenuitem>Move to Workspace Left</guimenuitem> to move the window to the workspace to
+the left of the current workspace.</para>
               </entry>
             </row>
             <row>
@@ -426,8 +414,8 @@ to Another Workspace</guimenuitem>
                 </para>
               </entry>
               <entry colname="colspec3">
-                <para>Moves the window to another workspace. Select the workspace you want from
-the following:<itemizedlist><listitem><para><guimenuitem>Workspace 1</guimenuitem></para></listitem><listitem><para><guimenuitem>Workspace 2</guimenuitem></para></listitem><listitem><para><guimenuitem>Workspace 3</guimenuitem></para></listitem><listitem><para><guimenuitem>Workspace 4</guimenuitem></para></listitem></itemizedlist>.</para>
+                <para>Moves the window to another workspace. Select the workspace to which you want
+to move the window from the submenu.</para>
               </entry>
             </row>
           </tbody>
@@ -476,9 +464,7 @@ which application windows are open. You can view which windows are open even
 if some windows are minimized, or other windows overlap a window. <application>Window List</application> can display buttons for the windows in your current
 workspace, or in all workspaces. To select this option, you must change the
 preferences of <application>Window List</application>.</para>
-      <para>You can also right-click on a window list button to open the <guimenu>Window Menu</guimenu> for the window that the button represents. When you
-open the <guimenu>Window Menu</guimenu> from <application>Window List</application>,
-the <guimenu>Window Menu</guimenu> does not contain the workspace commands.
+      <para>You can also right-click on a window list button to open the <guimenu>Window Menu</guimenu> for the window that the button represents.
 For more information on the <guimenu>Window Menu</guimenu> commands, see <xref linkend="gosmetacity-24"/>.</para>
       <para><xref linkend="gosmetacity-FIG-8"/> shows <application>Window List</application>
 when the following windows are open:</para>
@@ -626,10 +612,8 @@ focus to windows, minimize windows, and restore windows.</para>
         <para>To open the <guimenu>Window Menu</guimenu> for a window in a button
 group, right-click on the window list button that represents the group. A
 list of the windows in the group is displayed. To open the <guimenu>Window
-Menu</guimenu> for a window in the group, click on the item in the list. When
-you open the <guimenu>Window Menu</guimenu> from the <application>Window List</application>, the <guimenu>Window Menu</guimenu> does not contain the workspace
-commands. For more information on the <guimenu>Window Menu</guimenu> commands,
-see <xref linkend="gosmetacity-24"/>.</para>
+Menu</guimenu> for a window in the group, point to the item in the list.
+For more information on the <guimenu>Window Menu</guimenu> commands, see <xref linkend="gosmetacity-24"/>.</para>
       </sect3>
     </sect2>
     <sect2 id="gosmetacity-20">
@@ -698,11 +682,10 @@ applet. The following figure shows an example of the <application>Window Selecto
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>To give focus to a window, choose that window from the window selector
-applet.</para>
-      <para>The window selector lists the windows in all workspaces. The windows
-in all workspaces other than the current workspace, are listed under a separator
-line.</para>
+      <para>To give focus to a window, select the window from the <application>Window Selector</application> applet.</para>
+      <para>The <application>Window Selector</application> lists the windows in
+all workspaces. The windows in all workspaces other than the current workspace,
+are listed under a separator line.</para>
     </sect2>
   </sect1>
   <sect1 id="gosmetacity-715">
@@ -769,25 +752,26 @@ default shortcut keys to switch between windows are <keycombo><keycap>Alt</keyca
               </entry>
             </row>
             <row>
-              <entry colname="colspec0" valign="top">
+              <entry colname="colspec0">
                 <para>
-                  <application>Workspace Switcher</application>
+                  <application>Window Selector</application>
                 </para>
               </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Click on the window that you want to give focus to in the <application>Workspace
-Switcher</application> display. If you click on a window in another workspace, <application>Workspace Switcher</application> switches to the new workspace, and gives
-focus to the window. </para>
+              <entry colname="colspec1">
+                <para>Click on the <application>Window Selector</application> icon. A list of your open windows is displayed. Select the
+window from the list.</para>
               </entry>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para>Top edge panel</para>
+                <para>
+                  <application>Workspace Switcher</application>
+                </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Click on the button that represents
-the <application>Window Selector</application> applet. A list of your open
-windows is displayed. Choose the window from the list.</para>
+                <para>Click on the window that you want to give focus to in the <application>Workspace
+Switcher</application> display. If you click on a window in another workspace, <application>Workspace Switcher</application> switches to the new workspace, and gives
+focus to the window. </para>
               </entry>
             </row>
           </tbody>
@@ -804,7 +788,7 @@ windows is displayed. Choose the window from the list.</para>
         <primary>minimizing</primary>
         <secondary>windows</secondary>
       </indexterm>
-      <para>To minimize a window perform one of the following actions: </para>
+      <para>To minimize a window, perform one of the following actions: </para>
       <itemizedlist>
         <listitem>
           <para>Click on the <guibutton>Minimize</guibutton> button on the
@@ -834,7 +818,7 @@ from the popup menu.</para>
         <primary>maximizing windows</primary>
       </indexterm>
       <para>When you
-maximize a window, the window expands as much as possible. To maximize a window
+maximize a window, the window expands as much as possible. To maximize a window,
 perform one of the following actions: </para>
       <itemizedlist>
         <listitem>
@@ -858,7 +842,7 @@ from the <guimenu>Window Menu</guimenu>.</para>
         <primary>restoring</primary>
         <secondary>windows</secondary>
       </indexterm>
-      <para>To restore a maximized window perform one of the following actions: </para>
+      <para>To restore a maximized window, perform one of the following actions: </para>
       <itemizedlist>
         <listitem>
           <para>Click on the <guibutton>Maximize</guibutton> button on the
@@ -875,18 +859,9 @@ window frame.</para>
 window in <application>Window List</application>.</para>
     </sect2>
     <sect2 id="gosmetacity-2">
-      <title>To Place A Window on Top of Other Windows</title>
-      <para>To place a window on top of other windows, perform one of the following
-actions: </para>
-      <itemizedlist>
-        <listitem>
-          <para>From the file browser window, open the <guimenu>Window Menu</guimenu>, then choose <guimenuitem>On Top</guimenuitem>.</para>
-        </listitem>
-        <listitem>
-          <para>Right-click on the button that represents the window in <application>Window List</application>, then choose <guimenuitem>On Top</guimenuitem> from
-the <guimenu>Window Menu</guimenu>.</para>
-        </listitem>
-      </itemizedlist>
+      <title>To Place a Window on Top of Other Windows</title>
+      <para>To place a window on top of other windows, open the <guimenu>Window
+Menu</guimenu>, then choose <guimenuitem>On Top</guimenuitem>.</para>
     </sect2>
     <sect2 id="gosmetacity-32">
       <title>To Close a Window</title>
@@ -1023,8 +998,8 @@ rolled-up state so that the full window is displayed.</para>
         <listitem>
           <para>Double-click on the titlebar of the window. To roll down the
 window, double-click on the titlebar again. You must select <guilabel>Roll
-up</guilabel> in the <guilabel>Window Preferences</guilabel> dialog to perform
-this action.</para>
+up</guilabel> in the <application>Windows</application> preferences tool to
+perform this action.</para>
         </listitem>
         <listitem>
           <para>Right-click on the button that represents the window in <application>Window List</application>, then choose <guimenuitem>Roll Up</guimenuitem>
@@ -1061,8 +1036,9 @@ window to the workspace you require.</para>
         </listitem>
         <listitem>
           <para>Use the <guimenu>Window Menu</guimenu></para>
-          <para>Open the <guimenu>Window Menu</guimenu>. To move the window to the next
-workspace choose <guimenuitem>Move to Workspace Right</guimenuitem> or <guimenuitem>Move to Another Workspace <replaceable>workspace-name</replaceable></guimenuitem>.</para>
+          <para>Open the <guimenu>Window Menu</guimenu>. To move the window to another
+workspace, choose <guimenuitem>Move to Workspace Right</guimenuitem> or <guimenuitem>Move to Workspace Left</guimenuitem>. Alternatively, <guimenuitem>Move to
+Another Workspace <replaceable>workspace-name</replaceable></guimenuitem>.</para>
         </listitem>
       </itemizedlist>
     </sect2>