summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-03 17:43:48 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-03 17:43:48 (GMT)
commit5098d44354d612445aa2dd97a304ed0c0660f236 (patch)
treea64eae2ab546ff0db4d697491b67f1c8847188bf /Doc
parentb87a56a51954f470fa864118793cee97c04dca18 (diff)
parentb351bcca23becfa9097a35d931bc554c329b2615 (diff)
downloadcpython-5098d44354d612445aa2dd97a304ed0c0660f236.zip
cpython-5098d44354d612445aa2dd97a304ed0c0660f236.tar.gz
cpython-5098d44354d612445aa2dd97a304ed0c0660f236.tar.bz2
#11985: merge with 3.1.
Diffstat (limited to 'Doc')
-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 b0431d9..d8e5166 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()