From 2596cf1652d856d207b30b193051e33cb5f0b6b4 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 22 Nov 2010 12:29:22 +0000
Subject: [PATCH] Clarified a comment in the mod_python docs on the status of
 the handler. Thanks to mattmcc for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/howto/deployment/modpython.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
index 5bb09d8c24..d8c9c4ca3f 100644
--- a/docs/howto/deployment/modpython.txt
+++ b/docs/howto/deployment/modpython.txt
@@ -4,10 +4,11 @@ How to use Django with Apache and 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/modwsgi>` or any of the
-    other :doc:`supported backends </howto/deployment/index>`.
+    Support for mod_python has been deprecated, and will be removed in
+    Django 1.5. If you are configuring a new deployment, you are
+    strongly encouraged to consider using :doc:`mod_wsgi
+    </howto/deployment/modwsgi>` or any of the other :doc:`supported
+    backends </howto/deployment/index>`.
 
 .. highlight:: apache
 
@@ -218,15 +219,15 @@ log and can even `cause response errors`_.
 
 .. _cause response errors: http://blog.dscpl.com.au/2009/04/wsgi-and-printing-to-standard-output.html
 
-If you have the need to print debugging information in a mod_python setup, you 
+If you have the need to print debugging information in a mod_python setup, you
 have a few options. You can print to ``stderr`` explicitly, like so::
- 
+
     print >> sys.stderr, 'debug text'
     sys.stderr.flush()
- 
+
 (note that ``stderr`` is buffered, so calling ``flush`` is necessary if you wish
 debugging information to be displayed promptly.)
- 
+
 A more compact approach is to use an assertion::
 
     assert False, 'debug text'