From bee0d2d39d9d079bf79675583ef385a58e76528d Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Wed, 24 Jun 2020 23:00:47 +1000 Subject: [PATCH 1/3] README: Removed to reduce duplication Gitlab uses `README.md` version anyway, so there's no point keeping both around. --- README | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index c9b3c729..00000000 --- a/README +++ /dev/null @@ -1,41 +0,0 @@ - -Geary: Send and receive email -============================= - -Geary is an email application built around conversations, for the -GNOME 3 desktop. It allows you to read, find and send email with a -straightforward, modern interface. - -Visit https://wiki.gnome.org/Apps/Geary for more information. - -Installation & Licensing ------------------------- - -Please consult the INSTALL and COPYING files for more information. - -Getting in Touch ----------------- - - * Geary wiki: https://wiki.gnome.org/Apps/Geary - * Mailing list: http://mail.gnome.org/mailman/listinfo/geary-list - * IRC Channel: #geary on irc.gimp.org - -**Code Of Conduct** - -We follow the Contributor Covenant (See code-of-conduct.md) as our -Code of Conduct. All communications in project spaces are expected to -follow it. - -Contributing to Geary ---------------------- - -Want to help improve Geary? Here are some ways to contribute: - - * Bug reporting: https://wiki.gnome.org/Apps/Geary/ReportingABug - * Development: https://wiki.gnome.org/Apps/Geary/Development - * Translating: https://wiki.gnome.org/Apps/Geary/Translating - * Join the mailing list or IRC channel and join in the discussion - ---- -Copyright 2016 Software Freedom Conservancy Inc. -Copyright 2017 Michael Gratton From cae09a013834754eb808178ef2ea3d355b3adebb Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Wed, 24 Jun 2020 23:02:46 +1000 Subject: [PATCH 2/3] README.md, CONTRIBUTING.md: Mention discourse & update for consistency --- CONTRIBUTING.md | 8 +++++--- README.md | 13 ++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9afa680d..470a33b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,9 @@ Contribute to Geary Want to help improve Geary? There are a number of ways you can contribute: * [Bug Reporting](https://wiki.gnome.org/Apps/Geary/ReportingABug)—report new bugs or request new features - * [User Experience Design](https://wiki.gnome.org/Apps/Geary/Design)—research and develop Geary’s user experience - * [Development](https://wiki.gnome.org/Apps/Geary/Development)—fix bugs and add new features * [Translating](https://wiki.gnome.org/Apps/Geary/Translating)—translate Geary’s user interface and user manual into new languages - * [Join the discussion](https://wiki.gnome.org/Apps/Geary/Contact) on the mailing list or IRC channel + * [Development](https://wiki.gnome.org/Apps/Geary/Development)—fix bugs and add new features + +See [the wiki](https://wiki.gnome.org/Apps/Geary/Contribute) for more +information and options for contributing financially to Geary's +development. diff --git a/README.md b/README.md index 8c4040f2..cbcb5ae2 100644 --- a/README.md +++ b/README.md @@ -26,16 +26,15 @@ for more information. Getting in Touch ---------------- - * Geary wiki: https://wiki.gnome.org/Apps/Geary - * Mailing list: http://mail.gnome.org/mailman/listinfo/geary-list - * IRC Channel: [#geary on irc.gimp.org](irc://irc.gimp.org/%23geary) + * Geary wiki: https://wiki.gnome.org/Apps/Geary + * Support and discussion: See the `geary` tag on [GNOME Discourse](https://discourse.gnome.org/tags/c/applications/7/geary) * Matrix channel: [#_gimpnet_#geary:gnome.org](https://riot.im/app/#/room/#_gimpnet_#geary:gnome.org) **Code Of Conduct** We follow the [Contributor Covenant](./code-of-conduct.md) as our Code of Conduct. All communications in project spaces are expected to -follow it. +adhere to it. Contributing to Geary --------------------- @@ -43,10 +42,10 @@ Contributing to Geary Want to help improve Geary? Here are some ways to contribute: * Bug reporting: https://wiki.gnome.org/Apps/Geary/ReportingABug - * Development: https://wiki.gnome.org/Apps/Geary/Development * Translating: https://wiki.gnome.org/Apps/Geary/Translating - * Join the mailing list or IRC channel and join in the discussion + * Development: https://wiki.gnome.org/Apps/Geary/Development + * Donate: https://wiki.gnome.org/Apps/Geary/Donate --- Copyright 2016 Software Freedom Conservancy Inc. -Copyright 2017 Michael Gratton +Copyright 2017-2020 Michael Gratton From 00f355648d5faf30e568eedece495986ac5f79f1 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Wed, 24 Jun 2020 23:06:16 +1000 Subject: [PATCH 3/3] 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 | 55 ++++++++++++++++++++++++++-------------- help/C/contributing.page | 8 +++--- help/C/index.page | 2 +- 3 files changed, 41 insertions(+), 24 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 @@ - Found a bug? + Need help with Geary? -

If you suspect you've found a bug in Geary, please get in touch - about it so it can be fixed.

+
+ Getting support -

To help diagnose the problem as fast as possible, please include - the following information:

+

If you are having trouble using Geary, please get in + touch with the Geary community about the problem.

+
- -

Geary version and installation method (Package? Flathub? - Source code?)

 -

Your desktop (GNOME? KDE? Something else?)

 -

Your operating system and version (Ubuntu 16.04? Fedora - 28? Rolled your own?)

 -

Email provider (Gmail, Yahoo!, Outlook.com, or someone - else?)

 -

Steps to reproduce the bug

 -

What happened?

 -

What did you expect to happen?

 - +
+ Reporting bugs + +

If you suspect you have found a bug in Geary, please follow the + bug + reporting guidelines so the problem can be diagnosed and + fixed.

+ +

To help diagnose the problem as fast as possible, please + include the following information:

+ + +

Geary version and installation method (Package? + Flathub? Source code?)

 +

Your desktop (GNOME? KDE? Something else?)

 +

Your operating system and version (Ubuntu 16.04? Fedora + 28? Rolled your own?)

 +

Email provider (Gmail, Yahoo!, Outlook.com, or someone + else?)

 +

Steps to reproduce the bug

 +

What happened?

 +

What did you expect to happen?

 + + +

Log files can be accessed via the Geary Inspector, press + AltI to open it, select and + save any relevant log files, and attach them to the bug + report.

+
-

Thanks for your help!

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 @@

Bug reporting—report new bugs or request new features

 -

User Experience Design—research and develop Geary’s user experience

 -

Development—fix bugs and add new features

Translating—translate Geary’s user interface and user manual into new languages

 -

Join the discussion—on the mailing list or IRC channel

 +

Development—fix bugs and add new features

 -

Thanks for your help making Geary better!

+

See the + wiki for more information and options for contributing + financially to Geary's development.

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 @@
- Contributing and bug reporting + Contributing and getting support