Make donations easy and provide alternative options with instructions (see #681501)

CVS version numbers

english/donations.wml: 1.68 -> 1.69

1 files changed, 205 insertions, 55 deletions

diff --git a/english/donations.wml b/english/donations.wml
index c0c81228302..d233c5b3d29 100644
--- a/english/donations.wml
+++ b/english/donations.wml
@@ -1,56 +1,189 @@
-#use wml::debian::template title="Donations to Software in the Public Interest"
-
-<ul class="toc">
-  <li><a href="#money_donations">Donations of money</a></li>
-  <li><a href="#equipment_donations">Donations of equipment and services</a></li>
-</ul>
-
-<h2 id="money_donations">Donations of money</h2>
-
-<p>Debian is the name of the project, and Debian is how the
-distribution we create is called. In order to handle money donations,
-we set up a non-profit corporation,
-<a href="http://www.spi-inc.org/">Software in the Public Interest</a>.</p>
-
-<p>Although created by a volunteers throughout the world, Debian
-has expenses that were, for a long time, paid for out of the
-pockets of a few of the developers. These expenses include
-registering the debian.org domain, cutting CD's for testing new
-releases, unreimbursed travel and lodging expenses while appearing
-at conferences, etc.</p>
-
-<p>Many of the donations to date have been from appreciative users.
-While all donations are welcome, it is especially hoped that any
-businesses that make money through Debian (CD manufacturers,
-support companies, or even businesses that rely on Debian
-for day to day operations) will contribute a percentage
-of their profit to help make Debian the best OS
-it can be.</p>
-
-<p>If you would like to make a monetary donation to Debian, see the
-<a href="https://co.clickandpledge.com/advanced/default.aspx?wid=34115#DonationName_4">SPI donation page</a>.
-Make sure to specify that the money is intended for Debian. Since SPI
-is a non-profit organization we can issue receipts for tax purposes.</p>
-
-<p>For some parts of the world it may be easier to make the donation to
-one of the partner organizations of Software in the Public Interest
-(check the <a href="https://co.clickandpledge.com/advanced/default.aspx?wid=34115#DonationName_4">SPI donation page</a>
-for current information):</p>
-
-<ul>
-   <li>Europe: <a href="http://www.ffis.de/Verein/spi-en.html">\
-       Verein zur Förderung Freier Informationen und Software e.V.</a>
-       (ffis) in Germany</li>
-   <li>Italy: <a href="http://www.softwarelibero.it/donazioni-debian">\
-       Associazione Software Libero</a></li>
-</ul>
-
-<h2 id="equipment_donations">Donations of equipment and services</h2>
-
-<p>Given the small budget Debian runs on it is not possible, at this time,
-for Debian to purchase and maintain its own computers and network connections.
-We therefore rely on the donation of equipment and services from companies and
-universities to keep Debian connected to the world.</p>
+#use wml::debian::template title="Donations"
+
+<p>
+Donations are managed by the
+<a href="$(HOME)/devel/leader">Debian Project Leader</a> (DPL)
+and allow Debian to have 
+<a href="https://db.debian.org/machines.cgi">machines</a>,
+<a href="https://wiki.debian.org/Teams/DSA/non-DSA-HW">other hardware</a>,
+domains, SSL certificates,
+<a href="http://www.debconf.org">the Debian conference</a>,
+<a href="https://wiki.debian.org/MiniDebConf">Debian mini-conferences</a>,
+<a href="https://wiki.debian.org/Sprints">development sprints</a>,
+presence at other events
+and other things.
+Thanks to all of our <a href="#donors">donors</a> for supporting Debian!
+</p>
+
+<p id="spi-usa-epay">
+The easiest method of donating to Debian is by credit/debit card via USA ePay
+to <a href="http://www.spi-inc.org/" title="SPI">Software in the Public Interest</a>,
+a non-profit organization that holds assets in trust for Debian.
+You can also donate via the <a href="#other">other methods listed below</a>.
+</p>
+
+<form method="post" action="https://www.usaepay.com/interface/epayform/">
+  <span>$<input type="text" placeholder="10" name="UMamount" size="6"> USD, paid once only</span>
+  <input name="UMdescription" value="Debian general contribution" type="hidden">
+  <input name="UMkey" value="ijWB0O98meGpX0LrCP0eb1Y94sI1Dl67" type="hidden"> 
+  <input name="UMcommand" value="sale" type="hidden" />
+  <input type="submit" tabindex="2" value="Donate" />
+</form>
+
+<h2 id="other">Other methods</h2>
+
+<p>
+Various <a href="https://wiki.debian.org/Teams/Auditor/Organizations">organisations</a>
+hold assets in trust for Debian and recieve donations on Debian's behalf. 
+</p>
+
+<table>
+<tr>
+<th>Organisation</th>
+<th>Methods</th>
+<th>Notes</th>
+</tr>
+<tr>
+<td><a href="#spi"><acronym title="Software in the Public Interest">SPI</acronym></a></td>
+<td>
+ <a href="#spi-usa-epay">USA ePay</a>,
+ <a href="#spi-click-n-pledge">Click & Pledge</a> (recurring donations),
+ <a href="#spi-cheque">cheque</a> (USD/CAD),
+ <a href="#spi-other">other</a>
+</td>
+<td>USA, tax-exempt non-profit</td>
+</tr>
+<tr>
+<td><a href="#ffis"><acronym title="Verein zur Förderung Freier Informationen & Software">FFIS</acronym></a></td>
+<td>
+ <a href="#ffis-bank">wire transfer</a>
+</td>
+<td>Germany, tax-exempt non-profit</td>
+</tr>
+<tr>
+<td><a href="#debian">Debian</a></td>
+<td>
+ <a href="#debian-equipment">equipment</a>,
+ <a href="#debian-time">time</a>,
+ <a href="#debian-other">other</a>
+</td>
+<td></td>
+</tr>
+
+# Template: 
+#<tr>
+#<td><a href="#"><acronym title=""></acronym></a></td>
+#<td>
+# <a href="#"></a>,
+# <a href="#"></a> (allows recurring donations),
+# <a href="#cheque"></a> (CUR)
+#</td>
+#<td>, tax-exempt non-profit</td>
+#</tr>
+
+</table>
+
+<h3 id="spi">Software in the Public Interest</h3>
+
+<p>
+<a href="http://www.spi-inc.org/" title="SPI">Software in the Public Interest, Inc.</a>
+is a tax-exempt non-profit corporation based in the United States of America,
+founded by Debian people in 1997 to help free software/hardware organisations.
+</p>
+
+<h4 id="spi-click-n-pledge">Click &amp; Pledge</h2>
+
+<p>
+Single and recurring donations can be made via 
+<a href="https://co.clickandpledge.com/advanced/default.aspx?wid=34115">the SPI page</a>
+on the Click &amp; Pledge website.
+To make a recurring donation,
+choose how often you would like to donate on the right,
+scroll down to "Debian Project Donation",
+enter the amount you would like to donate,
+click on the "Add to cart" item and
+go through the rest of the process.
+</p>
+
+<!--
+Unfortunately this isn't possible to do yet:
+<form method="post" action="https://co.clickandpledge.com/advanced/default.aspx?wid=34115">
+<input name="ScriptManager1" value="UpdatePanel1|btnDAddToCart_dnt_33979" type="hidden">
+$<input name="DAmount_33979" size="6" id="DAmount_33979" type="text"> USD, paid
+<select name="cboxRecurring" id="cboxRecurring">
+  <option value="-1">once only</option>
+  <option value="0">weekly</option>
+  <option value="1">fortnightly</option>
+  <option value="2">monthly</option>
+  <option value="3">every 2 months</option>
+  <option value="4">quarterly</option>
+  <option value="5">bi-annually</option>
+  <option value="6">annually</option>
+</select>
+<input type="submit" name="btnDAddToCart_dnt_33977" id="btnDAddToCart_dnt_33977" value="Donate"/>
+</form>
+-->
+
+<h4 id="spi-cheque">Cheque</h2>
+
+<p>
+Donations can be made via cheque or money order in 
+<abbrev title="US dollars">USD</abbrev> and
+<abbrev title="Canadian dollars">CAD</abbrev>.
+Please put Debian in the memo field and send to SPI at the address listed
+on the <a href="http://www.spi-inc.org/donations/">SPI donations page</a>.
+</p>
+
+<h4 id="spi-other">Other</h2>
+
+<p>
+Donations via wire transfer and PayPal are also available.
+For some parts of the world it may be easier to make the donation to
+one of the partner organizations of Software in the Public Interest.
+For more details, please visit the
+<a href="http://www.spi-inc.org/donations/">SPI donations page</a>.
+</p>
+
+<h3 id="ffis">Verein zur Förderung Freier Informationen & Software</h3>
+
+<p>
+The <a href="http://www.ffis.de/" title="ffis e.V.">Verein zur Förderung Freier Informationen & Software</a>
+is a tax-exempt non-profit corporation based in Germany,
+founded to help free software organisations.
+</p>
+
+<h4 id="ffis-bank">Wire transfer</h4>
+
+<p>
+Donations via wire transfer are available to the bank account listed on the
+<a href="http://www.ffis.de/Verein/spi-en.html">FFIS donations page</a>.
+Please mention that the donation is for Debian.
+</p>
+
+# Template:
+#<h3 id=""></h3>
+#
+#<p>
+#</p>
+#
+#<h4 id=""></h4>
+#
+#<p>
+#</p>
+
+<h3 id="debian">Debian</h2>
+
+<p>
+Debian is able to accept direct <a href="#debian-equipment">equipment</a>
+donations but not <a href="#debian-other">other</a> donations at this time.
+</p>
+
+<a name="equipment_donations"/>
+<h4 id="debian-equipment">Equipment and services</h2>
+
+<p>
+Debian also relies on the donation of equipment and services from individuals,
+companies, universities etc to keep Debian connected to the world.</p>
 
 <p>If your company has any idle machines or spare equipment (hard drives, SCSI
 controllers, network cards, etc) lying around, please consider donating them to
@@ -61,13 +194,30 @@ for details.</p>
 <p>Debian maintains a <a href="misc/hardware_wanted">list of hardware that is wanted</a> for various
 services and groups within the project.</p>
 
-<hrline />
+<h4 id="debian-time">Time</h2>
+
+<p>
+There are many ways to <a href="$(HOME)/intro/help">help Debian</a>
+using your personal or work time.
+</p>
+
+<h4 id="debian-other">Other</h2>
+
+<p>
+Debian is not able to accept any cryptocurrencies at this time but
+we are looking into being able to support this method of donation.
+# Brian Gupta requested we discuss this before including it:
+#If you have cryptocurrency to donate, or insights to share, please
+#get in touch with <a href="mailto:madduck@debian.org">Martin f. krafft</a>.
+</p>
+
+<h2 id="donors">Donors</h2>
 
 <p>The following are lists of organizations that have made donations of
 equipment or services to Debian:</p>
 
 <ul>
-
+  <li><a href="https://db.debian.org/machines.cgi">hosting and hardware sponsors</a></li>
   <li><a href="mirror/official_sponsors">official mirror sponsors</a></li>
   <li><a href="partners/">development and service partners</a></li>
 </ul>