summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-12-10 00:01:05 -0600
committerMichael Merickel <michael@merickel.org>2016-12-10 00:01:05 -0600
commit1fde5f47b8b6208a25e951c6d3887cc73cc3696e (patch)
tree1975f4d89d0422aaabd09b9bf94ac0da93534f8d /docs/quick_tutorial
parentff0da73a8922b5e82c676715078c7b9e60a6a1da (diff)
parent2d45def603f038a8533eb9790640982012c0be30 (diff)
downloadpyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.gz
pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.bz2
pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.zip
Merge branch 'master' into pserve-watch-files
Diffstat (limited to 'docs/quick_tutorial')
-rw-r--r--docs/quick_tutorial/requirements.rst6
1 files changed, 3 insertions, 3 deletions
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.