[tor-commits] r25798: {website} clean up and close ticket 2121. (website/trunk/donate/en)

[Andrew Lewman]

Author: phobos
Date: 2012-09-20 17:10:48 +0000 (Thu, 20 Sep 2012)
New Revision: 25798

Modified:
   website/trunk/donate/en/donate.wml
Log:
clean up and close ticket 2121.


Modified: website/trunk/donate/en/donate.wml
===================================================================
--- website/trunk/donate/en/donate.wml	2012-09-19 15:11:19 UTC (rev 25797)
+++ website/trunk/donate/en/donate.wml	2012-09-20 17:10:48 UTC (rev 25798)
@@ -27,9 +27,8 @@
     grants, or other more sophisticated transactions</a></li>
     <li class="last"><a href="#bitcoin">bitcoin</a></li>
   </ul>
-    <p>If you want to make an anonymous donation, please do so in an
-    anonymous way. Contact us at donations at torproject.org for more
-    donation details.</p>
+    <p>Contact us at donations at torproject.org for more donation
+details.</p>
 <!-- BEGIN PAYPAL -->
 <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script>
 <script type="text/javascript">
@@ -38,7 +37,7 @@
       var amount = jQuery('#amount').val();
 		var radioVal = jQuery('input[@name="amount"]:checked').val();
       if(t3 != 0){
-       if( !amount ) { 
+       if( !amount ) {
 		    jQuery('#a3').val(radioVal);
 		 }else{
 		    jQuery('#a3').val(amount);
@@ -80,8 +79,9 @@
 			<select id="t3" name="t3">
 			 <option value="0">One-time Donation</option>
 			 <option value="M">Monthly Subscription</option>
-			</select>		
-			<small id="ppinfo">Does Not Require a PayPal Account</small>		
+			</select>
+			<small id="ppinfo">Does Not Require a PayPal
+Account</small>
 		  </p>
 	      <div class="drow">
 	 		 <div>
@@ -93,7 +93,7 @@
 			    <option value="YEN">¥</option>
 			   </select>
 			  </span>
-			  <ul class="amounts">	
+			  <ul class="amounts">
 		      <li><input type="radio" class="radio" name="amount" value="2000.00"><label for="2000">2000</label></li>
 	  	      <li><input type="radio" class="radio" name="amount" value="1000.00"><label for="1000">1000</label></li>
 		      <li><input type="radio" class="radio" name="amount" value="500.00"><label for="500">500</label></li>
@@ -150,7 +150,7 @@
 		    <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html">
 		  </div>
 		</form>
-		<small>Requires an Amazon Account</small>		
+		<small>Requires an Amazon Account</small>
 	 </div>
 <!-- END AMAZON -->
 <!-- BEGIN GIVV -->
@@ -169,7 +169,7 @@
    <a id="cash"></a>
    <div class="hundred toptwenty">
      <div class="dbox donate">
-       <h3>Donate via Check, Cash, Money Order, Bank Transfer, Stock Grant, or Another More Sophisticated Transaction</h3>
+       <h3>Donate via Check, Cash, Money Order, Bank Transfer</h3>
        <h4>You can send checks or money orders to:</h4>
 	    <p>The Tor Project, Inc<br>
         969 Main Street, Suite 206<br>
@@ -180,6 +180,9 @@
         <h4>US Transfers</h4>
         <p>For US donations via wire or ACH transfer, please contact us for the relevant information.</p>
         <h4>European Transfers</h4>
+	<p><em>For European bank transfers, we have an arrangement with
+        <a href="https://www.ccc.de/">CCC in Germany</a> to provide
+        tax-deductible donations for Europeans:</em></p>
         <p>Wau Holland Stiftung<br>
         IBAN DE03 5204 0021 0277 281202<br>
         SWIFT BIC COBADEFF520</p>
@@ -188,9 +191,6 @@
         Inhaber: Wau Holland Stiftung<br>
         Bank: Commerzbank Kassel<br>
         BLZ: 52040021</p>
-        <p><em>For European bank transfers, we have an arrangement with
-        <a href="https://www.ccc.de/">CCC in Germany</a> to provide
-        tax-deductible donations for Europeans:</em></p>
         <ul>
           <li>Residents from any of the 31 <a
           href="http://en.wikipedia.org/wiki/Single_Euro_Payments_Area">SEPA</a>