summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/installation.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-13 13:13:47 -0800
committerSteve Piercy <web@stevepiercy.com>2016-12-13 13:13:47 -0800
commit9bbed79e04378d6534c07d73ab801191f0489e88 (patch)
tree6ec01ee3cb5389cd0cbe8234280bf4408123659d /docs/tutorials/wiki2/installation.rst
parent4393f8b8e54e636b5655e0a8d2477e0b15820f68 (diff)
parent884bcdc628e7144abf8e1cd1cde1ed3019e7e699 (diff)
downloadpyramid-9bbed79e04378d6534c07d73ab801191f0489e88.tar.gz
pyramid-9bbed79e04378d6534c07d73ab801191f0489e88.tar.bz2
pyramid-9bbed79e04378d6534c07d73ab801191f0489e88.zip
Merge remote-tracking branch 'upstream/pcreate-to-cookiecutter' into pcreate-to-cookiecutter
Diffstat (limited to 'docs/tutorials/wiki2/installation.rst')
-rw-r--r--docs/tutorials/wiki2/installation.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 0440c2d1d..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
@@ -457,7 +457,8 @@ working directory. This is an SQLite database with a single table defined in it
Start the application
---------------------
-Start the application.
+Start the application. See :ref:`what_is_this_pserve_thing` for more
+information on ``pserve``.
On UNIX
^^^^^^^