Merge pull request #2487 from TracksApp/2486_matrix

#2486: Change Gitter to Matrix

README.md

@@ -1,29 +1,34 @@
-# Tracks: a GTD(TM) web application, built with Ruby on Rails
+# Tracks: a GTD™ compatible web application built with Ruby on Rails
 
 [![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions)
 [![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks)
 
+## About
+
 * Project homepage: http://www.getontracks.org/
 * Manual: http://www.getontracks.org/manual/
 * Source at GitHub: https://github.com/TracksApp/tracks
+* Hosted services: https://github.com/TracksApp/tracks/wiki/Hosted-Tracks
 * Bug reports and feature requests: https://github.com/TracksApp/tracks/issues
-* Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki
 * Mailing list: http://groups.google.com/group/TracksApp
-* IRC channel: #tracks on Freenode
+* IRC channel: #tracks on Freenode, available also on [Matrix](https://matrix.to/#/#tracks:matrix.org)
-* Gitter: https://gitter.im/TracksApp/tracks
-* Original developer: bsag (http://www.rousette.org.uk/)
-* Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) (sponsored by Ardcoras oy, https://www.ardcoras.fi/)
-* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
 * License: See COPYING
 
 Full instructions for both new installations and upgrades from older installations
 of Tracks can be found in the [wiki](https://github.com/TracksApp/tracks/wiki/Installation).
 
-If you are thinking about contributing towards the development of Tracks,
-please read /CONTRIBUTING.md for general information. Also you can find
-some information on development, testing and contributing on the wiki.
-
 As always, make sure that you take sensible precautions and back up all your data frequently,
 taking particular care when you are upgrading.
 
 Enjoy being productive!
+
+## Contributors and consulting
+
+* Original developer: bsag (http://www.rousette.org.uk/)
+* Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP)
+  (sponsored by [Ardcoras oy](https://www.ardcoras.fi/), also available for paid consulting)
+* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
+
+If you are thinking about contributing towards the development of Tracks,
+please read /CONTRIBUTING.md for general information. Also you can find
+some information on development, testing and contributing on the wiki.

app/views/integrations/help.html.erb

@@ -8,6 +8,5 @@
 
 <ul>
   <li><a href="http://groups.google.com/group/TracksApp">Mailing list</a></li>
-  <li><a href="https://gitter.im/TracksApp/tracks">Gitter chat</a></li>
+  <li><a href="https://webchat.freenode.net/#Tracks">IRC channel #Tracks@FreeNode</a> (also available in <a href="https://matrix.to/#/#tracks:matrix.org">Matrix</a>)</li>
-  <li><a href="https://webchat.freenode.net/#Tracks">IRC channel #Tracks@FreeNode</li>
 </ul>