From 3abf6105b6c953c6feb28708b9903f583cb28438 Mon Sep 17 00:00:00 2001
From: Preston Holmes <preston@ptone.com>
Date: Sat, 29 Sep 2012 21:46:32 -0700
Subject: [PATCH] Fixed a couple errors and inconsistencies in mod_wsgi docs

Fixes #19042
---
 docs/howto/deployment/wsgi/apache-auth.txt | 14 +++++++-------
 docs/howto/deployment/wsgi/modwsgi.txt     | 10 ++++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/howto/deployment/wsgi/apache-auth.txt b/docs/howto/deployment/wsgi/apache-auth.txt
index 36e3d0233c8..d6594d194f9 100644
--- a/docs/howto/deployment/wsgi/apache-auth.txt
+++ b/docs/howto/deployment/wsgi/apache-auth.txt
@@ -29,7 +29,7 @@ only authenticated users to be able to view:
 
 .. code-block:: apache
 
-    WSGIScriptAlias / /path/to/mysite/config/mysite.wsgi
+    WSGIScriptAlias / /path/to/mysite.com/mysite/wsgi.py
 
     WSGIProcessGroup %{GLOBAL}
     WSGIApplicationGroup django
@@ -39,7 +39,7 @@ only authenticated users to be able to view:
         AuthName "Top Secret"
         Require valid-user
         AuthBasicProvider wsgi
-        WSGIAuthUserScript /path/to/mysite/config/mysite.wsgi
+        WSGIAuthUserScript /path/to/mysite.com/mysite/wsgi.py
     </Location>
 
 The ``WSGIAuthUserScript`` directive tells mod_wsgi to execute the
@@ -72,7 +72,7 @@ check_user function:
 
     os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings'
 
-    from django.contrib.auth.handlers.modwsgi import check_user
+    from django.contrib.auth.handlers.modwsgi import check_password
 
     from django.core.handlers.wsgi import WSGIHandler
     application = WSGIHandler()
@@ -95,7 +95,7 @@ In this case, the Apache configuration should look like this:
 
 .. code-block:: apache
 
-    WSGIScriptAlias / /path/to/mysite/config/mysite.wsgi
+    WSGIScriptAlias / /path/to/mysite.com/mysite/wsgi.py
 
     WSGIProcessGroup %{GLOBAL}
     WSGIApplicationGroup django
@@ -104,8 +104,8 @@ In this case, the Apache configuration should look like this:
         AuthType Basic
         AuthName "Top Secret"
         AuthBasicProvider wsgi
-        WSGIAuthUserScript /path/to/mysite/config/mysite.wsgi
-        WSGIAuthGroupScript /path/to/mysite/config/mysite.wsgi
+        WSGIAuthUserScript /path/to/mysite.com/mysite/wsgi.py
+        WSGIAuthGroupScript /path/to/mysite.com/mysite/wsgi.py
         Require group secret-agents
         Require valid-user
     </Location>
@@ -116,7 +116,7 @@ returns a list groups the given user belongs to.
 
 .. code-block:: python
 
-    from django.contrib.auth.handlers.modwsgi import check_user, groups_for_user
+    from django.contrib.auth.handlers.modwsgi import check_password, groups_for_user
 
 Requests for ``/secret/`` will now also require user to be a member of the
 "secret-agents" group.
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index 01399aa5a6a..fd467cb9950 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -25,7 +25,9 @@ Basic configuration
 ===================
 
 Once you've got mod_wsgi installed and activated, edit your Apache server's
-``httpd.conf`` file and add::
+``httpd.conf`` file and add
+
+.. code-block:: apache
 
     WSGIScriptAlias / /path/to/mysite.com/mysite/wsgi.py
     WSGIPythonPath /path/to/mysite.com
@@ -70,10 +72,10 @@ Using a virtualenv
 
 If you install your project's Python dependencies inside a `virtualenv`_,
 you'll need to add the path to this virtualenv's ``site-packages`` directory to
-your Python path as well. To do this, you can add another line to your
-Apache configuration::
+your Python path as well. To do this, add an additional path to your
+`WSGIPythonPath` directive with multiple paths separated by a colon::
 
-    WSGIPythonPath /path/to/your/venv/lib/python2.X/site-packages
+    WSGIPythonPath /path/to/mysite.com:/path/to/your/venv/lib/python2.X/site-packages
 
 Make sure you give the correct path to your virtualenv, and replace
 ``python2.X`` with the correct Python version (e.g. ``python2.7``).