summaryrefslogtreecommitdiffstats
path: root/Doc/library/platform.rst
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-03 17:44:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-03 17:44:26 (GMT)
commit4e787aeed6079bc3ddda13be8b18a4e8992cd561 (patch)
treeb962c6c842091c70fe61bd869d56f5f716bd09f9 /Doc/library/platform.rst
parent6f26be09e0f88edc7b2cdb4d6695c79dd6105a28 (diff)
parent5098d44354d612445aa2dd97a304ed0c0660f236 (diff)
downloadcpython-4e787aeed6079bc3ddda13be8b18a4e8992cd561.zip
cpython-4e787aeed6079bc3ddda13be8b18a4e8992cd561.tar.gz
cpython-4e787aeed6079bc3ddda13be8b18a4e8992cd561.tar.bz2
#11985: merge with 3.2.
Diffstat (limited to 'Doc/library/platform.rst')
-rw-r--r--Doc/library/platform.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index 76256aa..5928c5f 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -107,7 +107,7 @@ Cross Platform
.. 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()