[gnome-terminal/wip/mallard-merge: 183/283] Help: Modified help on adv-keyboard-shortcuts.page.

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 1f95af4afe659623e2367656cea731b65704c842
Author: Sindhu S <sindhus live in>
Date:   Sun Feb 24 17:15:23 2013 +0530

    Help: Modified help on adv-keyboard-shortcuts.page.
    
    Incorporated all TODOs asked in review notes.

 help/C/adv-keyboard-shortcuts.page |   46 ++++++++++++++----------------------
 1 files changed, 18 insertions(+), 28 deletions(-)
---
diff --git a/help/C/adv-keyboard-shortcuts.page b/help/C/adv-keyboard-shortcuts.page
index d8d7b8c..406989c 100644
--- a/help/C/adv-keyboard-shortcuts.page
+++ b/help/C/adv-keyboard-shortcuts.page
@@ -53,10 +53,9 @@
       it.</p>
     </item>
     <item>
-      <!-- Do not break line half way though a tag unless you have to. -->
       <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>
+      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>
     </item>
     <item>
       <p>Once you have entered your new shortcut, it will automatically be saved
@@ -145,8 +144,7 @@
       <tbody>
         <tr>
           <td><p>Full Screen</p></td>
-         <!-- Single keys should not be in a <keyseq> -->
-          <td><p><keyseq><key>F11</key></keyseq></p></td>
+          <td><p><key>F11</key></p></td>
         </tr>
         <tr>
           <td><p>Zoom In</p></td>
@@ -259,10 +257,8 @@
 
   <section id="shell-shortcuts">
     <title>Shell shortcuts</title>
-    <!-- Bash is <app> or nothing, check the markup in gnome-user-docs. -->
-    <p><gui>Bash</gui> shell specific keyboard shortcuts:</p>
+    <p><app>Bash</app> shell specific keyboard shortcuts are:</p>
 
-    <!-- Use capital letters for keys. -->
     <table rules="rows" frame="top bottom" ui:expanded="no">
       <thead>
         <tr>
@@ -281,27 +277,27 @@
         </tr>
         <tr>
           <td><p>Move to the start of the line</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>a</key></keyseq></p></td> 
+          <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Move to the end of the line</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>e</key></keyseq></p></td> 
+          <td><p><keyseq><key>Ctrl</key><key>E</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Move back one character</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>b</key></keyseq></p></td> 
+          <td><p><keyseq><key>Ctrl</key><key>B</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Move back one word</p></td>
-          <td><p><keyseq><key>Alt</key><key>b</key></keyseq></p></td> 
+          <td><p><keyseq><key>Alt</key><key>B</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Move forward one character</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>f</key></keyseq></p></td> 
+          <td><p><keyseq><key>Ctrl</key><key>F</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Move forward one word</p></td>
-          <td><p><keyseq><key>Alt</key><key>f</key></keyseq></p></td> 
+          <td><p><keyseq><key>Alt</key><key>F</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Delete from the cursor to the beginning of the line.</p></td>
@@ -309,11 +305,11 @@
         </tr>
         <tr>
           <td><p>Delete from the cursor to the end of the line.</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>k</key></keyseq></p></td> 
+          <td><p><keyseq><key>Ctrl</key><key>K</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Delete from the cursor to the start of the word.</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>w</key></keyseq></p></td> 
+          <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Delete previous word</p></td>
@@ -322,29 +318,23 @@
         </tr>
         <tr>
           <td><p>Pastes text from the clipboard.</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>y</key></keyseq></p></td> 
+          <td><p><keyseq><key>Ctrl</key><key>Y</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Clear the screen leaving the current line at the top of the
           screen.</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>l</key></keyseq></p></td> 
+          <td><p><keyseq><key>Ctrl</key><key>L</key></keyseq></p></td> 
         </tr>
         <tr>
-          <td><p>Incremental reverse search of history</p></td>
-          <td><p><keyseq><key></key><key></key></keyseq></p></td> 
+          <td><p>Reverse incremental search of history</p></td>
+          <td><p><keyseq><key>Ctrl</key><key>R</key></keyseq></p></td> 
         </tr>
         <tr>
-          <td><p>Non-incremental reverse search of history</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>r</key></keyseq></p></td> 
+          <td><p>Reverse Non-incremental search of history</p></td>
+          <td><p><keyseq><key>Alt</key><key>P</key></keyseq></p></td> 
         </tr>
       </tbody>
     </table>
   </section>
 
-  <comment>
-    <cite date="2013-02-24" href="mailto:mdhillca gmail com">Michael Hill</cite>
-    <p>The keybinding for reverse incremental search should be Ctrl-R.
-    Non-incremental should be Alt-P.</p>
-  </comment>
-
 </page>