[gnome-terminal/wip/mallard-merge: 4/47] help: review adv-keyboard-shortcuts.page

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit de947155b9e5f18cfc9410bccc97a5d0a4512a70
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Sat Mar 2 21:37:40 2013 +0000

    help: review adv-keyboard-shortcuts.page
    
    Final review before merging to master.

 help/C/adv-keyboard-shortcuts.page |   40 ++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 13 deletions(-)
---
diff --git a/help/C/adv-keyboard-shortcuts.page b/help/C/adv-keyboard-shortcuts.page
index e883aa8..f99a4fe 100644
--- a/help/C/adv-keyboard-shortcuts.page
+++ b/help/C/adv-keyboard-shortcuts.page
@@ -24,50 +24,56 @@
       <years>2013</years>
     </credit>
 
-    <desc>View and edit keybindings.</desc>
+    <desc>View and edit keyboard shortcuts.</desc>
   </info>
 
   <title>Keyboard shortcuts</title>
 
   <note style="important">
-    <p>This page assumes you are using the default shell, <app>Bash</app>.</p>
+    <p>This page assumes you are using the <app>Bash</app> shell.</p>
   </note>
 
   <p>Keyboard shortcuts are combinations of keys that allow you to perform
   actions, such as opening the settings dialog or accessing a feature inside
   <app>Terminal</app>, quickly. These shortcuts can be modified to suit your
-  requirements.</p>
+  preferences.</p>
 
   <p>To change a keyboard shortcut:</p>
   <steps>
     <item>
       <p>Select <guiseq><gui style="menu">Edit</gui>
       <gui style="menuitem">Preferences</gui>
-      <gui style="tab">Keybindings</gui></guiseq>.</p>
+      <gui style="tab">Shortcuts</gui></guiseq>.</p>
     </item>
     <item>
       <p>Select the shortcut that you wish to edit by clicking on it.</p>
     </item>
     <item>
-      <p>Once the shortcut is selected, click on the shortcut key to edit
-      it.</p>
+      <p>Once the shortcut is selected, click on the shortcut key combination
+      to edit it.</p>
     </item>
     <item>
       <p>Type in your desired shortcut key combination as you would enter it to
       use it. The keys that you can use include <key>Alt</key>,
       <key>Alt Gr</key>, <key>Ctrl</key>, <key>Shift</key>, number and letter
       keys.</p>
+      <note>
+        <p>Mnemonic key combinations, such as <keyseq><key>Alt</key>
+        <key>F</key></keyseq> will not work. If you accidentally set one of
+        these key combinations as a shortcut, you may need to reset it before
+        you can change it to something else.</p>
+      </note>
     </item>
     <item>
       <p>Once you have entered your new shortcut, it will automatically be
-      saved and you should see it in the list, next to the action to which it
-      corresponds.</p>
+      saved and you should see it in the list next to the corresponding
+      action.</p>
     </item>
   </steps>
 
   <note style="tip">
-    <p>To restore shortcuts to their default: disabled state, select the
-    shortcut and press the <key>Backspace</key> or <key>Delete</key> key.</p>
+    <p>To disable a shortcut, edit it and press the <key>Backspace</key>
+    instead of the new shortcut.</p>
   </note>
 
   <section id="file-shortcuts">
@@ -132,7 +138,8 @@
 
   <section id="view-shortcuts">
     <title><gui style="menu">View</gui> shortcuts</title>
-    <p>The default shortcuts for options under the <gui style="menu">View</gui>
+
+    <p>The default shortcuts for options in the <gui style="menu">View</gui>
     menu are:</p>
 
     <table rules="rows" frame="top bottom" ui:expanded="no">
@@ -165,6 +172,7 @@
 
   <section id="tab-shortcuts">
     <title>Tab shortcuts</title>
+
     <p>The default shortcuts for working with tabs are:</p>
 
     <table rules="rows" frame="top bottom" ui:expanded="no">
@@ -237,8 +245,9 @@
 
   <section id="help-shortcuts">
     <title>Help shortcuts</title>
-    <p>The default shortcuts for accessing items in the <gui
-    style="menu">Help</gui> menu are:</p>
+
+    <p>The default shortcuts for accessing items in the
+    <gui style="menu">Help</gui> menu are:</p>
 
     <table rules="rows" frame="top bottom" ui:expanded="no">
       <thead>
@@ -258,6 +267,11 @@
 
   <section id="shell-shortcuts">
     <title>Shell shortcuts</title>
+
+    <comment>
+      <cite href="mailto:kittykat3756 gmail com">Kat</cite>
+      <p>TODO: move this section to a new page.</p>
+    </comment>
     <p><app>Bash</app> shell specific keyboard shortcuts are:</p>
 
     <table rules="rows" frame="top bottom" ui:expanded="no">