[Python-checkins] cpython (merge 3.2 -> default): #11985: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/847a38d787be
changeset:   69809:847a38d787be
parent:      69805:f8a697bc3ca8
parent:      69808:5e661f5c301a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue May 03 20:44:26 2011 +0300
summary:
  #11985: merge with 3.2.

files:
  Doc/library/platform.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -107,7 +107,7 @@
 .. function:: python_implementation()
 
    Returns a string identifying the Python implementation. Possible return values
-   are: 'CPython', 'IronPython', 'Jython'.
+   are: 'CPython', 'IronPython', 'Jython', 'PyPy'.
 
 
 .. function:: python_revision()

-- 
Repository URL: http://hg.python.org/cpython