Merge branch 'master' into feature.instance-properties

1 files changed, 10 insertions, 4 deletions

diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index c2baa5bd8..d11167344 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -73,9 +73,10 @@ commands and files.
 
     .. code-block:: python
 
-       from pyramid.paster import get_app
-       application = get_app(
-         '/Users/chrism/modwsgi/env/myapp/production.ini', 'main')
+       from pyramid.paster import get_app, setup_logging
+       ini_path = '/Users/chrism/modwsgi/env/myapp/production.ini'
+       setup_logging(ini_path)
+       application = get_app(ini_path, 'main')
 
     The first argument to ``get_app`` is the project configuration file
     name.  It's best to use the ``production.ini`` file provided by your
@@ -85,6 +86,10 @@ commands and files.
     ``application`` is important: mod_wsgi requires finding such an
     assignment when it opens the file.
 
+    The call to ``setup_logging`` initializes the standard library's
+    `logging` module to allow logging within your application.
+    See :ref:`logging_config`.
+
 #.  Make the ``pyramid.wsgi`` script executable.
 
     .. code-block:: text
@@ -99,7 +104,8 @@ commands and files.
     .. code-block:: apache
 
        # Use only 1 Python sub-interpreter.  Multiple sub-interpreters
-       # play badly with C extensions.
+       # play badly with C extensions.  See
+       # http://stackoverflow.com/a/10558360/209039
        WSGIApplicationGroup %{GLOBAL}
        WSGIPassAuthorization On
        WSGIDaemonProcess pyramid user=chrism group=staff threads=4 \