summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/ini.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-23 14:57:01 -0400
committerChris McDonough <chrism@plope.com>2014-05-23 14:57:01 -0400
commitd76bdb514c92ee1fd9b1bd67387d15d34ea28bb3 (patch)
tree36784e20002ecc4cb6675901b3cc2bda36e54caa /docs/quick_tutorial/ini.rst
parent0c5bb0aa329239df877ccb053280e398766eb434 (diff)
parentc740e8bd20c049cbab43ce0a1cd5a4533fe6b849 (diff)
downloadpyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.gz
pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.bz2
pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/quick_tutorial/ini.rst')
-rw-r--r--docs/quick_tutorial/ini.rst16
1 files changed, 7 insertions, 9 deletions
diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
index 618b8e5e8..3402c50e8 100644
--- a/docs/quick_tutorial/ini.rst
+++ b/docs/quick_tutorial/ini.rst
@@ -98,18 +98,16 @@ the Pyramid chapter on
The ``.ini`` file is also used for two other functions:
-- *Choice of WSGI server*. ``[server:main]`` wires up the choice of WSGI
- *server* for your WSGI *application*. In this case, we are using
- ``wsgiref`` bundled in the Python library.
+- *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.
-- *Python logging*. Pyramid uses Python standard logging, which needs a
- number of configuration values. The ``.ini`` serves this function.
+- *Configuring Python logging*. Pyramid uses Python standard logging, which
+ needs a number of configuration values. The ``.ini`` serves this function.
This provides the console log output that you see on startup and each
request.
-- *Port number*. ``port = 6543`` tells ``wsgiref`` to listen on port
- 6543.
-
We moved our startup code from ``app.py`` to the package's
``tutorial/__init__.py``. This isn't necessary,
but it is a common style in Pyramid to take the WSGI app bootstrapping
@@ -131,7 +129,7 @@ Extra Credit
might you want to do that?
#. The entry point in ``setup.py`` didn't mention ``__init__.py`` when
- it the ``main`` function. Why not?
+ it declared ``tutorial:main`` function. Why not?
.. seealso::
:ref:`project_narr`,