summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
commit1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad (patch)
tree0db5dd6f25a9166c118c4a24d66f281f43b0aeba /docs/tutorials/wiki
parent30ae71b4a7ad97a649165374a75a70f4b64ae25c (diff)
parentaa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff)
downloadpyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.gz
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.bz2
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/tutorials/wiki')
-rw-r--r--docs/tutorials/wiki/design.rst4
-rw-r--r--docs/tutorials/wiki/installation.rst4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/tutorials/wiki/design.rst b/docs/tutorials/wiki/design.rst
index 49c30d29a..46c2a2f30 100644
--- a/docs/tutorials/wiki/design.rst
+++ b/docs/tutorials/wiki/design.rst
@@ -1,6 +1,6 @@
-==========
+======
Design
-==========
+======
Following is a quick overview of the design of our wiki application, to help
us understand the changes that we will be making as we work through the
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 20df389c6..ff5cac4c9 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -65,11 +65,11 @@ Python 2.7:
c:\> c:\Python27\Scripts\virtualenv %VENV%
-Python 3.2:
+Python 3.3:
.. code-block:: text
- c:\> c:\Python32\Scripts\virtualenv %VENV%
+ c:\> c:\Python33\Scripts\virtualenv %VENV%
Install Pyramid and tutorial dependencies into the virtual Python environment
-----------------------------------------------------------------------------