patch so far...



Here's a patch of all my changes to the gnome user
docs so far, as requested by Shaun.

This patch includes the one I mailed to this list
about a week ago.
It concerns 3 sections of the guide, in three files
* basic skills
* desktop overview
* small change to the mouse prefs

The first two are works in progress, but are fine as
they stand.
In particular, I'm not entirely happy with the mouse
basics section. See the comments I've left in source.
Images of the mouse pointers are also needed to go
with this patch.

Joachim


		
___________________________________________________________ 
Yahoo! Exclusive Xmas Game, help Santa with his celebrity party - http://santas-christmas-party.yahoo.net/
Index: gosbasic.xml
===================================================================
RCS file: /cvs/gnome/gnome-user-docs/gnome2-user-guide/C/gosbasic.xml,v
retrieving revision 1.13
diff -u -p -r1.13 gosbasic.xml
--- gosbasic.xml	29 Mar 2005 05:01:20 -0000	1.13
+++ gosbasic.xml	30 Dec 2005 20:52:43 -0000
@@ -26,15 +26,23 @@
     <primary>mouse</primary>
     <secondary>basic skills</secondary>
   </indexterm>
+  
+  <!-- Notes for future development of the mouse section
+  Contents list:
+  * buttons
+  * click, drag, etc
+  * what you actually do with those: the concept of focus, selection, etc. 
+    basically, an introduction to the 'noun, verb' grammar of GUIs
+  * pointers
+  -->
 
-  <para>Even if you are very familiar with mouse devices, you should
-  still familiarize yourself with the button conventions and action
-  terminology used in this manual. This section also describes the
+  <para>This section describes the button conventions and action
+  terminology used in this manual, and also the
   mouse pointers used throughout the desktop and applications.</para>
 
   <section id="mouse-conventions">
     <title>Mouse Button Conventions</title>
-    <titleabbrev>Conventions</titleabbrev>
+    <titleabbrev>Buttons</titleabbrev>
 
     <!-- Maintained for 2.8 compatibility -->
     <anchor id="gosgetstarted-44"/>
@@ -51,10 +59,7 @@
         <para>Devices that are configured for right-hand users.</para>
       </listitem>
       <listitem>
-        <para>Three button devices. If you have a two-button mouse device,
-        then your system may be configured to allow you to press the left
-        and right mouse buttons simultaneously to simulate the effect of
-        a middle mouse button press.</para>
+        <para>Three button devices.</para>
       </listitem>
     </itemizedlist>
 
@@ -85,6 +90,12 @@
     then you must reverse the mouse button conventions used in this manual.
     See <xref linkend="prefs-mouse"/> for more information about setting
     your mouse preferences.</para>
+    
+    <para>If you have a two-button mouse device,
+    then your system may be configured to allow you to press the left
+    and right mouse buttons simultaneously to simulate the effect of
+    a middle mouse button press.</para>
+
   </section>
 
   <section id="mouse-actions">
@@ -94,71 +105,20 @@
     <!-- Maintained for 2.8 compatibility -->
     <anchor id="gosgetstarted-45"/>
     <anchor id="gosbasic-6"/>
-
+    
     <indexterm>
       <primary>mouse</primary>
-      <secondary>actions</secondary>
+      <secondary>action conventions</secondary>
     </indexterm>
     <indexterm>
       <primary>mouse</primary>
       <secondary>action terminology</secondary>
     </indexterm>
-
-    <para>The following list describes the actions that you can perform
-    with the mouse:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>Left mouse button</term>
-        <listitem>
-          <para>Use the left mouse button to perform the following
-          actions:</para>
-          <itemizedlist>
-            <listitem><para>Select text.</para></listitem>
-            <listitem><para>Choose items.</para></listitem>
-            <listitem><para>Drag items.</para></listitem>
-            <listitem><para>Activate items.</para></listitem>
-          </itemizedlist>
-          <para>When selecting items from a list, you can hold the
-          <keycap>Ctrl</keycap> key to select multiple items, or
-          hold the <keycap>Shift</keycap> key to select a contiguous
-          range of items.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Middle mouse button</term>
-        <listitem>
-          <para>Use the middle mouse button to perform the following
-          actions:</para>
-          <itemizedlist>
-            <listitem><para>Paste text.</para></listitem>
-            <listitem><para>Move items.</para></listitem>
-            <listitem><para>Move windows to the back.</para></listitem>
-          </itemizedlist>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Right mouse button</term>
-        <listitem><para>Use the right mouse button to open a context menu for
-        an item, if a menu applies.  For most items, you can also use the
-        <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
-        keyboard shortcut to open the context menu once the item has been
-        selected.</para></listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>For example, when viewing files in the file manager, you select
-    a file by clicking with the left mouse button and open a file by
-    double-clicking with the left mouse button.  Clicking with the right
-    mouse button will bring up a context menu for that file.</para>
-
-    <tip><para>In most applications, you can select text with your left
-    mouse button and paste it in another application using the middle
-    mouse button.  This is called primary selection paste, and works
-    seperately from your normal clipboard operations.</para></tip>
-
-    <para>The conventions used in this manual to describe actions
-    that you take with the mouse are as follows: </para>
+    
+    <para>The following conventions are used in this manual to describe actions
+    that you take with the mouse: </para>
+    
+    <!-- convert to variablelist -->
     <informaltable frame="topbot">
       <tgroup cols="2" colsep="0" rowsep="0">
         <colspec colname="colspec0" colwidth="36.36*"/>
@@ -185,20 +145,11 @@
           </row>
           <row>
             <entry colname="colspec0" valign="top">
-              <para>Click-and-hold</para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Press and do not release the
-              left mouse button.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
               <para>Left-click</para>
             </entry>
             <entry colname="colspec1" valign="top">
               <para>Same as <emphasis>click</emphasis>.
-              Left-click clarifies the action when there might be
+              The term 'left-click' is used where there might be
               confusion with <emphasis>right-click</emphasis>.</para>
             </entry>
           </row>
@@ -227,8 +178,9 @@
             <entry colname="colspec1" valign="top">
               <para>Press and release the left mouse button twice
               in rapid succession without moving the mouse.  You
-              can configure the double-click timeout using the
-              <application>Mouse Preferences</application>.</para>
+              can configure the sensitivity to double-clicks by changing the
+              <emphasis>Double-click Timeout</emphasis> setting: 
+              see <xref linkend="prefs-mouse"/> for more information.</para>
             </entry>
           </row>
           <row>
@@ -236,8 +188,26 @@
               <para>Drag</para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Click-and-hold a mouse button, then move an object.
-              For example, you can drag a window or an icon. The left
+              <para>Press and do not release the
+              left mouse button, 
+              and then move the mouse with the button still held down,
+              and finally release the button.</para>
+                            
+              <para>Dragging with the mouse is used in many different contexts.
+              
+              
+              This moves an object around the screen with the mouse. The 
+              object is <emphasis>dropped</emphasis> at the 
+              location where the mouse button 
+              is released. This action is also called 
+              <emphasis>drag-and-drop</emphasis>. Clicking on an element of the interface to
+              move it is sometimes called a <emphasis>grab</emphasis>. Click and drag</para>
+                            
+              <para>For example, you can change the position of a window by 
+              dragging on its title bar, or move a file by dragging its icon 
+              from one window and dropping it on another.</para>           
+              
+              <para>The left
               mouse buttons is usually used to perform drag actions,
               although the middle mouse button is sometimes used for
               an alternate drag action.</para>
@@ -245,28 +215,79 @@
           </row>
           <row>
             <entry colname="colspec0" valign="top">
-              <para>Drag-and-drop</para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Click-and-hold a mouse button, then move an object.
-              For example, you can drag-and-drop a window or an icon.
-              Release the mouse button to place the object in a new
-              location.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>Grab</para>
+              <para>Click-and-hold</para>
             </entry>
             <entry colname="colspec1" valign="top">
-              <para>Point to an item that you can move, and click-and-hold
-              on the mouse button. For example, you can grab the titlebar
-              of a window, then drag the window to a new location.</para>
+              <para>Press and do not release the
+              left mouse button.</para>
             </entry>
           </row>
         </tbody>
       </tgroup>
     </informaltable>
+    
+    <indexterm>
+      <primary>mouse</primary>
+      <secondary>actions</secondary>
+    </indexterm>
+
+    <para>You can perform the following actions with the mouse:</para>
+    
+    <!--
+    Problem with the word 'action' here, since it's already used
+    to describe things like click, drag, etc. Suggestion: tasks?
+    -->
+
+    <variablelist>
+      <varlistentry>
+        <term>Left mouse button</term>
+        <listitem>
+          <itemizedlist>
+            <listitem><para>Select text.</para></listitem>
+            <listitem><para>Select items.</para></listitem>
+            <listitem><para>Drag items.</para></listitem>
+            <listitem><para>Activate items.</para></listitem>
+          </itemizedlist>        
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Middle mouse button</term>
+        <listitem>
+          <itemizedlist>
+            <listitem><para>Paste text.</para></listitem>
+            <listitem><para>Move items.</para></listitem>
+            <listitem><para>Move windows to the back.</para></listitem>
+          </itemizedlist>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Right mouse button</term>
+        <listitem><para>Use the right mouse button to open a context menu for
+        an item, if a menu applies.  For most items, you can also use the
+        <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
+        keyboard shortcut to open the context menu once the item has been
+        selected.</para></listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>For example, when viewing files in the file manager, you select
+    a file by clicking with the left mouse button and open a file by
+    double-clicking with the left mouse button.  Clicking with the right
+    mouse button will bring up a context menu for that file.</para>
+
+    <tip><para>In most applications, you can select text with your left
+    mouse button and paste it in another application using the middle
+    mouse button.  This is called primary selection paste, and works
+    separately from your normal clipboard operations.</para></tip>
+
+    <tip><para>To select more than one item, you can hold the
+    <keycap>Ctrl</keycap> key to select multiple items, or
+    hold the <keycap>Shift</keycap> key to select a contiguous
+    range of items. You can also drag a <firstterm>bounding box</firstterm>
+    to select several items by starting the drag in the empty space around items
+    and dragging out a rectangle.
+    <!-- yeah, this is a rubbish explanation. --></para></tip>
+
   </section>
 
   <section id="mouse-pointers">
@@ -286,11 +307,21 @@
     </indexterm>
 
     <para>As you use the mouse, the appearance of the mouse pointer can
-    change.  The appearance of the pointer can provide feedback about a
-    particular operation, location, or state. The following list describes
-    some of the mouse pointers.</para>
+    change. The appearance of the pointer provides feedback about a
+    particular operation, location, or state.</para>
 
-    <variablelist>
+   <para>The following mouse pointers are shown as your mouse passes over 
+   different elements of the screen.</para>   
+   
+   <!-- need the following pointer images:
+   * hand pointer (panels)
+   * hand pointer (links)
+   * text entry I-beam
+   * background-busy
+   * main busy  
+   * drag window (the little + pointer)
+   -->
+   <variablelist>
       <varlistentry>
         <term>
           <inlinemediaobject>
@@ -312,6 +343,65 @@
           <inlinemediaobject>
             <imageobject>
               <imagedata format="PNG"
+                         fileref="figures/resize_pointer.png"/>
+            </imageobject>
+            <textobject>
+              <phrase>Resize pointer.</phrase>
+            </textobject>
+          </inlinemediaobject>
+          Resize pointer
+        </term>
+        <listitem><para>This pointer indicates that you can grab the control to
+        resize parts of the interface.  This appears over the sides of windows
+        and over resize handles between panes.  The direction of the arrows
+        indicates in which direction you can resize.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <inlinemediaobject>
+            <imageobject>
+              <imagedata format="PNG"
+                         fileref="figures/hand_pointer.png"/>
+            </imageobject>
+            <textobject>
+              <phrase>Hand pointer</phrase>
+            </textobject>
+          </inlinemediaobject>
+          Hand pointer
+        </term>
+        <listitem><para>This pointer appears when you hover over a
+        <glossterm>hypertext link</glossterm>.
+        This pointer indicates that you can click on the link to load
+        a new document or perform an action.</para></listitem>
+      </varlistentry>      
+      <varlistentry>
+        <term>
+          <inlinemediaobject>
+            <imageobject>
+              <imagedata format="PNG"
+                         fileref="figures/missing.png"/>
+            </imageobject>
+            <textobject>
+              <phrase>I-beam pointer</phrase>
+            </textobject>
+          </inlinemediaobject>
+          I-beam pointer
+        </term>
+        <listitem><para>This pointer is shown when the mouse is over text that you can
+        select or edit. Click to place the cursor, or drag to select text.</para></listitem>
+      </varlistentry>      
+    </variablelist>      
+      
+   <para>The following mouse pointers are shown when dragging an item such as a file icon. 
+   They indicate the result of releasing the mouse button to drop the 
+   object being moved.</para>      
+      
+    <variablelist>      
+      <varlistentry>
+        <term>
+          <inlinemediaobject>
+            <imageobject>
+              <imagedata format="PNG"
                          fileref="figures/move_pointer.png"/>
             </imageobject>
             <textobject>
@@ -320,8 +410,8 @@
           </inlinemediaobject>
           Move pointer
         </term>
-        <listitem><para>This pointer appears during a drag operation.  It
-        indicates that when you drop the object, the object is moved from
+        <listitem><para>This pointer indicates that when you drop the object,
+        the object is moved from
         the old location to the new location.</para></listitem>
       </varlistentry>
       <varlistentry>
@@ -337,8 +427,8 @@
           </inlinemediaobject>
           Copy pointer
         </term>
-        <listitem><para>This pointer appears during a drag operation.  It
-        indicates that when you drop the object, a copy of the object is
+        <listitem><para>This pointer indicates that when you drop the object, 
+        a copy of the object is
         created where you drop it.</para></listitem>
       </varlistentry>
       <varlistentry>
@@ -354,7 +444,7 @@
           </inlinemediaobject>
           Symbolic link pointer
         </term>
-        <listitem><para>This pointer appears during a drag operation.  It
+        <listitem><para>This pointer 
         indicates that when you drop the object, a <firstterm>symbolic
         link</firstterm> to the object is created where you drop the object.
         A symbolic link is a special type of file that points to another file
@@ -373,11 +463,11 @@
           </inlinemediaobject>
           Ask pointer
         </term>
-        <listitem><para>This pointer appears during a drag operation.  It
-        indicates that when you drop the object, a menu opens.  The menu
-        allows you to choose which drag operation you would like to perform.
-        For instance, you may be able to select among moving, copying, and
-        creating a symbolic link.</para></listitem>
+        <listitem><para>This pointer 
+        indicates that when you drop the object, a menu will open.        
+        The menu allows you to choose which operation you would like to perform.
+        For instance, you may be able to move, copy, or
+        create a symbolic link.</para></listitem>
       </varlistentry>
       <varlistentry>
         <term>
@@ -392,9 +482,8 @@
           </inlinemediaobject>
           Not available pointer
         </term>
-        <listitem><para>This pointer appears during a drag operation.
-        It indicates that you cannot drop the object at the current
-        location.</para></listitem>
+        <listitem><para>This pointer indicates that you cannot 
+        drop the object at the current location.</para></listitem>
       </varlistentry>
       <varlistentry>
         <term>
@@ -410,43 +499,26 @@
           Move panel object pointer
         </term>
         <listitem><para>This pointer appears when you drag a panel object
-        with the middle mouse button.</para></listitem>
+        with the middle mouse button.
+        See <xref linkend="panels"/> for more information on panels.</para></listitem>
       </varlistentry>
       <varlistentry>
         <term>
           <inlinemediaobject>
             <imageobject>
               <imagedata format="PNG"
-                         fileref="figures/resize_pointer.png"/>
+                         fileref="figures/missing.png"/>
             </imageobject>
             <textobject>
-              <phrase>Resize pointer.</phrase>
+              <phrase>Move window pointer.</phrase>
             </textobject>
           </inlinemediaobject>
-          Resize pointer
+          Move window pointer
         </term>
-        <listitem><para>This pointer indicates that you can grab the control to
-        resize parts of the interface.  This appears over the sides of windows
-        and over resize handles between panes.  The direction of the arrows
-        indicates in which direction you can resize.</para></listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <inlinemediaobject>
-            <imageobject>
-              <imagedata format="PNG"
-                         fileref="figures/hand_pointer.png"/>
-            </imageobject>
-            <textobject>
-              <phrase>Hand pointer.</phrase>
-            </textobject>
-          </inlinemediaobject>
-          Hand pointer
-        </term>
-        <listitem><para>This pointer appears when you hover over a hypertext
-        link.  This pointer indicates that you can click on the link to load
-        a new document or perform an action.</para></listitem>
+        <listitem><para>This pointer appears when you drag a window to move it.
+        See <xref linkend="windows-manipulating"/> for more information on moving windows.</para></listitem>
       </varlistentry>
+
     </variablelist>
   </section>
 </section>
Index: gosoverview.xml
===================================================================
RCS file: /cvs/gnome/gnome-user-docs/gnome2-user-guide/C/gosoverview.xml,v
retrieving revision 1.16
diff -u -p -r1.16 gosoverview.xml
--- gosoverview.xml	29 Mar 2005 05:01:21 -0000	1.16
+++ gosoverview.xml	30 Dec 2005 20:52:44 -0000
@@ -17,11 +17,13 @@
 
 
 <highlights>
-  <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
+  <para>This chapter introduces you to some of the very basic components of the desktop. These components include <glossterm>Windows</glossterm>, <glossterm>Workspaces</glossterm>, and <glossterm>Applications</glossterm>. Almost all the work (or play) that you do in GNOME will involve these very basic components.</para>
+  
+  <note>
+  <para>This chapter describes the default configuration of GNOME.
+  Your vendor or system administrator may have configured your
   desktop to look different than what is described here.</para>
+  </note>
 </highlights>
 
 <section id="overview-intro">
@@ -37,17 +39,15 @@
   <para>When you start a desktop session for the first time,
   you should see a default startup screen, with panels, windows,
   and various icons.</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
+      <listitem><para>The <firstterm>panels</firstterm> are the two bars that run along the top and bottom of the screen. By default, the top panel shows you the GNOME main menu bar, the date and time, and the launcher for the GNOME help system, and the bottom panel shows you the list of open windows and the workspace switcher.</para>
+      <para>Panels can be customized to contain a variety of tools, such as other menus and launchers, and 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>
@@ -64,6 +64,14 @@
     </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>Workspaces</term>
       <listitem><para>You can subdivide your desktop into separate
       <firstterm>workspaces</firstterm>.  Each workspace can contain
@@ -82,14 +90,6 @@
     </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
@@ -118,11 +118,13 @@
     <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>A <firstterm>window</firstterm> is a rectangular area of the screen, usually with a border all around and a title bar at the top. You can think of a window as a screen within the screen. Each window displays an application, allowing you to to have more than one application visible, and work on more than one task at a time. You can also think of windows as pieces of paper on your desktop: they can overlap, or be side by side, for example.</para>
+  
+  <para>You can control a window's position of the screen, as well as its size. You can control which windows overlap other windows, so the one you want to work with is completely visible. For more about moving and resizing windows, see <xref linkend="windows-manipulating"/>.</para>
+  
+  <para>Each window is not necessarily a different application. An application usually has one main window, and may open additional windows at the request of the user.</para>
 
-  <para>The following sections describe the types of windows and how you
+  <para>The rest of this section describe the different types of windows and how you
   can interact with them.</para>
 
   <section id="windows-types">
@@ -131,33 +133,28 @@
     <!-- 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>
+    <para>There are two main 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
-            window.  The buttons in an application window frame enable you to
-            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>
+            <para>Application windows allow all the minimize, 
+            maximize and close operations through the buttons on the titlebar. 
+            When opening an application you will usually see a 
+            window of this type appear.</para>
         </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
-            user. This manual refers to the interactive part of a dialog
-            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>
+            <para>Dialog windows appear at the request of an application window. A dialog window may alert you to a problem, ask for confirmation of an action, or request input from you.</para>
+            
+            <para>For example, if you tell an application to save a document, a dialog box will ask you where you want to save the new file. If you tell an application to quit while it is still busy, it may ask you to confirm that you want it to abandon work in progress.</para>
+            
+            <para>Some dialogs do not allow you to interact with the main application window until you have closed them: these are called <firstterm>modal</firstterm> dialogs. Others can be left open while you work with the main application window: these are called <firstterm>transient</firstterm> dialogs.</para>
+            
+            <tip><para>You can select the text in a dialog with the mouse. This allows you to copy it to the clipboard (CTRL-C to copy), and paste it into another application. You may wish to quote the text you see in a dialog box when requesting support on the internet.</para></tip>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -170,13 +167,12 @@
     <!-- 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>
-
+    <para>You can change the size and position of windows on the screen. This allows you to see more than one application and do diferent tasks at the same time. For example, you might want to read text on a web page and write with a word procesor; or simple change to another application to do a diferent task or see the progress.</para> 
+    
+    <para>You can <firstterm>minimize</firstterm> a window if you are not currently interested in seeing it. This hides it from view. You can <firstterm>maximise</firstterm> a window to fill the whole screen so you can give it your full attention.</para> 
+    
+    <para>Most of these actions are carried out by using the mouse on different parts of the the window's frame (see <xref linkend="mouse-actions"/> for a recap of using the mouse). The top edge of the window frame, called the <firstterm>titlebar</firstterm> because it also displays the title of the window, contains several buttons that change the way the window is displayed. <xref linkend="fig-titlebar-anno-window"/> shows the titlebar 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 -->
@@ -194,86 +190,75 @@
       </screenshot>
     </figure>
 
-    <para>The active control elements of the window frame are as follows: </para>
+    <para>All actions can also be carried out from the Window Menu. To open this, click on the Window Menu Button at the left-hand edge of the titlebar. Common actions can also be carried out with keyboard shortcuts: see <xref linkend="shortcuts-window"/> for a simple list of these. The following lists all the actions you can carry out on a window, with the mouse or the keyboard:</para>
+
+   <variablelist>
+      <varlistentry>
+        <term>Move the window</term>
+        <listitem>
+            <para>Drag the titlebar to move the window. You can click on any part of the titlebar except the buttons at either end to begin the drag action. The window will move on the screen as you drag the mouse. On less powerful systems, the movement of the window may be represented by moving an outline of its frame.</para>
+            
+            <para>You can also choose Move from the Window Menu, or press <keycombo>
+            <keycap>Alt</keycap><keycap>F7</keycap>
+            </keycombo>.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Resize the window</term>
+        <listitem>
+            <para>Drag one of the borders to expand or contract the window on that side. Drag a corner to change two sides at once. The <link linkend="mouse-pointers">resize pointer</link> appears when your mouse is in the correct position to begin the drag action.</para>
+
+            <para>You can also choose Resize from the Window Menu, or press <keycombo>
+            <keycap>Alt</keycap><keycap>F8</keycap>
+            </keycombo>.</para>            
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Minimize the window</term>
+        <listitem>
+            <para>Click on the Minimize button in the titlebar, the leftmost of the group of three on the right. This removes the window from view. The window can be restored to its previous position and size on the screen from the <firstterm>Window List</firstterm> on the <link linkend="gospanel-3">bottom edge panel</link>.</para>
+            
+            <para>You can also choose Minimize from the Window Menu, or press <keycombo>
+            <keycap>Alt</keycap><keycap>F9</keycap>
+            </keycombo>.</para>  
+            
+            <tip>
+            <para>A minimized window is shown in the window list 
+            with [ ] around its title.</para>
+            </tip>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Maximize the window</term>
+        <listitem>
+            <para>Click on the Maximize button in the titlebar, the middle of the group of three on the right. This expands the window so it fills the screen (the panels remain visible).</para>
+            <para>You can also choose Maximize from the Window Menu, or press <keycombo>
+            <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>
+            </tip>            
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term>Unmaximize the window</term>
+        <listitem>
+            <para>When a window is maximized, click again on the Maximize button to restore it to its previous position and size on the screen.</para>
+
+            <para>You can also choose Unmaximize from the Window Menu, press <keycombo>
+            <keycap>Alt</keycap><keycap>F5</keycap></keycombo>, or double-click any part of the titlebar except the buttons at either end.</para>
+        </listitem>
+      </varlistentry>          
+      <varlistentry>
+        <term>Close the window</term>
+        <listitem>
+            <para>Click the Close button, the rightmost of the group of three on the right. This could close the application too. The application will ask you to confirm closing a window that contains unsaved work.</para>
+        </listitem>
+      </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>
 
-    <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-20">
Index: goscustdesk.xml
===================================================================
RCS file: /cvs/gnome/gnome-user-docs/gnome2-user-guide/C/goscustdesk.xml,v
retrieving revision 1.19
diff -u -p -r1.19 goscustdesk.xml
--- goscustdesk.xml	29 Mar 2005 05:01:20 -0000	1.19
+++ goscustdesk.xml	30 Dec 2005 20:52:48 -0000
@@ -1906,28 +1906,18 @@ toolbars with text only on each button.<
       <primary>mouse</primary>
       <secondary>configuring</secondary>
     </indexterm>
-    <para>Use the <application>Mouse</application> preference tool
-to configure your mouse for right-hand use or for left-hand use. You can also
-specify the speed and sensitivity of mouse movement.</para>
-    <para>You can customize the settings for the <application>Mouse</application>
-preference tool in the following functional areas:</para>
+    <para>With the <application>Mouse</application> preference tool
+    you can:</para>
     <itemizedlist>
       <listitem>
-        <para>
-          <guilabel>Buttons</guilabel>
-        </para>
+        <para>configure your mouse for right-hand use or for left-hand use,</para>
       </listitem>
-      <listitem>
-        <para>
-          <guilabel>Cursors</guilabel>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <guilabel>Motion</guilabel>
-        </para>
+      <listitem>      
+        <para>specify the speed and sensitivity of mouse movement.</para>
       </listitem>
     </itemizedlist>
+    
+    
     <sect2 id="goscustdesk-55">
       <title>Buttons Preferences</title>
       <para>Use the <guilabel>Buttons</guilabel> tabbed section to specify whether
@@ -1935,7 +1925,9 @@ the mouse buttons are configured for lef
 delay between clicks for a double-click.</para>
       <para><xref linkend="goscustperiph-TBL-6"/> lists the mouse button preferences
 that you can modify.</para>
-      <table frame="topbot" id="goscustperiph-TBL-6">
+
+    <!-- convert to variablelist -->
+    <table frame="topbot" id="goscustperiph-TBL-6">
         <title>Mouse Button Preferences</title>
         <tgroup cols="2" colsep="1" rowsep="1">
           <colspec colname="colspec18" colwidth="19.21*"/>
@@ -1975,6 +1967,8 @@ right mouse button are swapped.</para>
 the amount of time that can pass between clicks when you double-click. If
 the interval between the first and second clicks exceeds the time that is
 specified here, the action is not interpreted as a double-click. </para>
+
+                <para>Use the light bulb icon to check double-click sensitivity: the light will light up briefly for a click, but stay lit for a double-click.</para>
               </entry>
             </row>
           </tbody>
@@ -1983,8 +1977,10 @@ specified here, the action is not interp
     </sect2>
     <sect2 id="goscustdesk-54">
       <title>Pointer Preferences</title>
-      <para>Use the <guilabel>Cursors</guilabel> tabbed section to set your mouse
-pointer preferences.</para>
+      <!-- Pointer Cursor Yes, this is stupid. See Bug 318056 -->
+      <para>Use the <guilabel>Cursors</guilabel> tabbed section to set
+      your mouse pointer preferences.
+      </para>
       <para><xref linkend="goscustdesk-TBL-45"/> lists the mouse pointer preferences
 that you can modify:</para>
       <table frame="topbot" id="goscustdesk-TBL-45">
@@ -2004,35 +2000,14 @@ that you can modify:</para>
           </thead>
           <tbody>
             <row>
-              <entry colname="colspec0">
-                <para>
-                  <guilabel>Small</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1">
-                <para>Select this option to display a small mouse
-pointer.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0">
-                <para>
-                  <guilabel>Medium</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec1">
-                <para>Select this option to display a medium mouse
-pointer.</para>
-              </entry>
-            </row>
-            <row>
               <entry valign="top">
                 <para>
-                  <guilabel>Large</guilabel>
+                  <guilabel>Cursor Theme</guilabel>
                 </para>
               </entry>
               <entry valign="top">
-                <para>Select this option to display a large mouse pointer.</para>
+                <para>Select the mouse pointer theme that you require
+from the list box. </para>
               </entry>
             </row>
             <row>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]