Fixed #18029 -- Removed mod_python as of deprecation process. Thanks Aymeric Augustin for the review.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17835 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 5 insertions, 45 deletions

diff --git a/docs/ref/contrib/gis/deployment.txt b/docs/ref/contrib/gis/deployment.txt
index c50a3782dc..d98fc51837 100644
--- a/docs/ref/contrib/gis/deployment.txt
+++ b/docs/ref/contrib/gis/deployment.txt
@@ -13,11 +13,9 @@ Deploying GeoDjango
 Apache
 ======
 In this section there are some example ``VirtualHost`` directives for
-when deploying using either ``mod_python`` or ``mod_wsgi``.  At this
-time, we recommend ``mod_wsgi``, as it is now officially recommended
-way to deploy Django applications with Apache.  Moreover, if
-``mod_python`` is used, then a prefork version of Apache must also be
-used.  As long as ``mod_wsgi`` is configured correctly, it does not
+when deploying using ``mod_wsgi``, which is now officially the recommended
+way to deploy Django applications with Apache.
+As long as ``mod_wsgi`` is configured correctly, it does not
 matter whether the version of Apache is prefork or worker.
 
 .. note::
@@ -56,42 +54,6 @@ Example::
 For more information, please consult Django's
 :doc:`mod_wsgi documentation </howto/deployment/wsgi/modwsgi>`.
 
-``mod_python``
---------------
-
-.. warning::
-    Support for mod_python will be deprecated in a future release of Django. If
-    you are configuring a new deployment, you are strongly encouraged to
-    consider using :doc:`mod_wsgi </howto/deployment/wsgi/modwsgi>` or any of
-    the other :doc:`supported servers </howto/deployment/index>`.
-
-Example::
-
-    <VirtualHost *:80>
-
-      <Location "/">
-        SetHandler mod_python
-        PythonHandler django.core.handlers.modpython
-        SetEnv DJANGO_SETTINGS_MODULE world.settings
-        PythonDebug On
-        PythonPath "['/var/www/apps'] + sys.path"
-      </Location>
-
-      Alias /media/ "/usr/lib/python2.6/site-packages/django/contrib/admin/media/"
-      <Location "/media">
-        SetHandler None
-      </Location>
-
-    </VirtualHost>
-
-.. warning::
-
-   When using ``mod_python`` you *must* be using a prefork version of Apache, or
-   else your GeoDjango application may crash Apache.
-
-For more information, please consult Django's
-:doc:`mod_python documentation </howto/deployment/modpython>`.
-
 Lighttpd
 ========
 
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index c0ae73e1db..ae736b1c75 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -56,15 +56,13 @@ All attributes except ``session`` should be considered read-only.
 .. attribute:: HttpRequest.path_info
 
     Under some Web server configurations, the portion of the URL after the host
-    name is split up into a script prefix portion and a path info portion
-    (this happens, for example, when using the ``django.root`` option
-    with the :doc:`modpython handler from Apache </howto/deployment/modpython>`).
+    name is split up into a script prefix portion and a path info portion.
     The ``path_info`` attribute always contains the path info portion of the
     path, no matter what Web server is being used. Using this instead of
     attr:`~HttpRequest.path` can make your code much easier to move between test
     and deployment servers.
 
-    For example, if the ``django.root`` for your application is set to
+    For example, if the ``WSGIScriptAlias`` for your application is set to
     ``"/minfo"``, then ``path`` might be ``"/minfo/music/bands/the_beatles/"``
     and ``path_info`` would be ``"/music/bands/the_beatles/"``.