Update docs for GitHub sponsors update

2 files changed, 33 insertions, 37 deletions

diff --git a/README.asciidoc b/README.asciidoc
index 7e2554071..b12665b7a 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -129,18 +129,30 @@ https://github.com/sponsors/The-Compiler/[GitHub Sponsors page] for more
 information. Depending on your sign-up date and how long you keep a certain
 level, you can get qutebrowser t-shirts, stickers and more!
 
+GitHub Sponsors allows for one-time donations (using the buttons next to "Select a
+tier") as well as custom amounts. **For currencies other than Euro or Swiss Francs, this
+is the preferred donation method.** GitHub uses https://stripe.com/[Stripe] to accept
+payment via credit carts without any fees. Billing via PayPal is available as well, with
+less fees than a direct PayPal transaction.
+
 Alternatively, the following donation methods are available -- note that
 eligibility for swag (shirts/stickers/etc.) is handled on a case-by-case basis
 for those, please mailto:mail@qutebrowser.org[get in touch] for details.
 
-* SEPA bank transfer inside Europe (no fee):
+* SEPA bank transfer inside Europe (**no fees**):
   - Account holder: Florian Bruhin
   - Country: Switzerland
   - IBAN (EUR): CH13 0900 0000 9160 4094 6
   - IBAN (other): CH80 0900 0000 8711 8587 3
   - Bank: PostFinance AG, Mingerstrasse 20, 3030 Bern, Switzerland (BIC: POFICHBEXXX)
   - If you need any other information: Contact me at mail@qutebrowser.org.
-* PayPal: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=me%40the-compiler.org&item_name=qutebrowser&currency_code=CHF&source=url[CHF], https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=me%40the-compiler.org&item_name=qutebrowser&currency_code=EUR&source=url[EUR], https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=me%40the-compiler.org&item_name=qutebrowser&currency_code=USD&source=url[USD]
+* PayPal:
+  https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=me%40the-compiler.org&item_name=qutebrowser&currency_code=CHF&source=url[CHF],
+  https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=me%40the-compiler.org&item_name=qutebrowser&currency_code=EUR&source=url[EUR],
+  https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=me%40the-compiler.org&item_name=qutebrowser&currency_code=USD&source=url[USD].
+  **Note: Fees can be very high (around 5-40%, depending on the donated amounts)** - consider
+  using GitHub Sponsors (accepts credit cards or PayPal!) or SEPA bank transfers
+  instead.
 * Cryptocurrencies:
   - Bitcoin: link:bitcoin:bc1q3ptyw8hxrcfz6ucfgmglphfvhqpy8xr6k25p00[bc1q3ptyw8hxrcfz6ucfgmglphfvhqpy8xr6k25p00]
   - Bitcoin Cash: link:bitcoincash:1BnxUbnJ5MrEPeh5nuUMx83tbiRAvqJV3N[1BnxUbnJ5MrEPeh5nuUMx83tbiRAvqJV3N]
@@ -148,7 +160,6 @@ for those, please mailto:mail@qutebrowser.org[get in touch] for details.
   - Litecoin: link:litecoin:MDt3YQciuCh6QyFmr8TiWNxB94PVzbnPm2[MDt3YQciuCh6QyFmr8TiWNxB94PVzbnPm2]
   - Others: Please mailto:mail@qutebrowser.org[get in touch], I'd happily set up anything link:https://www.ledger.com/supported-crypto-assets[supported by Ledger Live]
 
-
 Sponsors
 --------
 
diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index 8e624bef7..503893b66 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -419,33 +419,18 @@ which matches all donations until a cap of $5000, which has already been
 reached by qutebrowser.
 
 Is it possible to contribute via a one-time donation instead?::
-   If you prefer a one-time donation, there are various possibilities:
-+
-- Select a tier which covers the total amount you'd like to donate (note that
-  payments are prorated based on the current date). After the payment is
-  processed, cancel your GitHub sponsors subscription again. This has a big
-  benefit: There are no fees deducted from your amount.
-+
-- Sign up for a lower recurring donation instead.
-+
-- Do so via the https://github.com/qutebrowser/qutebrowser#donating[existing
-  donation methods]. Rewards (shirts/stickers/swag) are handled on a
-  case-by-case basis as GitHub's matching fund isn't applicable and there might
-  be relatively high fees which make this tricky.
-+
-- If you want to contribute via a one-time donation and want to make sure
-  you'll receive a reward, you might want to sign up to the
-  https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser-announce[qutebrowser-announce]
-  mailinglist and wait until there is an official way to do so. It's planned to
-  set this up at a later date. Note that the thresholds for perks will be
-  higher because those donations aren't matched by GitHub and fees are
-  relatively high.
+    Yes! GitHub Sponsors allows for one-time donations (including custom amounts) using
+    the buttons next to "Select a tier". Alternatively, see the
+    https://github.com/qutebrowser/qutebrowser#donating[readme] for other donation
+    methods, but note that physical rewards (stickers/shirts) for such donations are
+    handled on a case-by-case basis due to the higher administrative overhead and fees.
 
 I'd like a certain reward (e.g. a t-shirt) but I'd prefer making a smaller monthly donation. Can I upgrade via a one-time donation?::
-    It's planned to set up a donation page to allow this at a later date.
-    However, the thresholds for perks will be higher because those donations
-    aren't matched by GitHub and fees are relatively high. Note that you can
-    switch tiers on GitHub sponsors at any time.
+    GitHub allows for one-time donations (see the previous question). For physical
+    rewards, your total contributions will be summed up, so you can indeed make a
+    one-time donation to "upgrade". Before rewards are ordered, all sponsors will be
+    contacted with their total donation amount so that they can still upgrade, if
+    desired.
 
 GitHub tries to charge me for an entire year. What gives?::
     This happens if you have an existing annual billing cycle with GitHub (for
@@ -458,17 +443,17 @@ Can I support you without getting any rewards/merchandise?::
     an option to not get any merch at all.
 
 Can I select my own amount rather than using the predefined tiers?::
-    Unfortunately, GitHub sponsors doesn't support this at the moment. The
-    existing tiers should hopefully cover various options. If you disagree,
-    please mailto:mail@qutebrowser.org[get in touch] - I might be able to add a
-    new sponsorship tier.
+    At the bottom of the tier list, GitHub allows specifying a custom donation amount.
 
 When will rewards be shipped?::
-    Rewards will be ordered and subsequently shipped once it's clear how many
-    people are eliglible. The cut-off date for the donation goals is May
-    2020, so rewards will likely be shipped Q2/2020. This also applies to tiers
-    which make you eliglible for a certain perk immediately, though stickers
-    might be shipped earlier depending on how many people this affects.
+    Due to COVID-19, the Swiss Post currently
+    https://service.post.ch/vgkklp/info/informationen/Verkehrseinschraenkungen?lang=en[only
+    accepts priority letters for many countries], including the US. Especially for the
+    t-shirts, the difference between economy and priority shipments is quite
+    significant. For the shirts, I estimate I'd spend a total of $250 to $1500 on
+    *extra* postage. Thus, shipping is currently on hold until the shipping situation
+    resolves. There's currently no ETA for that happening, but rest assured everyone
+    will be notified (if contact details are available) once there are news.
 
 I'd like some stickers, but I can't donate anything because of my financial situation.::
     Please mailto:mail@qutebrowser.org[get in touch]! As long as this doesn't