[geary/wip/fix-main-window-shortcuts: 3/4] Update help with information about single key shortcuts

[Michael Gratton <mjog src gnome org>]

commit 82e77023bca387ac393de3ab4819edae6b71fc37
Author: Michael Gratton <mike vee net>
Date:   Thu Nov 21 02:56:44 2019 +1100

    Update help with information about single key shortcuts

 help/C/preferences.page | 16 +++++++++-----
 help/C/shortcuts.page   | 55 +++++++++++++++++++++++++++++++------------------
 2 files changed, 46 insertions(+), 25 deletions(-)
---
diff --git a/help/C/preferences.page b/help/C/preferences.page
index f65673fc..f79d9898 100644
--- a/help/C/preferences.page
+++ b/help/C/preferences.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="guide"
       id="preferences">
-  
+
   <info>
     <link type="guide" xref="index#overview"/>
     <link type="next" xref="search" />
@@ -9,10 +9,10 @@
 
   <title>Preferences</title>
 
-  <p>Geary allows you to customise how it works via its
-  <gui>Preferences</gui> window. To open the window, select
-  <gui>Preferences</gui> from the application menu on the main
-  window's toolbar. You can change the following options:</p>
+  <p>Geary allows you to customise how it works via its <gui
+  style="group">Preferences</gui> window. To open the window, select
+  <gui style="menuitem">Preferences</gui> from the application menu on
+  the main window's toolbar. You can change the following options:</p>
 
   <terms>
     <item>
@@ -34,6 +34,12 @@
       folder list and conversation list will be stacked vertically in
       a single pane.</p>
     </item>
+    <item>
+      <title><gui>Use single key email shortcuts</gui></title>
+      <p>Enable keyboard shortcuts for email actions that do not
+      require pressing <key>Ctrl</key>. These match the shortcuts used
+      by GMail. See <link xref="shortcuts"/> for details.</p>
+    </item>
     <item>
       <title><gui>Watch for new mail when closed</gui></title>
       <p>Geary will watch your accounts for new mail even when the
diff --git a/help/C/shortcuts.page b/help/C/shortcuts.page
index e1b8cec4..a022bf9f 100644
--- a/help/C/shortcuts.page
+++ b/help/C/shortcuts.page
@@ -9,25 +9,40 @@
 
   <title>Keyboard shortcuts</title>
 
-  <p>Geary has keyboard shortcuts for most common operations. Use the
-  built-in keyboard shortcuts help in Geary to discover the full list.
-  This can be accessed via the application menu:
-  <guiseq><gui>Geary</gui><gui>Keyboard Shortcuts</gui></guiseq> or
-  using the keyboard shortcuts listed below.</p>
-
-  <p>The following keyboard shortcuts can be used to access on-line
-  help from Geary:</p>
-  <table frame="all" rules="rows">
-    <tr>
-      <td><p>Display this User Manual</p></td>
-      <td><p><keyseq><key>F1</key></keyseq></p></td>
-    </tr>
-    <tr>
-      <td><p>Display all keyboard shortcuts</p></td>
-      <td><p>
-        <keyseq><key>Ctrl</key><key>?</key></keyseq>
-      </p></td>
-    </tr>
-  </table>
+  <section id="features">
+    <p>Geary has keyboard shortcuts for most common operations. Use
+    the built-in help to discover the full list. To open the shortcuts
+    help, select <gui style="menuitem">Keyboard Shortcuts</gui> from
+    the application menu on the main window's toolbar, or using the
+    keyboard shortcuts listed below.</p>
+
+    <p>The following keyboard shortcuts can be used to access on-line
+    help from Geary:</p>
+    <table frame="all" rules="rows">
+      <tr>
+        <td><p>Display this online help manual</p></td>
+        <td><p><keyseq><key>F1</key></keyseq></p></td>
+      </tr>
+      <tr>
+        <td><p>Display all keyboard shortcuts</p></td>
+        <td><p>
+          <keyseq><key>Ctrl</key><key>?</key></keyseq>
+        </p></td>
+      </tr>
+    </table>
+  </section>
+
+  <section id="single-key-shortcuts">
+    <title>Single key shortcuts</title>
+
+    <p>You can enable keyboard shortcuts for email actions that do not
+    require pressing <key>Ctrl</key>. These match the shortcuts used
+    by GMail. See <link xref="preferences"/> for details.</p>
+
+    <p>The full list of single key shortcuts enabled by this
+    preference can be found via the keyboard shortcuts help,
+    above.</p>
+  </section>
+
 
 </page>