[openssl-commits] [web] master update

Thu May 5 20:21:08 UTC 2016

The branch master has been updated
       via  3fda788257530d93348193cd5fe714e0f9e006a8 (commit)
      from  6801bb4227003da48f34d559138c6af6c4cc2581 (commit)


- Log -----------------------------------------------------------------
commit 3fda788257530d93348193cd5fe714e0f9e006a8
Author: Steve Marquess <marquess at openssl.com>
Date:   Thu May 5 16:20:49 2016 -0400

    Remove PayPal donate option

-----------------------------------------------------------------------

Summary of changes:
 support/donations-cn.html | 119 ----------------------------------------------
 support/donations.html    |  14 +-----
 2 files changed, 2 insertions(+), 131 deletions(-)
 delete mode 100644 support/donations-cn.html

diff --git a/support/donations-cn.html b/support/donations-cn.html
deleted file mode 100644
index eefe8a9..0000000
--- a/support/donations-cn.html
+++ /dev/null
@@ -1,119 +0,0 @@
-
-#use wml::openssl area=support page=donations
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Donations</title>
-
-<h1>Donations - China</h1>
-
-
-我们接受来自Paypal和银联卡的任意数额的捐款。
-<br>
-We accept donations in any amount via PayPal and UnionPay:
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="JFMKAASZ9XL2N">
-<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal payment">
-<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-<img alt="" border="0" src="/img/unionpay.jpg" align="center">
-</form>
-
-<br>
-<br>
-
-
-尊敬的捐款者，我们现在已经找到一个方法可以通过银联卡进行捐款. 您只需要先在
-<a href="https://www.paypal.com/c2/webapps/mpp/get-started?locale.x=zh_CN">
-Paypal中国
-</a>
-注册一个账户，关联您的银联卡即可实现，方便快捷。
-<p>
-捐款指南 1 
-<br>
-对于没有Paypal中国账户的捐款者： 
-<br>
-1. 请先在
-<a href="https://www.paypal.com/c2/webapps/mpp/get-started?locale.x=zh_CN">
-Paypal中国
-</a>
-注册一个账户，关联您的银联卡。如何关联银联卡Paypal中国有
-<a href="https://www.paypal.com/c2/webapps/mpp/faqs-china-unionpay-payments?locale.x=zh_C2">
-详细说明
-</a>
-.
-<br>
-2. 注册成功后，在“我的Paypal”页面点击付款，付款种类请选择美元，Paypal中国会自动按美元支付但换算成人民币后扣款，您不必去银行兑换外币。在收款人处填写 “paypal at opensslfoundation.org”，然后按照网站指示操作即可完成捐款。 
-<br>
-3. 你拥有Paypal中国账户后，也可在我们
-<a href="https://openssl.org/support/donations.html">
-网站的页面
-</a>
-按照捐款指南2操作，完成捐款。
-<br>
-<p>
-捐款指南 2 
-<br>
-已有Paypal中国账户的捐款者： 
-<br>
-1. 点击上方黄色Donate按钮; 
-<br>
-2. 进入捐款页面，输入捐赠额，付款种类请选择美元，然后通过此页面登陆Paypal中国。Paypal中国会自动按美元支付但换算成人民币后扣款，您不必去银行兑换外币。 
-<br>
-3. 登陆后核对信息无误后，点击立即捐赠，捐款即完成。
-<br>
-<p>
-如有任何疑问请发送邮件到 
-<a href="mailo:fangxie at opensslfoundation.org">
-fangxie at opensslfoundation.org
-</a>
-, 我们会尽快为您解答。非常感谢您对OpenSSL的支持!
-
-<p>
-(English Translation)
-<p>
-Dear donors, we have figured out a way for you to donate to OpenSSL through your UnionPay card. This can be done
-by opening an account with <a href="https://www.paypal.com/c2/webapps/mpp/get-started?locale.x=zh_CN">Paypal China</a>
- and associating
-your UnionPay card with this Paypal account. This is the most convenient method we have been able to find for Chinese donors.
-<p>
-Instruction 1
-<br>
-For those who have no Paypal China account: 
-<br>
-1. Please open an account on <a href="https://www.paypal.com/c2/webapps/mpp/get-started?locale.x=zh_CN">PayPal China</a>, and associate your UnionPay card with this account. PayPal China <a href="https://www.paypal.com/c2/webapps/mpp/faqs-china-unionpay-payments?locale.x=zh_C2">has instructions</a> on how make that association.
-<br>
-2. Once you are signed in on Paypal China, click the "send money” button on the MyPaypal page. Please choose the US dollar as
-the currency. Paypal China will pay in US dollars but charge you in RMB based on the current exchange rate. There is no need
-to go to a bank for the currency exchange. 
-then fill in our email address <em>paypal at opensslfoundation.org</em> as the receiver, then follow the instructions of Paypal
-itself to complete the donation.
-<br>
-3. After you have an account with Paypal China, you can also go to the OpenSSL <a href="donations.html">Donations</a> web page,
-and follow our “Instruction 2” (below) to complete your donation.
-<p>
-Instruction 2
-<br>
-For those who already have a Paypal China account:
-<br>
-1. Click the yellow “Donate” button above.
-<br>
-2. Go into the donation page and fill in the amount you want to donate.
-Please choose the US dollar as
-the currency, and log in to Paypal China through this page. Paypal China will pay in US dollars but
-charge you in RMB based on the current exchange rate. There is no need to go to a bank for the currency exchange.
-<br>
-3. After you have logged in to Paypal China, click the “donate” button at the bottom to complete your donation.
-<p>
-If you have any questions please send an email to <a href="mailto:fangxie at opensslfoundation.org">fangxie at opensslfoundation.org</a>. We will reply as soon as possible.
-We really appreciate your support of the OpenSSL project!
-
-
-
-
-<br>
-<br>
-
-<br>
-<br>
-As noted above these donations are currently <em>not</em> tax-deductible!<br>
-For further information please contact the <a href="about/openssl-contact.html">OpenSSL Software Foundation</a>.
diff --git a/support/donations.html b/support/donations.html
index 1f8fc2d..4969f66 100644
--- a/support/donations.html
+++ b/support/donations.html
@@ -57,19 +57,9 @@
 	    </table>
 	    <p> </p>
 
-We also accept donations in any amount via credit card or PayPal:
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="JFMKAASZ9XL2N">
-<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal payment">
-<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-</form>
-
+Note we've encountered too many problems with PayPal and so no longer have a PayPal account.
+Please do not donate to any PayPal account claiming to be associated with us!
 <p>
-<a href="donations-cn.html">
-来自中国的捐款者请点击这里，我们为您提供了中文版的捐款指南。
-</a>
-</p>
 
 	  </div>
 	  <footer>
