Merge pull request #89 from borgbackup/misc-updates

Misc updates

Author: ThomasWaldmann

index.rst

@@ -13,7 +13,7 @@ BorgBackup – Deduplicating archiver with compression and authenticated encrypt
     <ul>
         <li>Space efficient storage of backups.
         <li>Secure, authenticated encryption.
-        <li>Compression: LZ4, zlib, LZMA, zstd (since borg 1.1.4).
+        <li>Compression: lz4, zstd, zlib, lzma or none.
         <li>Mountable backups with FUSE.
         <li>Easy installation on multiple platforms: Linux, macOS, BSD, ...
         <li>Free software (BSD license).

releases/index.rst

@@ -38,7 +38,7 @@ The current release is |current1.2|, released on |current1.2date|.
 Borg 1.1
 --------
 
-Borg 1.1 is the current **oldstable** series of Borg.
+Borg 1.1 is not supported any more, please use Borg 1.2.x.
 The current release is |current1.1|, released on |current1.1date|.
 
 - `1.1.0 release announcement <borg-1.1.html>`_
@@ -49,7 +49,7 @@ The current release is |current1.1|, released on |current1.1date|.
 Borg 1.0
 --------
 
-Borg 1.0 is not supported any more, please use 1.1.x.
+Borg 1.0 is not supported any more, please use Borg 1.2.x.
 The last release in this series was |current1.0|, released on |current1.0date|.
 
 - `Documentation <https://borgbackup.readthedocs.io/en/1.0-maint/>`__

support/free.rst

@@ -51,6 +51,17 @@ channel (you might still need a registered nick to join our channel, see above):
 
 `#borgbackup channel web IRC <https://web.libera.chat/?nick=Guest&#borgbackup>`_
 
+.. _matrix:
+
+Matrix Chat
+-----------
+
+You can also use a matrix protocol based chat client like e.g.
+`Element <https://app.element.io>`_ to join the
+`#borgbackup room <https://matrix.to/#/!KnTJxMbCJuuVyjTSeJ:libera.chat?via=libera.chat&via=matrix.org&via=rudd-o.com>`_.
+
+Note: This room is bridged to the #borgbackup IRC channel on libera.chat.
+
 .. _mailing_list:
 
 Mailing list
@@ -63,24 +74,18 @@ unsubscribe and where you can find the archives of the list, see the
 
 .. _twitter:
 
-Twitter
--------
-
-Follow @borgbackup for announcements. You can also add @borgbackup if you
-would like to get retweeted for a borg related tweet.
-
-Please understand that Twitter is not suitable for longer / more complex
-discussions - use one of the other channels for that.
+.. _mastodon:
 
-.. _reddit:
+Mastodon / Twitter / X
+-----------------------
 
-Reddit
-------
+Follow us there for announcements:
 
-Our official subreddit is a great place to get support from other users
-or discuss your current setup or project.
+- Mastodon: https://fosstodon.org/@borgbackup
+- Twitter/X: https://twitter.com/borgbackup
 
-See `r/BorgBackup <https://www.reddit.com/r/BorgBackup/>`_
+Please understand that Twitter/X and mastodon are not suitable for longer / more
+complex discussions - use one of the other channels for that.
 
 .. _bounties_and_fundraisers:
 

support/fund.rst

@@ -12,7 +12,9 @@ You can support the BorgBackup Project using these options:
 
 - `PayPal Donation to Waldmann EDV <https://www.paypal.com/donate/?hosted_button_id=58A7SUQJZLBQ8>`_
 - `BorgBackup Team on Liberapay <https://liberapay.com/borgbackup/donate>`_
-- `BorgBackup Team on BountySource <https://www.bountysource.com/teams/borgbackup>`_
+- `BorgBackup Github Sponsors <https://github.com/sponsors/borgbackup>`_
+- `BorgBackup on OpenCollective <https://opencollective.com/borgbackup>`_
+- `BorgBackup on BountySource <https://www.bountysource.com/teams/borgbackup>`_
 
 PayPal
 ------
@@ -31,6 +33,19 @@ create a long term sustainable project.
 The funds are distributed to the borgbackup team members and as a borgbackup
 developer you can join the team.
 
+Github sponsors and OpenCollective
+----------------------------------
+
+On Github, you can become a sponsor and support us on a regular basis or alternatively
+also do a one-time donation.
+
+The funds are transferred to OpenCollective Europe (OC EU) then, which is our fiscal host.
+
+You can also give funds directly via OpenCollective, they also go to OC EU then.
+
+The funds held by OC EU for us can be used to pay misc. project-related expenses
+submitted by borgbackup team members.
+
 BountySource
 ------------