updated section on workspaces, using material from the wiki by Tim Littlemore and Brent Smith

2 files changed, 28 insertions, 22 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 90862f2..672671b 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,5 +1,8 @@
 2006-02-24 Joachim Noreiko <jnoreiko@yahoo.com>
 
+	* gosoverview.xml:
+	updated section on workspaces, using material from
+	the wiki by Tim Littlemore and Brent Smith
 	* goseditmainmenu.xml:
 	updated first part for 2.14. 
 	removed a number of sections
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index d1c0e9a..8886a54 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -311,20 +311,10 @@
       <primary>workspaces</primary>
       <secondary>overview</secondary>
     </indexterm>
-    <para>You can display many windows at the same time in your GNOME Desktop.
-Your windows are displayed in subdivisions of the GNOME Desktop that are called
-workspaces. A workspace is a discrete area in which you can work. </para>
-    <para>Every workspace contains the same desktop, 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 at a time in
-the GNOME Desktop but you can have windows open in other workspaces.  </para>
-    <para>Workspaces enable you to organize the GNOME Desktop when you run many
-applications at the same time. When your current workspace becomes crowded
-with windows, you can move your work to another workspace. You can also switch
-to another workspace then start more applications.</para>
-    <para>Workspaces are displayed in the <application>Workspace Switcher</application>
-applet. In <xref linkend="gosoverview-FIG-42"/>, <application>Workspace Switcher</application> contains four workspaces. The first three workspaces contain
-open windows. The last workspace does not contain currently active windows.</para>
+    <para>Workspaces allow you to manage which windows are on your screen. You can imagine workspaces as being virtual screens, which you can switch between at any time. Every workspace contains the same desktop, the same panels, and the same menus. However, you can run different applications, and open different windows in each workspace. The applications in each workspace will remain there when you switch to other workspaces.</para>
+
+    <para>By default, four workspaces are available. You can switch between them with the <application>Workspace Switcher</application> applet at the right of the <link linkend="bottom-panel">bottom panel</link>. This shows a representation of your workspaces, by default a row of four rectangles. Click on one to switch to that workspace. In <xref linkend="gosoverview-FIG-42"/>, <application>Workspace Switcher</application> contains four workspaces. The first three workspaces contain open windows. The last workspace does not contain currently open windows. The currently active workspace is highlighted.</para>
+    
     <figure id="gosoverview-FIG-42">
       <title>Workspaces Displayed in Workspace Switcher</title>
       <screenshot>
@@ -337,20 +327,28 @@ open windows. The last workspace does not contain currently active windows.</par
           </textobject>
         </mediaobject>
       </screenshot>
-    </figure>
+    </figure>    
+    
+     <para>Each workspace can have any number of applications open in it. The number of workspaces can be customized: see <xref linkend="workspace-add"/>.</para>
+     
+     <tip><para>Workspaces enable you to organize the GNOME Desktop when you run many
+applications at the same time. One way to use workspaces is to allocate a specific function to each workspace: one for email, one for web browsing, one for graphic design, etc. However, everyone has their own preference and you are in no way restricted to only using workspaces like this.</para></tip>
+    
     <section id="gosoverview-41">
-      <title>To Switch Between Workspaces</title>
+      <title>Switching Between Workspaces</title>
       <indexterm>
         <primary>workspaces</primary>
         <secondary>switching between</secondary>
       </indexterm>
-      <para>You can switch between workspaces in the following ways:</para>
+      <para>You can switch between workspaces in any of the following ways:</para>
       <itemizedlist>
         <listitem>
-          <para>In <application>Workspace Switcher</application>, click on
-the workspace where you want to work.</para>
+          <para>In the <application>Workspace Switcher</application> applet in the bottom panel, click on the workspace where you want to work.</para>
         </listitem>
         <listitem>
+          <para>Move the mouse over the <application>Workspace Switcher</application> applet in the bottom panel, and scroll the mouse wheel.</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>
         </listitem>
@@ -359,9 +357,12 @@ workspace.</para>
 workspace.</para>
         </listitem>
       </itemizedlist>
+      <note><para>The arrow shortcut keys work according to how your workspaces are set out in the <application>Workspace Switcher</application> applet. If you change your panel so workspaces are displayed vertically instead of horizontally, use <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>up arrow</keycap></keycombo> and <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>down arrow</keycap></keycombo> to switch workspaces.</para></note>
     </section>
-    <section id="gosoverview-40">
-      <title>To Add Workspaces</title>
+    <section id="workspace-add">
+      <title>Adding Workspaces</title>
+      <!-- preserve id for backwards compatibility: 2.12 -->
+      <anchor id="gosoverview-40"/>         
       <indexterm>
         <primary>workspaces</primary>
         <secondary>specifying number of</secondary>
@@ -369,9 +370,11 @@ workspace.</para>
       <para>To add workspaces to the GNOME Desktop, right-click on the <application>Workspace Switcher</application> applet, then choose <guimenuitem>Preferences</guimenuitem>. The <guilabel>Workspace Switcher Preferences</guilabel> dialog
 is displayed. Use the <guilabel>Number of workspaces</guilabel> spin box to
 specify the number of workspaces that you require.</para>
+      <para>For more on this, see the <ulink type="help" url="ghelp:workspace-switcher">Workspace Switcher Applet Manual</ulink>.</para>
     </section>
   </section>
-
+  
+  <!-- translators: rest of this file is still being worked on and will change a lot -->
   <section id="gosoverview-54">
     <title>Applications</title>
     <indexterm>