[pypy-commit] pypy.org extradoc: regen html and fix rest
fijal
noreply at buildbot.pypy.org
Tue Sep 20 23:00:15 CEST 2011
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r267:637f12287c0c
Date: 2011-09-20 23:00 +0200
http://bitbucket.org/pypy/pypy.org/changeset/637f12287c0c/
Log: regen html and fix rest
diff --git a/py3donate.html b/py3donate.html
--- a/py3donate.html
+++ b/py3donate.html
@@ -67,11 +67,7 @@
Krekel and Jacob Hallen and they will - in close collaboration - with
Conservancy and the core developers, select the best developers for
the Python 3 porting job among well known PyPy contributors.</p>
-<p>If you want to see PyPy support Python 3 and Python 2, donate here:</p>
-<blockquote>
-XXX insert links to Paypal and Google Chekcout links categorized such
-that things will get accounted properly on the Conservancy side</blockquote>
-<p>Should we not receive enough donations to complete all stages by 1st March 2012
+<p>If you want to see PyPy support Python 3 and Python 2, donate here:</p><p>Should we not receive enough donations to complete all stages by 1st March 2012
at the latest, we will try our best to make PyPy support Python 3 anyway. We
however reserve the right to shift any unused funds to other PyPy activities
when that date is reached. Of course, since the Conservancy is a
@@ -79,7 +75,7 @@
regardless of their use, be spent in a way that benefits the general
public, the advancement of Open Source and Free Software,
and in particular the PyPy community and the PyPy codebase.</p>
-<p><strong>Note</strong> For donations higher than $XXX we can arrange for an invoice
+<p><strong>Note</strong> For donations higher than $1,000, we can arrange for an invoice
and a different payment method to avoid the high Paypal fees. Please
contact pypy at sfconservancy.org if you want to know details on how
to donate via other means.</p>
diff --git a/source/py3donate.txt b/source/py3donate.txt
--- a/source/py3donate.txt
+++ b/source/py3donate.txt
@@ -30,44 +30,46 @@
the Python 3 porting job among well known PyPy contributors.
If you want to see PyPy support Python 3 and Python 2, donate here:
+
.. raw: html
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="hidden" name="cmd" value="_s-xclick">
- <input type="hidden" name="hosted_button_id" value="XBG5EK3URC5G8">
- <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
- <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
- </form>
- <script type="text/javascript">
- function validateAmount(amount){
- if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
- return true;
- }else{
- alert('You must enter a valid donation.');
- amount.focus();
- return false;
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="hosted_button_id" value="XBG5EK3URC5G8">
+ <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+ <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+ </form>
+
+ <script type="text/javascript">
+ function validateAmount(amount){
+ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
+ return true;
+ }else{
+ alert('You must enter a valid donation.');
+ amount.focus();
+ return false;
}
}
- </script>
- <form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
- <input name="item_name_1" type="hidden" value="Directed Donation for PyPy's Py3k project"/>
- <input name="item_description_1" type="hidden" value="Donation to Software Freedom Conservancy directed for PyPy's Py3k project: http://pypy.org/py3donate.html"/>
- <input name="item_quantity_1" type="hidden" value="1"/>
- <input name="item_currency_1" type="hidden" value="USD"/>
- <input name="item_is_modifiable_1" type="hidden" value="true"/>
- <input name="item_min_price_1" type="hidden" value="0.01"/>
- <input name="item_max_price_1" type="hidden" value="25000.0"/>
- <input name="_charset_" type="hidden" value="utf-8"/>
- <table cellpadding="5" cellspacing="0" width="1%">
- <tr>
- <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="10.00"/>
- </td>
- <td align="left" width="1%">
- <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image"/>
- </td>
- </tr>
- </table>
- </form>
+ </script>
+ <form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
+ <input name="item_name_1" type="hidden" value="Directed Donation for PyPy's Py3k project"/>
+ <input name="item_description_1" type="hidden" value="Donation to Software Freedom Conservancy directed for PyPy's Py3k project: http://pypy.org/py3donate.html"/>
+ <input name="item_quantity_1" type="hidden" value="1"/>
+ <input name="item_currency_1" type="hidden" value="USD"/>
+ <input name="item_is_modifiable_1" type="hidden" value="true"/>
+ <input name="item_min_price_1" type="hidden" value="0.01"/>
+ <input name="item_max_price_1" type="hidden" value="25000.0"/>
+ <input name="_charset_" type="hidden" value="utf-8"/>
+ <table cellpadding="5" cellspacing="0" width="1%">
+ <tr>
+ <td align="right" nowrap="nowrap" width="1%">$ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="10.00"/>
+ </td>
+ <td align="left" width="1%">
+ <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image"/>
+ </td>
+ </tr>
+ </table>
+ </form>
Should we not receive enough donations to complete all stages by 1st March 2012
at the latest, we will try our best to make PyPy support Python 3 anyway. We
More information about the pypy-commit
mailing list