Update focus of donation links

Focus on the methods that work, instead of the ones that I wish people
would use.

And then a lot more.

_includes/donate-README.md

@@ -0,0 +1,12 @@
+# Do not forget to update them all
+
+- donate-main.md
+- donate-self.md
+- emacsair.me::_includes/donate-main.md
+- emacsair.me::_includes/donate-tiny.md
+- magit::README.md
+- more?
+
+# Do not use relative urls
+
+They might not work after copying them elsewhere.

_includes/donate-main.md

@@ -11,32 +11,27 @@
     <em>Thank you! — Jonas Bernoulli</em>
   </div>
   <div>
-    <a href="https://github.com/sponsors/tarsius">
+    <a href="https://github.com/sponsors/tarsius/">
       <img title="Sponsor my work using Github Sponsors"
            alt="Sponsor my work using Github Sponsors"
-           src="/assets/github-sponsors-50px.png"></a>
+           src="https://magit.vc/assets/donate/github-sponsors-50px.png"></a>
     &nbsp;&nbsp;
-    <a href="/donate/iban.html">
-      <img title="Sponsor my work using IBAN"
-           alt="Sponsor my work using IBAN"
-           src="/assets/iban.png"></a>
-    &nbsp;&nbsp;
-    <a href="/donate/ach.html">
-      <img title="Sponsor my work using ACH"
-           alt="Sponsor my work using ACH"
-           src="/assets/ach.png"></a>
+    <a href="https://liberapay.com/magit/">
+      <img title="Sponsor my work using Liberapay"
+           alt="Sponsor my work using Liberapay"
+           src="https://magit.vc/assets/donate/liberapay-50px.png"></a>
     <br>
-    <a href="/donate/stripe.html">
-      <img title="Sponsor my work using Stripe"
-           alt="Sponsor my work using Stripe"
-           src="/assets/stripe.png"></a>
+    <a href="https://opencollective.com/magit/">
+      <img title="Sponsor my work using Opencollective"
+           alt="Sponsor my work using Opencollective"
+           src="https://magit.vc/assets/donate/opencollective-50px.png"></a>
     &nbsp;&nbsp;
-    <a href="/donate/paypal.html">
+    <a href="https://magit.vc/donate/paypal.html">
       <img title="Sponsor my work using PayPal"
            alt="Sponsor my work using PayPal"
-           src="/assets/paypal.png"></a>
+           src="https://magit.vc/assets/donate/paypal-50px.png"></a>
   </div>
   <div>
-    <a href="/donate">Some alternative donation options are available</a>.
+    <a href="https://magit.vc/donate">Some alternative donation options are available</a>.
   </div>
 </div>

_includes/donate-self.md

@@ -11,32 +11,27 @@
     <em>Thank you! — Jonas Bernoulli</em>
   </div>
   <div>
-    <a href="https://github.com/sponsors/tarsius">
+    <a href="https://github.com/sponsors/tarsius/">
       <img title="Sponsor my work using Github Sponsors"
            alt="Sponsor my work using Github Sponsors"
-           src="/assets/github-sponsors-50px.png"></a>
+           src="https://magit.vc/assets/donate/github-sponsors-50px.png"></a>
     &nbsp;&nbsp;
-    <a href="/donate/iban.html">
-      <img title="Sponsor my work using IBAN"
-           alt="Sponsor my work using IBAN"
-           src="/assets/iban.png"></a>
-    &nbsp;&nbsp;
-    <a href="/donate/ach.html">
-      <img title="Sponsor my work using ACH"
-           alt="Sponsor my work using ACH"
-           src="/assets/ach.png"></a>
+    <a href="https://liberapay.com/magit/">
+      <img title="Sponsor my work using Liberapay"
+           alt="Sponsor my work using Liberapay"
+           src="https://magit.vc/assets/donate/liberapay-50px.png"></a>
     <br>
-    <a href="/donate/stripe.html">
-      <img title="Sponsor my work using Stripe"
-           alt="Sponsor my work using Stripe"
-           src="/assets/stripe.png"></a>
+    <a href="https://opencollective.com/magit/">
+      <img title="Sponsor my work using Opencollective"
+           alt="Sponsor my work using Opencollective"
+           src="https://magit.vc/assets/donate/opencollective-50px.png"></a>
     &nbsp;&nbsp;
-    <a href="/donate/paypal.html">
+    <a href="https://magit.vc/donate/paypal.html">
       <img title="Sponsor my work using PayPal"
            alt="Sponsor my work using PayPal"
-           src="/assets/paypal.png"></a>
+           src="https://magit.vc/assets/donate/paypal-50px.png"></a>
   </div>
   <div>
-    <a href="#alt">Some alternative donation options are available</a>.
+    Scroll for more payment methods.
   </div>
 </div>

_includes/make-better.md

@@ -1,5 +1,3 @@
-# Please help me improve Magit
-
 Many users are quite excited about Magit in its current
 form, and I am thankful for all the positive feedback.
 

donate/ach.md

@@ -43,11 +43,12 @@ Memphis TN 38119
 United States
 </pre>
 
-<br><img class="paylogo" src="/assets/ach.png"><br>
+<br><img class="paylogo" src="/assets/donate/ach.png"><br>
 
 <hr>
 <br>
 *If you have a non-US bank account, then instead make an [IBAN](/donate/iban/)
 transaction.  Some other donation options are [available](/donate).*
 
+# Please support my work on Magit
 {% markdown make-better.md %}

donate/iban.md

@@ -31,11 +31,12 @@ IBAN is **BE72 9673 1066 6916**, BIC is **TRWIBEB1XXX**, Account holder is
 **Jonas Remigius Bernoulli**, and the address is **Avenue Louise 54, Room S52 /
 Brussels / 1050 / Belgium**.
 
-<br><img class="paylogo" src="/assets/iban.png"><br>
+<br><img class="paylogo" src="/assets/donate/iban.png"><br>
 
 <hr>
 <br>
 *If you have a US bank account, then instead make an [ACH](/donate/ach/)
 direct deposit.  Some other donation options are [available](/donate).*
 
+# Please support my work on Magit
 {% markdown make-better.md %}

donate/index.md

@@ -1,9 +1,14 @@
 ---
 layout: default
-title: Please help me improve Magit
+title: Please support my work on Magit
 ---
 
-[What is Magit?](/)
+<center><a href="/">What is Magit?</a></center>
+<br><br>
+
+<!-- no title here -->
+{% markdown make-better.md %}
+<br/>
 
 <script type="text/javascript" src="/quotes/quotes.js"></script>
 <script type="text/javascript">window.onload = function(){inject_quotes(); simpleCssSwitch();}</script>
@@ -12,103 +17,68 @@ title: Please help me improve Magit
   <br/>
 </section>
 
-{% markdown make-better.md %}
-<br/>
-
-# FAQ 1: What other payment options do you accept?
-
-Please keep scrolling or [jump there](#alt).
-
-# FAQ 2: What payment option do you prefer?
-
-I prefer options that come with no, or very, low fees.  Of course I like these
-options because it means I get more money, but it is equally important who does
-*not* get a cut when we avoid unnecessary fees.
-
-In practical terms, that means that I prefer bank transfers.  Nowadays many
-banks have web-pages and apps, that make it nearly as simple to transfer money
-as the offerings of platforms that focus solely on money transfer.  So even
-if you avoided using them in the past, it might be worth giving them another
-chance.
-
-**Update**, since I am gaining many new supporters right now.  Choose the
-payment method **you** *are most comfortable with*, given the time you are
-willing to invest to set that up.  As we have just learned, putting too many
-eggs in one basket is risky.  GitHub Sponsors dropping support for PayPal is a
-major issue exactly because that was by far the most popular option.  That being
-said, if you have the time, I still encourage you do go with the solution that
-has the smallest fees.
-
-# FAQ 3: I already use something else for donations.  Can I stick to that?
-
-Of course I welcome all donations!  Since most developers only accept donations
-through one of the popular donation platforms, it makes sense to stick to that
-for all your donations.  It is certainly better to make donations using an
-expensive offering, than it is to make no donations at all because doing so
-would be too time consuming.
-
-Currently only a tiny fractions of the donations that I receive are done using
-bank transfers, so don't feel bad if you don't do that either.  Still, it might
-be worth investing some time, making sure a greater part of your donations reach
-the intended recipients.
-
-# FAQ 4: Can you send me a bill?
-
-~~Of course! Just ask me for one in an email.~~  Sadly, it depends.  Apparently
-EU countries now require that VAT is being payed even for small earnings for
-digital services.  In each country individually, using the country-specific
-platform and rules.  I cannot afford a lawyer to be certain about these things,
-and I likely would have to invest hours per country to figure out how to give
-them money.  If I have to spend all that time to pay taxes for $100, then that
-sadly is not worth the effort and legal uncertainty.
-
-Of course if you intend to pay considerably more, then that is well worth the
-effort.  If not, then consider whether you can make a donation instead of a
-payment.  If you cannot do that but would have payed otherwise, then please
-give me a heads up.  If the lose of donations is considerable enough because
-of this, then it might be worth finding another solution.
-
-By the way, while your employer may not have a budget for donations to free
-software, they might have one to **buy** any software or support.  I would be
-happy to send them such a bill.  But of course the above caveat applies in that
-case too.
-
 # Bank transfers
 
+Bank transfers have the advantage that there are *no fees* (in Europe) or
+*smaller fees* compared to payment processors (in the USA).
+
 - Use [ACH](/donate/ach.html) direct deposit if you have an US bank account.
+
 - Use [IBAN](/donate/iban.html) if you have a European account.  This might
   also work for other non-US bank account.
 
 # Payment processors
 
-Compared to (at least European) banks these charge higher fees.
+Compared to banks these charge much higher fees.
 
 - [Stripe](/donate/stripe.html)
+
 - [Paypal](/donate/paypal.html)
 
-<a name="alt">
 # Donation platforms
 
+When using a donation platform, payments are made with the help of a payment
+processor, so the fees of the processor still apply.
+
+If a donation platform charges additional fees, on top of the fees by the used
+payment processor, then that is noted below.
+
 - [Github Sponsors](https://github.com/sponsors/tarsius/)
 
-  This is by far the most popular option among my backers.  They currently do
-  not charge any fees themselves, but the fees of Stripe and your credit card
-  company still apply.
+- [Liberapay](https://liberapay.com/magit/)
 
 - [Patreon](https://www.patreon.com/tarsius/)
 
-  This is the second most popular option among my backers.  They charge very
-  high fees, including some hidden fees.  Please avoid them going forward; if
-  all the people you back on there also accept donations elsewhere, then you
-  might even want to move away from this platform.
+  They charge *very high fees*, including some hidden fees.  Please consider
+  using another platform.
 
 - [Opencollective](https://opencollective.com/magit/)
 
-  Not popular among my backers.  Because I have opted to use no "fiscal host"
-  they charge no additional fees.  As a consequence, they do however ask you
-  to also donate to them when you are donating to me (but you can decline).
+  They ask you to donate to them as well, but you can decline.
 
-- [Liberapay](https://liberapay.com/magit/)
 
-  Gaining in popularity.  They have only the best intentions and they do not
-  charge any additional fees.
+<br><br><br>
+# FAQ 1: What payment option do you prefer?
+
+I prefer options that come with no, or very low, fees.  Of course I like these
+options because it means I get more money, but it is equally important who does
+*not* get a cut when we avoid unnecessary fees.
+
+In practical terms, that means that I prefer bank transfers.
+
+# FAQ 2: I already use something else for donations.  Can I stick to that?
+
+Of course I welcome all donations!  Since most developers only accept donations
+through one of the popular donation platforms, it makes sense to stick to that
+for all your donations.  It is certainly better to make donations using an
+expensive offering, than it is to make no donations at all.
+
+# FAQ 3: Can you send me a bill?
+
+If you are located within the EU, then I unfortunately cannot do that, because
+the administrative hurdles are too high.  If you are located elsewhere, then I
+would be happy to send you a bill.
+
+By the way, while your employer may not have a budget for donations, they might
+have one to *buy* any software or support.  I would be happy to send them such
+a bill.  But of course the above caveat applies in that case too.

donate/paypal.md

@@ -35,10 +35,12 @@ title: Sponsor my work using PayPal
 <br/>
 <img title="Sponsor my work using PayPal"
      alt="Sponsor my work using PayPal"
-     src="/assets/paypal.png"
+     src="/assets/donate/paypal.png"
      class="paylogo">
 
 <hr>
 <br>
 *Some other donation options are [available](/donate).*
+
+# Please support my work on Magit
 {% markdown make-better.md %}

donate/stripe.md

@@ -14,10 +14,12 @@ expenses are in CHF.
 <br>
 <img title="Sponsor my work using Stripe"
      alt="Sponsor my work using Stripe"
-     src="/assets/stripe.png"
+     src="/assets/donate/stripe.png"
      class="paylogo">
 
 <hr>
 <br>
 *Some other donation options are [available](/donate).*
+
+# Please support my work on Magit
 {% markdown make-better.md %}