Merge branch 'mjog/discourse-migration' into 'mainline'

Discourse migration

See merge request GNOME/geary!522
This commit is contained in:
Michael Gratton 2020-06-25 02:08:58 +00:00
commit bd0f154fa3
6 changed files with 52 additions and 75 deletions

View file

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

41
README
View file

@ -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 <mike@vee.net>

View file

@ -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 <mike@vee.net>
Copyright 2017-2020 Michael Gratton <mike@vee.net>

View file

@ -7,27 +7,44 @@
<link type="next" xref="limits"/>
</info>
<title>Found a bug?</title>
<title>Need help with Geary?</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>
<section id="folder-list">
<title>Getting support</title>
<p>To help diagnose the problem as fast as possible, please include
the following information:</p>
<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>
<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>
<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>
<p>Thanks for your help!</p>
</page>

View file

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

View file

@ -16,7 +16,7 @@
</section>
<section id="contribute" style="2column">
<title>Contributing and bug reporting</title>
<title>Contributing and getting support</title>
</section>
</page>