[tor-commits] [donate/master] Update donate-faq

[peterh at torproject.org]

commit 925eec2862b52389dd2a2b07db8d40bba968ce57
Author: hiro <hiro at torproject.org>
Date:   Mon Nov 11 20:52:43 2019 +0100

    Update donate-faq
---
 templates/donor-faq.twig | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/templates/donor-faq.twig b/templates/donor-faq.twig
index df19def6..4b3ede3f 100644
--- a/templates/donor-faq.twig
+++ b/templates/donor-faq.twig
@@ -173,7 +173,12 @@
         </li>
         <li>
           <h2 class="question">{% trans %}Can I donate hardware?{% endtrans %}</h2>
-          <p class="answer">{% trans %}Typically no, we don't encourage people to donate hardware.{% endtrans %} {% trans %}But if you want to make a hardware donation that you think might be especially useful for us, please mail <span class="email">giving(at)torproject.org</span>.{% endtrans %}</p>
+          <p class="answer">{% trans %}Typically no, we don't encourage people to donate hardware. But if you want to make a hardware donation that you think might be especially useful for us, please mail giving(at)torproject.org.{% endtrans %}<br />
+          {% trans %}The Tor project manages multiple machines in multiple locations, all aimed at helping the Tor project develop software design to protect people's anonymity. It does not, in itself, run the Tor network.{% endtrans %}<br />
+          {% trans %}Machines for helping the Tor project develop software are generally paid for by the Tor project or donated by friendly organisations. If you wish to donate hardware resources, it's generally expected the hardware will be fully under the control of the <a href="https://help.torproject.org/tsa/">Tor Sysadmin Team</a>. Details of the requirements are documented in the <a href="https://help.torproject.org/tsa/doc/hardware-requirements/">team wiki</a>.{% endtrans %}<br/>
+          {% trans %}It's possible for the Tor project to run only *services* on top of an already existing operating system as well, but we prefer to run the entire stack ourselves.{% endtrans %}
+          {% trans %}<a href="https://help.torproject.org/tsa/">Tor Sysadmin Team</a>{% endtrans %}<br />
+          {% trans %}<a href="https://help.torproject.org/tsa/doc/hardware-requirements/">Hardware requirements</a>{% endtrans %}</p>
         </li>
         <li>
           <h2 class="question">{% trans %}Can I donate my time?{% endtrans %}</h2>
@@ -188,16 +193,6 @@
           <p class="answer">{% trans %}Sure.{% endtrans %} {% trans %}Just mail us at <span class="email">giving(at)torproject.org</span></a>.{% endtrans %}</p>
         </li>
         <li>
-          <h2 class="question">{% trans %}Can I donate hardware?{% endtrans %}</h2>
-          <p class="answer">{% trans %}Typically no, we don't encourage people to donate hardware. But if you want to make a hardware donation that you think might be especially useful for us, please mail giving(at)torproject.org.{% endtrans %}<br />
-          {% trans %}The Tor project manages multiple machines in multiple locations, all aimed at helping the Tor project develop software design to protect people's anonymity. It does not, in itself, run the Tor network.{% endtrans %}<br />
-          {% trans %}Machines for helping the Tor project develop software are generally paid for by the Tor project or donated by friendly organisations. If you wish to donate hardware resources, it's generally expected the hardware will be fully under the control of the [Tor
-sysadmin team][]. Details of the requirements are documented in the <a href="https://help.torproject.org/tsa/doc/hardware-requirements/">team wiki</a>.{% endtrans %}<br/>
-          {% trans %}It's possible for the Tor project to run only *services* on top of an already existing operating system as well, but we prefer to run the entire stack ourselves.{% endtrans %}
-          {% trans %}<a href="https://help.torproject.org/tsa/">Tor Sysadmin Team</a>{% endtrans %}<br />
-          {% trans %}<a href="https://help.torproject.org/tsa/doc/hardware-requirements/">Hardware requirements</a>{% endtrans %}</p>
-        </li>
-        <li>
           <h2 class="question">{% trans %}Will the Tor Project accept donations from anybody, or do you reserve the right to reject support from specific organizations or individuals?{% endtrans %}</h2>
           <p class="answer">{% trans %}We do reserve the right to reject a donation.{% endtrans %} {% trans %}To date though, we haven't exercised that right.{% endtrans %} {% trans %}We are happy that a broad range of people use and support Tor.{% endtrans %}</p>
         </li>