summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-04-14 16:46:59 -0400
committerMichael Merickel <michael@merickel.org>2014-04-14 16:46:59 -0400
commita51a5627b0dda868f467588c464215d6f74a0958 (patch)
treeb10db495286fdf3666e38095f53acfd506024a19 /docs
parent77005d96fa57a83ac91c2547892fbb3e3c34e553 (diff)
downloadpyramid-a51a5627b0dda868f467588c464215d6f74a0958.tar.gz
pyramid-a51a5627b0dda868f467588c464215d6f74a0958.tar.bz2
pyramid-a51a5627b0dda868f467588c464215d6f74a0958.zip
clarify python version support
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/install.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index e419a8b20..a6ae7df60 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -15,8 +15,8 @@ You will need `Python <http://python.org>`_ version 2.6 or better to run
.. sidebar:: Python Versions
As of this writing, :app:`Pyramid` has been tested under Python 2.6, Python
- 2.7, Python 3.2, and Python 3.3. :app:`Pyramid` does not run under any
- version of Python before 2.6.
+ 2.7, Python 3.2, Python 3.3, Python 3.4 and PyPy 2.2. :app:`Pyramid` does
+ not run under any version of Python before 2.6.
:app:`Pyramid` is known to run on all popular UNIX-like systems such as Linux,
Mac OS X, and FreeBSD as well as on Windows platforms. It is also known to run