Merge pull request #2840 from stevepiercy/master

add 3.6 support to documentation

6 files changed, 13 insertions, 13 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
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 47638579b..adad196e4 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -860,7 +860,7 @@ Every release of Pyramid has 100% statement coverage via unit and integration
 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 Travis,
-and Jenkins on Python 2.7, Python 3.4, Python 3.5, and PyPy
+and Jenkins on Python 2.7, Python 3.4, Python 3.5, Python 3.6, and PyPy
 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
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 45c706b0d..5dc7d8816 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -26,7 +26,7 @@ To save a little bit of typing and to be certain that we use the modules,
 scripts, and packages installed in our virtual environment, we'll set an
 environment variable, too.
 
-As an example, for Python 3.5+ on Linux:
+As an example, for Python 3.6+ on Linux:
 
 .. parsed-literal::
 
@@ -729,7 +729,7 @@ This yields the following output.
     collected 1 items
 
     hello_world/tests.py .
-    ------------- coverage: platform darwin, python 3.5.0-final-0 -------------
+    ------------- coverage: platform darwin, python 3.6.0-final-0 -------------
     Name                       Stmts   Miss  Cover   Missing
     --------------------------------------------------------
     hello_world/__init__.py       11      8    27%   11-23
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index afa8ed104..913e08a62 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -19,11 +19,11 @@ virtual environment.)
 
 This *Quick Tutorial* is based on:
 
-* **Python 3.5**. Pyramid fully supports Python 3.4+ and Python 2.7+. This
-  tutorial uses **Python 3.5** but runs fine under Python 2.7.
+* **Python 3.6**. Pyramid fully supports Python 3.4+ and Python 2.7+. This
+  tutorial uses **Python 3.6** but runs fine under Python 2.7.
 
 * **venv**. We believe in virtual environments. For this tutorial, we use
-  Python 3.5's built-in solution :term:`venv`. For Python 2.7, you can install
+  Python 3.6's built-in solution :term:`venv`. For Python 2.7, you can install
   :term:`virtualenv`.
 
 * **pip**. We use :term:`pip` for package management.
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 03e183739..ec79a4e9c 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -66,7 +66,7 @@ Python 2.7:
 
    c:\> c:\Python27\Scripts\virtualenv %VENV%
 
-Python 3.5:
+Python 3.6:
 
 .. code-block:: doscon
 
@@ -310,13 +310,13 @@ If successful, you will see output something like this:
 .. code-block:: bash
 
    ======================== test session starts ========================
-   platform Python 3.5.1, pytest-2.9.1, py-1.4.31, pluggy-0.3.1
+   platform Python 3.6.0, pytest-2.9.1, py-1.4.31, pluggy-0.3.1
    rootdir: /Users/stevepiercy/projects/pyramidtut/tutorial, inifile:
    plugins: cov-2.2.1
    collected 1 items
 
    tutorial/tests.py .
-   ------------------ coverage: platform Python 3.5.1 ------------------
+   ------------------ coverage: platform Python 3.6.0 ------------------
    Name                   Stmts   Miss  Cover   Missing
    ----------------------------------------------------
    tutorial/__init__.py      12      7    42%   7-8, 14-18
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 75d5d4abd..fa990fb01 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -66,7 +66,7 @@ Python 2.7:
 
    c:\> c:\Python27\Scripts\virtualenv %VENV%
 
-Python 3.5:
+Python 3.6:
 
 .. code-block:: doscon
 
@@ -327,13 +327,13 @@ If successful, you will see output something like this:
 .. code-block:: bash
 
    ======================== test session starts ========================
-   platform Python 3.5.1, pytest-2.9.1, py-1.4.31, pluggy-0.3.1
+   platform Python 3.6.0, pytest-2.9.1, py-1.4.31, pluggy-0.3.1
    rootdir: /Users/stevepiercy/projects/pyramidtut/tutorial, inifile:
    plugins: cov-2.2.1
    collected 2 items
 
    tutorial/tests.py ..
-   ------------------ coverage: platform Python 3.5.1 ------------------
+   ------------------ coverage: platform Python 3.6.0 ------------------
    Name                               Stmts   Miss  Cover   Missing
    ----------------------------------------------------------------
    tutorial/__init__.py                   8      6    25%   7-12