From f46c5374be4978c6ce2b96825f84b24c25ae5e35 Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Mon, 17 Mar 2014 12:56:18 -0700
Subject: [PATCH] Clarify help documentation: Closes bgo#726576

---
 help/C/accounts.page    | 7 +++++--
 help/C/archive.page     | 3 +++
 help/C/preferences.page | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/help/C/accounts.page b/help/C/accounts.page
index 3f1c942a..b91230a1 100644
--- a/help/C/accounts.page
+++ b/help/C/accounts.page
@@ -16,8 +16,11 @@
 	select if your account is Gmail, Yahoo, Outlook.com, or other.  For other account types, you will
 	need to enter your IMAP and SMTP login settings manually.</p>
 	
-	<p>Additional accounts can be added from the Accounts dialog.  Click Accounts in the application
-	menu or gear menu (or press <keyseq><key>Ctrl</key><key>M</key></keyseq>) to open the Accounts
+	<p>Additional accounts can be added from the Accounts dialog.  The <gui>Accounts</gui> option is
+	available in either Geary's application menu or the gear menu in the upper-right of the
+	toolbar.  (The location depends on the install desktop shell.  For GNOME Shell and Unity, the
+	application menu is available near the top-left corner of the screen.)  Alternately,
+	<keyseq><key>Ctrl</key><key>M</key></keyseq> will open the Accounts
 	dialog.  To add an account, click the + button.</p>
 	</section>
 	
diff --git a/help/C/archive.page b/help/C/archive.page
index ae001d62..4787e001 100644
--- a/help/C/archive.page
+++ b/help/C/archive.page
@@ -18,5 +18,8 @@
 	button on the toolbar.  To permanently delete the conversations, hold down <key>Shift</key> and press
 	the <gui>Delete</gui> button that appears in place of the <gui>Trash</gui> button.</p>
 
+	<p>Delete is not available from every folder, such as Search.  Delete is also unavailable for Gmail.
+	For Gmail, <gui>Trash</gui> will move messages to the Trash folder on the server, where the user can
+	then manually delete them.  The server will automatically remove trashed messages after 30 days.</p>
 </page>
 
diff --git a/help/C/preferences.page b/help/C/preferences.page
index 443530f1..df488925 100644
--- a/help/C/preferences.page
+++ b/help/C/preferences.page
@@ -8,8 +8,10 @@
         <link type="next" xref="search" />
     </info>
    <title>Preferences</title>
-	<p>To set preferences in Geary, open the application menu or click the gear menu at the upper right
-	of the toolbar and choose <gui>Preferences</gui>.</p>
+	<p>The <gui>Preferences</gui> option is available in either Geary's application menu or the
+	gear menu in the upper-right of the toolbar.  (The location depends on the install desktop
+	shell.  For GNOME Shell and Unity, the application menu is available near the top-left corner of
+	the screen.)</p>
 	
     <section>
 	<title>Reading</title>