Merge branch 'master' of github.com:Pylons/pyramid

1 files changed, 9 insertions, 5 deletions

diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
index 96dfc5b5f..e4f30405f 100644
--- a/docs/quick_tutorial/ini.rst
+++ b/docs/quick_tutorial/ini.rst
@@ -89,7 +89,7 @@ application. Processing then proceeds as described in the Pyramid chapter on
 
 - ``pserve`` looks for ``[app:main]`` and finds ``use = egg:tutorial``.
 
-- The projects's ``setup.py`` has defined an "entry point" (lines 9-12) for the
+- The projects's ``setup.py`` has defined an "entry point" (lines 10-13) for the
   project's "main" entry point of ``tutorial:main``.
 
 - The ``tutorial`` package's ``__init__`` has a ``main`` function.
@@ -99,10 +99,14 @@ application. Processing then proceeds as described in the Pyramid chapter on
 
 The ``.ini`` file is also used for two other functions:
 
-- *Configuring the WSGI server*. ``[server:main]`` wires up the choice of which
-  WSGI *server* for your WSGI *application*. In this case, we are using
-  ``wsgiref`` bundled in the Python library. It also wires up the *port
-  number*: ``port = 6543`` tells ``wsgiref`` to listen on port 6543.
+- *Configuring the WSGI server*. ``[server:main]`` wires up the choice
+  of which WSGI *server* for your WSGI *application*. In this case, we
+  are using ``waitress`` which we specified in
+  ``tutorial/setup.py`` and was installed in the :doc:`requirements` step at the start of this tutorial.  It also wires up the *port number*:
+  ``listen = localhost:6543`` tells ``waitress`` to listen on host
+  ``localhost`` at port ``6543``.
+
+  .. note:: Running the command ``$VENV/bin/pip install -e .`` will check for previously installed packages in our virtual environment that are specified in our package's ``setup.py`` file, then install our package in editable mode, installing any requirements that were not previously installed.  If a requirement was manually installed previously on the command line or otherwise, in this case Waitress, then ``$VENV/bin/pip install -e .`` will merely check that it is installed and move on.
 
 - *Configuring Python logging*. Pyramid uses Python standard logging, which
   needs a number of configuration values. The ``.ini`` serves this function.