[soc2010/app-loading] merged trunkarchive/soc2010/app-loadingsoc2010/app-loading

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13818 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 18 insertions, 12 deletions

diff --git a/docs/ref/contrib/gis/deployment.txt b/docs/ref/contrib/gis/deployment.txt
index 2cfd367fac..fa7fe69267 100644
--- a/docs/ref/contrib/gis/deployment.txt
+++ b/docs/ref/contrib/gis/deployment.txt
@@ -6,15 +6,15 @@ Deploying GeoDjango
 
     GeoDjango uses the GDAL geospatial library which is
     not thread safe at this time.  Thus, it is *highly* recommended
-    to not use threading when deploying -- in other words, use a 
+    to not use threading when deploying -- in other words, use a
     an appropriate configuration of Apache or the prefork method
     when using FastCGI through another web server.
 
 Apache
 ======
-In this section there are some example ``VirtualHost`` directives for 
+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 
+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
@@ -23,7 +23,7 @@ matter whether the version of Apache is prefork or worker.
 .. note::
 
     The ``Alias`` and ``Directory`` configurations in the the examples
-    below use an example path to a system-wide installation folder of Django.  
+    below use an example path to a system-wide installation folder of Django.
     Substitute in an appropriate location, if necessary, as it may be
     different than the path on your system.
 
@@ -36,7 +36,7 @@ Example::
       WSGIDaemonProcess geodjango user=geo group=geo processes=5 threads=1
       WSGIProcessGroup geodjango
       WSGIScriptAlias / /home/geo/geodjango/world.wsgi
-  
+
       Alias /media/ "/usr/lib/python2.5/site-packages/django/contrib/admin/media/"
       <Directory "/usr/lib/python2.5/site-packages/django/contrib/admin/media/">
         Order allow,deny
@@ -44,25 +44,31 @@ Example::
         Allow from all
         IndexOptions FancyIndexing
       </Directory>
-    
+
     </VirtualHost>
 
 .. warning::
 
     If the ``WSGIDaemonProcess`` attribute ``threads`` is not set to ``1``, then
-    Apache may crash when running your GeoDjango application.  Increase the 
+    Apache may crash when running your GeoDjango application.  Increase the
     number of ``processes`` instead.
 
 For more information, please consult Django's
-:ref:`mod_wsgi documentation <howto-deployment-modwsgi>`.
+:doc:`mod_wsgi documentation </howto/deployment/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/modwsgi>` or any of the
+    other :doc:`supported backends </howto/deployment/index>`.
+
 Example::
 
     <VirtualHost *:80>
-    
+
       <Location "/">
         SetHandler mod_python
         PythonHandler django.core.handlers.modpython
@@ -70,12 +76,12 @@ Example::
         PythonDebug On
         PythonPath "['/var/www/apps'] + sys.path"
       </Location>
-    
+
       Alias /media/ "/usr/lib/python2.5/site-packages/django/contrib/admin/media/"
       <Location "/media">
         SetHandler None
       </Location>
-    
+
     </VirtualHost>
 
 .. warning::
@@ -84,7 +90,7 @@ Example::
    else your GeoDjango application may crash Apache.
 
 For more information, please consult Django's
-:ref:`mod_python documentation <howto-deployment-modpython>`.
+:doc:`mod_python documentation </howto/deployment/modpython>`.
 
 Lighttpd
 ========