rewritten Keyboard Shortcuts Preferences. Fixes #329073

2 files changed, 35 insertions, 62 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 3dfdada..8d09093 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,4 +1,9 @@
-2006-03-17 Joachim Noreiko <jnoreiko@yahoo.com>
+2006-03-26 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* goscustdesk.xml:
+	rewritten Keyboard Shortcuts Preferences. Fixes #329073
+	
+2006-03-25 Joachim Noreiko <jnoreiko@yahoo.com>
 
 	* goscustdesk.xml:
 	rewritten Keyboard Layouts Preferences & Typing Break sections
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index d73385e..6aab140 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -1349,68 +1349,36 @@ keys</primary>
       <primary>keyboard shortcuts</primary>
       <secondary>configuring</secondary>
     </indexterm>
+    <para>Use the <application>Keyboard Shortcuts</application> preference tool to customize the default keyboard shortcuts to your requirements.</para>    
+    
     <para>A <firstterm>keyboard shortcut</firstterm> is a key or combination of
-keys that provides an alternative to standard ways of performing an action. </para>
-    <para>Use the <application>Keyboard Shortcuts</application> preference tool to display the default keyboard
-shortcuts. You can customize the default keyboard shortcuts to your requirements. </para>
-    <para><xref linkend="goscustdesk-TBL-5"/>
-lists the keyboard shortcut settings that you can customize.</para>
-    <table frame="topbot" id="goscustdesk-TBL-5">
-      <title>Keyboard Shortcuts Preferences</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="36.11*"/>
-        <colspec colname="colspec1" colwidth="63.89*"/>
-        <thead>
-          <row rowsep="1">
-            <entry>
-              <para>Dialog Element</para>
-            </entry>
-            <entry>
-              <para>Description</para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <guilabel>Text editing shortcuts</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Select
-one of the following settings:</para>
-              <itemizedlist>
-                <listitem>
-                  <para><guilabel>GNOME Default</guilabel>: Use this setting for standard
-shortcut keys.</para>
-                </listitem>
-                <listitem>
-                  <para><guilabel>Emacs</guilabel>: Use this setting for <application>Emacs</application> shortcut keys.</para>
-                </listitem>
-              </itemizedlist>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <guilabel>Desktop shortcuts</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>This
-table lists actions and the shortcut keys that are associated with each action. </para>
-              <para>To change the shortcut keys for an action, click on the action
-to select the action, then click on the shortcut for the action. Press the
-keys that you want to associate with the action.</para>
-              <para>To disable the
-shortcut keys for an action, click on the action to select the action, then
-click on the shortcut for the action. Press the <keycap>Backspace</keycap> key.</para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
+keys that provides an alternative to standard ways of performing an action. For more on keyboard shortcuts, and a list of the default shortcuts in GNOME, see <xref linkend="keyboard-skills"/>.</para>
+
+    <para>To edit a keyboard shortcut, perform the following steps:</para>
+    <orderedlist>
+	    <listitem><para>
+	    Click the action in the list. If you are using the the keyboard, use the arrow keys to select the shortcut and press <keycap>Return</keycap>.</para></listitem>
+	    <listitem>
+	      <para>Press the new key or key combination you want to assign to the action.</para>
+	      <para>To clear a shortcut, press <keycap>Escape</keycap>. The action is now marked as <guilabel>Disabled</guilabel>.</para>
+	    </listitem>
+    </orderedlist>
+    
+    <para>To cancel assigning a shortcut, click elsewhere in the window or press <keycap>Escape</keycap>.</para>
+    
+    <para>The shortcuts you can customize are grouped as follows:</para>
+    
+    <variablelist>
+    	<varlistentry><term>Desktop</term>
+    	  <listitem><para>These are general shortcuts for the whole desktop, such as logging out, <link linkend="lock-screen">locking the screen</link>, opening the <link linkend="menubar">panel menubar</link>, or launching a web browser.</para></listitem>
+    	</varlistentry>
+    	<varlistentry><term>Sound</term>
+    	  <listitem><para>Shortcuts for controlling your music player and the system volume.</para></listitem>
+    	</varlistentry>
+    	<varlistentry><term>Window Management</term>
+    	  <listitem><para>Shortcuts for working with windows and workspaces, such as such as maximizing or moving the current window, and switching to another workspace. For more information on these kinds of actions, see <xref linkend="windows-manipulating"/> and <xref linkend="overview-workspaces"/>.</para></listitem>
+    	</varlistentry>    	
+    </variablelist>
   </sect1>  
   <sect1 id="prefs-menustoolbars">
     <title>Menus &amp; Toolbars Preferences</title>