summaryrefslogtreecommitdiff
path: root/docs/narr/install.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-11-28 20:33:08 -0800
committerGitHub <noreply@github.com>2016-11-28 20:33:08 -0800
commit968bebc0d1cbb6d85eb446b41c0f4560383c3022 (patch)
tree510ca54cbff453f52251c3ca95f4acbdd07d8360 /docs/narr/install.rst
parentaf01a5ac5e31a778be8d634a560983fe818746bf (diff)
parentc8a5e024478d274309935251d59cd20908a95067 (diff)
downloadpyramid-968bebc0d1cbb6d85eb446b41c0f4560383c3022.tar.gz
pyramid-968bebc0d1cbb6d85eb446b41c0f4560383c3022.tar.bz2
pyramid-968bebc0d1cbb6d85eb446b41c0f4560383c3022.zip
Merge pull request #2840 from stevepiercy/master
add 3.6 support to documentation
Diffstat (limited to 'docs/narr/install.rst')
-rw-r--r--docs/narr/install.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 570cb2285..c3c2ba64c 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -22,7 +22,7 @@ the following sections.
.. sidebar:: Python Versions
As of this writing, :app:`Pyramid` is tested against Python 2.7,
- Python 3.4, Python 3.5, PyPy.
+ Python 3.4, Python 3.5, Python 3.6, and PyPy.
: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