[geary/mjog/discourse-migration: 3/3] help: Rework support and bug reporting text

[Michael Gratton <mjog src gnome org>]

commit 00f355648d5faf30e568eedece495986ac5f79f1
Author: Michael Gratton <mike vee net>
Date:   Wed Jun 24 23:06:16 2020 +1000

    help: Rework support and bug reporting text
    
    Prefer referring to getting support rather than bug reporting. Add a
    section describing how to get support vs reporting bugs. Streamline the
    contributing page.

 help/C/bugs.page         | 63 ++++++++++++++++++++++++++++++------------------
 help/C/contributing.page |  8 +++---
 help/C/index.page        |  2 +-
 3 files changed, 45 insertions(+), 28 deletions(-)
---
diff --git a/help/C/bugs.page b/help/C/bugs.page
index 8ded6f1a..85b010c2 100644
--- a/help/C/bugs.page
+++ b/help/C/bugs.page
@@ -7,27 +7,44 @@
     <link type="next" xref="limits"/>
   </info>
 
-  <title>Found a bug?</title>
-
-  <p>If you suspect you've found a bug in Geary, please <link
-  href="https://wiki.gnome.org/Apps/Geary/Contact";>get in touch</link>
-  about it so it can be fixed.</p>
-
-  <p>To help diagnose the problem as fast as possible, please include
-  the following information:</p>
-
-  <list>
-    <item><p>Geary version and installation method (Package? Flathub?
-    Source code?)</p></item>
-    <item><p>Your desktop (GNOME? KDE? Something else?)</p></item>
-    <item><p>Your operating system and version (Ubuntu 16.04? Fedora
-    28? Rolled your own?)</p></item>
-    <item><p>Email provider (Gmail, Yahoo!, Outlook.com, or someone
-    else?)</p></item>
-    <item><p>Steps to reproduce the bug</p></item>
-    <item><p>What happened?</p></item>
-    <item><p>What did you expect to happen?</p></item>
-  </list>
-
-  <p>Thanks for your help!</p>
+  <title>Need help with Geary?</title>
+
+  <section id="folder-list">
+    <title>Getting support</title>
+
+    <p>If you are having trouble using Geary, please <link
+    href="https://wiki.gnome.org/Apps/Geary/Contact";>get in
+    touch</link> with the Geary community about the problem.</p>
+  </section>
+
+  <section id="folder-list">
+    <title>Reporting bugs</title>
+
+    <p>If you suspect you have found a bug in Geary, please follow the
+    <link href="https://wiki.gnome.org/Apps/Geary/ReportingABug";>bug
+    reporting guidelines</link> so the problem can be diagnosed and
+    fixed.</p>
+
+    <p>To help diagnose the problem as fast as possible, please
+    include the following information:</p>
+
+    <list>
+      <item><p>Geary version and installation method (Package?
+      Flathub?  Source code?)</p></item>
+      <item><p>Your desktop (GNOME? KDE? Something else?)</p></item>
+      <item><p>Your operating system and version (Ubuntu 16.04? Fedora
+      28? Rolled your own?)</p></item>
+      <item><p>Email provider (Gmail, Yahoo!, Outlook.com, or someone
+      else?)</p></item>
+      <item><p>Steps to reproduce the bug</p></item>
+      <item><p>What happened?</p></item>
+      <item><p>What did you expect to happen?</p></item>
+    </list>
+
+    <p>Log files can be accessed via the Geary Inspector, press
+    <keyseq><key>Alt</key><key>I</key></keyseq> to open it, select and
+    save any relevant log files, and attach them to the bug
+    report.</p>
+  </section>
+
 </page>
diff --git a/help/C/contributing.page b/help/C/contributing.page
index 6488cfd4..a91e8c47 100644
--- a/help/C/contributing.page
+++ b/help/C/contributing.page
@@ -16,11 +16,11 @@
     <item><p><link
     href="https://wiki.gnome.org/Apps/Geary/ReportingABug";>Bug
     reporting</link>—report new bugs or request new features</p></item>
-    <item><p><link href="https://wiki.gnome.org/Apps/Geary/Design";>User Experience Design</link>—research 
and develop Geary’s user experience</p></item>
-    <item><p><link href="https://wiki.gnome.org/Apps/Geary/Development";>Development</link>—fix bugs and add 
new features</p></item>
     <item><p><link href="https://wiki.gnome.org/Apps/Geary/Translating";>Translating</link>—translate Geary’s 
user interface and user manual into new languages</p></item>
-    <item><p><link href="https://wiki.gnome.org/Apps/Geary/Contact";>Join the discussion</link>—on the 
mailing list or IRC channel</p></item>
+    <item><p><link href="https://wiki.gnome.org/Apps/Geary/Development";>Development</link>—fix bugs and add 
new features</p></item>
   </list>
 
-  <p>Thanks for your help making Geary better!</p>
+  <p>See <link href="https://wiki.gnome.org/Apps/Geary/Contribute";>the
+  wiki</link> for more information and options for contributing
+  financially to Geary's development.</p>
 </page>
diff --git a/help/C/index.page b/help/C/index.page
index 290c217a..14c15323 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -16,7 +16,7 @@
   </section>
 
   <section id="contribute" style="2column">
-    <title>Contributing and bug reporting</title>
+    <title>Contributing and getting support</title>
   </section>
 
 </page>