gosoverview.xml - updated section on Giving Focus to a Window with

* gosoverview.xml - updated section on Giving Focus to a Window with material from the wiki by Daniel Espinosa Ortiz
* goscustdesk.xml - changed section ids newly linked to from gosoverview.xml ver 1.19, to use meaningful names instead of numbers

2 files changed, 46 insertions, 76 deletions

diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index b069c4b..e8f7d93 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -1,5 +1,9 @@
 <chapter id="prefs">
   <title>Configuring Your Desktop</title>
+  
+  <!-- ids in this section are gradually being converted 
+  to something like 'prefs-mouse'.
+  remember to add an anchor for the old id in the right place -->
 
   <!-- Maintained for 2.8 compatibility -->
   <anchor id="goscustdesk-6"/>
@@ -2881,8 +2885,12 @@ to indicate an input error. </para>
       </table>
     </sect2>
   </sect1>
-  <sect1 id="goscustdesk-12">
+  <sect1 id="prefs-theme">
     <title>Theme</title>
+
+    <!-- preserve for backwards compatibility: 2.12 -->
+    <anchor id="goscustdesk-12"/>    
+    
     <indexterm>
       <primary>themes</primary>
       <secondary>setting controls options</secondary>
@@ -3089,8 +3097,12 @@ URI. The themes are displayed as icons.</para>
       </orderedlist>
     </sect2>
   </sect1>
-  <sect1 id="goscustdesk-58">
+  <sect1 id="prefs-windows">
     <title>Windows</title>
+
+    <!-- preserve for backwards compatibility: 2.12 -->
+    <anchor id="goscustdesk-58"/>    
+
     <indexterm>
       <primary>window manager</primary>
       <secondary>customizing</secondary>
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index 2a98c90..8754cef 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -234,7 +234,7 @@
             <keycap>Alt</keycap><keycap>F10</keycap></keycombo>, or double-click any part of the titlebar except the buttons at either end.</para>
 
             <tip>
-            <para>If you prefer, you can assign the double-click action to <firstterm>roll up</firstterm> the window: see <xref linkend="goscustdesk-58"/><!-- evil xref id -->.</para>
+            <para>If you prefer, you can assign the double-click action to <firstterm>roll up</firstterm> the window: see <xref linkend="prefs-windows"/>.</para>
             </tip>            
         </listitem>
       </varlistentry>    
@@ -255,84 +255,42 @@
       </varlistentry>                        
     </variablelist> 
        
-    <remark>This is as far as I've got taking material from the wiki. Workspaces commands still to go in this section, perhaps</remark>
+    <remark>Workspaces commands or a link to them still to go in this section, perhaps</remark>
 
   </section>
 
     <section id="gosoverview-20">
       <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>
-      <para>You can use the following elements to give focus to a window:</para>
-      <informaltable frame="topbot">
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec0" colwidth="33.62*"/>
-          <colspec colname="colspec1" colwidth="66.38*"/>
-          <thead>
-            <row rowsep="1">
-              <entry valign="top">
-                <para>Element</para>
-              </entry>
-              <entry valign="top">
-                <para>Action</para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry valign="top">
-                <para>Mouse</para>
-              </entry>
-              <entry valign="top">
-                <para>Click on the window, if the window is visible. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>Shortcut keys</para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Use shortcut keys to switch between
-the windows that are open. To give focus to a window, release the keys. The
-default shortcut keys to switch between windows are <keycombo><keycap>Alt</keycap><keycap>Tab</keycap></keycombo>. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <application>Window List</application>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Click on the button that represents the window in <application>Window List</application>. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0">
-                <para>
-                  <application>Window Selector</application>
-                </para>
-              </entry>
-              <entry colname="colspec1">
-                <para>Click on the Window Selector icon, then select
-the window that you want to give focus to from the list.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <application>Workspace Switcher</application>
-                </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.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+      <para>To work with an application, you need to give the <firstterm>focus</firstterm> to its window. When a window has focus, any actions such as mouse clicks, typing text, or keyboard shortcuts, are directed to the application in that window. Only one window can have focus at a time. The window that has focus will appear on top of other windows, so nothing covers any part of it. It may also have a different appearance from other windows, depending on your choice of <link linkend="prefs-theme"> theme</link>.</para>
+      <para>You can give the focus to a window in any of the following ways:</para>
+      <itemizedlist>
+        <listitem>
+          <para>
+          With the mouse, click on any part of the window, if the window is visible.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+          On the bottom panel, click on the button that represents the window in the <application>Window List</application>.
+          </para>
+        </listitem>        
+        <listitem>
+          <para>
+          On the top panel, click the <application>Window Selector</application>. This is the icon the furthest to the right that matches the window icon of your current window. When clicked, a menu opens showing a list of all windows. Choose the window you want to switch to from the list.
+          </para>
+          <note><para>
+            If the window you choose is on a different workspace, you will be switched to that workspace. For more on workspaces, see <xref linkend="overview-workspaces"/>.
+          </para></note>
+          </listitem>    
+        <listitem>
+          <para>
+          With the keyboard, hold the [Alt] key and press the [Tab] key. A pop-up window appears with a list of icons representing each window. While still holding [Alt], press [Tab] to move the selection along the list: a black rectangle frames the selected icon and the position of the window it corresponds to is highlighted with a black border. When the window you want to see is selected, release the [Alt] key. Using [Shift+Tab] instead of just [Tab] cycles through the icons in reverse order.      
+          </para>
+          <note><para>
+            You can customize the shortcut used to perform this action with the <link linkend="prefs-keyboard-shortcuts">Keyboard Shortcuts preference tool</link>.
+          </para></note>
+        </listitem>      
+      </itemizedlist>
     </section>
   </section>
   <section id="overview-workspaces">