[pypy-svn] extradoc extradoc: 3 way merge

lac commits-noreply at bitbucket.org
Mon Mar 21 20:56:17 CET 2011


Author: Laura Creighton <lac at openend.se>
Branch: extradoc
Changeset: r3388:ad020dac5904
Date: 2011-03-21 20:55 +0100
http://bitbucket.org/pypy/extradoc/changeset/ad020dac5904/

Log:	3 way merge

diff --git a/blog/draft/thank-you-psf.rst b/blog/draft/thank-you-psf.rst
--- a/blog/draft/thank-you-psf.rst
+++ b/blog/draft/thank-you-psf.rst
@@ -1,22 +1,25 @@
 A thank you to the PSF
 ======================
 
-This year's PyCon was an incredible time, several members of the PyPy team were
-there, and we'll be blogging more about our experienced in the coming days,
-however for now we wanted to extend a thank you to the `Python Software
+This year's PyCon was an incredible time; several members of the PyPy team were
+there, and we'll be blogging more about our experiences in the coming days.
+However, we quickly wanted to extend a thank you to the `Python Software
 Foundation (PSF) <http://www.python.org/psf/>`_.
 
 As you may have heard, on Friday morning at PyCon Jesse Noller handed the PyPy
 team a check for $10,000, on behalf of the PSF.  This was in recognition of our
-success in the past few years bringing PyPy from a research project to a fast,
-compliant, production ready Python implementation, and to allow us to continue
-our work on making it faster and more up to date with upstream version changes.
+success over the past few years in bringing PyPy from a research project 
+to a fast,
+compliant, production-ready Python implementation, and to allow us to continue
+our work on making it faster and more up-to-date with upstream version changes.
 
 Beyond the large check, we're grateful for the endorsement this represents,
-both of our work on PyPy, as well as all alternative Python VMs.  The PSF has
-shifted its focus from representing just CPython to all of the Python
-implementation, which we are very appreciative of.
+not only of our work on PyPy, but also of all alternatve Python VMs.  
+The PSF has
+shifted its focus from representing just CPython to representing the Python
+Language, reguardless of its implementation, something
+we are very appreciative of.
 
 .. image:: xxx.png
 
-Thanks you, PSF.
+Thank you, PSF.


More information about the Pypy-commit mailing list