summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-01-13 13:28:34 -0800
committerSteve Piercy <web@stevepiercy.com>2016-01-13 13:28:34 -0800
commit5dfb7824ba6d0f20a2dfd527f9bafa1db9263a08 (patch)
tree94c988a31ae6fc204dd178f164e410f38ec3290e /docs
parent0da16e80373ebcac5b84a52592ecfa8169bab10a (diff)
parent384007c4e6e1c0c397b9c643c8c34bdf0ddf4b07 (diff)
downloadpyramid-5dfb7824ba6d0f20a2dfd527f9bafa1db9263a08.tar.gz
pyramid-5dfb7824ba6d0f20a2dfd527f9bafa1db9263a08.tar.bz2
pyramid-5dfb7824ba6d0f20a2dfd527f9bafa1db9263a08.zip
Merge pull request #2231 from stevepiercy/master
update for python 3.5
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/install.rst2
-rw-r--r--docs/narr/introduction.rst8
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 164442262..381e325df 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -46,7 +46,7 @@ Alternatively, you can use the `homebrew <http://brew.sh/>`_ package manager.
# for python 2.7
$ brew install python
- # for python 3.4
+ # for python 3.5
$ brew install python3
If you use an installer for your Python, then you can skip to the section
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 7906dd85d..40f465b0a 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -861,10 +861,10 @@ tests, as measured by the ``coverage`` tool available on PyPI. It also has
greater than 95% decision/condition coverage as measured by the
``instrumental`` tool available on PyPI. It is automatically tested by the
Jenkins tool on Python 2.6, Python 2.7, Python 3.2, Python 3.3, Python 3.4,
-PyPy, and PyPy3 after each commit to its GitHub repository. Official Pyramid
-add-ons are held to a similar testing standard. We still find bugs in Pyramid
-and its official add-ons, but we've noticed we find a lot more of them while
-working on other projects that don't have a good testing regime.
+Python 3.5, PyPy, and PyPy3 after each commit to its GitHub repository.
+Official Pyramid add-ons are held to a similar testing standard. We still find
+bugs in Pyramid and its official add-ons, but we've noticed we find a lot more
+of them while working on other projects that don't have a good testing regime.
Example: http://jenkins.pylonsproject.org/