Merge remote branch 'source/master'

Conflicts:
	docs/narr/hooks.rst

1 files changed, 16 insertions, 13 deletions

diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index 766f05b56..5da7f32c7 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -14,12 +14,12 @@ This particular tutorial was developed under Apple's Mac OS X platform
 largely the same for all systems, delta specific path information for
 commands and files.
 
-.. note:: Unfortunately these instructions almost certainly won't work
-   for deploying a :app:`Pyramid` application on a Windows system
-   using ``mod_wsgi``.  If you have experience with :app:`Pyramid`
-   and ``mod_wsgi`` on Windows systems, please help us document
-   this experience by submitting documentation to the `mailing list
-   <http://lists.repoze.org/listinfo/repoze-dev>`_.
+.. note:: Unfortunately these instructions almost certainly won't work for
+   deploying a :app:`Pyramid` application on a Windows system using
+   ``mod_wsgi``.  If you have experience with :app:`Pyramid` and ``mod_wsgi``
+   on Windows systems, please help us document this experience by submitting
+   documentation to the `Pylons-devel maillist
+   <http://groups.google.com/group/pylons-devel>`_.
 
 #.  The tutorial assumes you have Apache already installed on your
     system.  If you do not, install Apache 2.X for your platform in
@@ -75,13 +75,15 @@ commands and files.
 
        from pyramid.paster import get_app
        application = get_app(
-         '/Users/chrism/modwsgi/env/myapp/myapp.ini', 'main')
+         '/Users/chrism/modwsgi/env/myapp/production.ini', 'main')
 
-    The first argument to ``get_app`` is the project Paste
-    configuration file name.  The second is the name of the section
-    within the .ini file that should be loaded by ``mod_wsgi``.  The
-    assignment to the name ``application`` is important: mod_wsgi
-    requires finding such an assignment when it opens the file.
+    The first argument to ``get_app`` is the project Paste configuration file
+    name.  It's best to use the ``production.ini`` file provided by your
+    Pyramid paster template, as it contains settings appropriate for
+    production.  The second is the name of the section within the .ini file
+    that should be loaded by ``mod_wsgi``.  The assignment to the name
+    ``application`` is important: mod_wsgi requires finding such an
+    assignment when it opens the file.
 
 #.  Make the ``pyramid.wsgi`` script executable.
 
@@ -100,7 +102,8 @@ commands and files.
        # play badly with C extensions.
        WSGIApplicationGroup %{GLOBAL}
        WSGIPassAuthorization On
-       WSGIDaemonProcess pyramid user=chrism group=staff processes=1 threads=4 \
+       WSGIDaemonProcess pyramid user=chrism group=staff processes=1 \
+          threads=4 \
           python-path=/Users/chrism/modwsgi/env/lib/python2.6/site-packages
        WSGIScriptAlias /myapp /Users/chrism/modwsgi/env/pyramid.wsgi