summaryrefslogtreecommitdiff
path: root/docs/howto/deployment/modpython.txt
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-04-07 19:11:20 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-04-07 19:11:20 +0000
commitff4609b686d548b6a4050ee505d30bf96ce6245c (patch)
tree46dee0b6b25f48153d2c72e3885ed1a228cd38fc /docs/howto/deployment/modpython.txt
parent3931829c6e2251f992b24701b893d20720f0384e (diff)
[1.0.X] Fixed #10714 - made mod_wsgi recommendation consistent across deployment documentation, and removed duplicate modwsgi nav link. Backport of r10411 and r10413 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/howto/deployment/modpython.txt')
-rw-r--r--docs/howto/deployment/modpython.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
index 331515bdd8..9ba1c2f9fb 100644
--- a/docs/howto/deployment/modpython.txt
+++ b/docs/howto/deployment/modpython.txt
@@ -6,8 +6,9 @@ How to use Django with Apache and mod_python
.. highlight:: apache
-Apache_ with `mod_python`_ currently is the preferred setup for using Django
-on a production server.
+The `mod_python`_ module for Apache_ can be used to deploy Django to a
+production server, although it has been mostly superseded by the simpler
+:ref:`mod_wsgi deployment option <howto-deployment-modwsgi>`.
mod_python is similar to (and inspired by) `mod_perl`_ : It embeds Python within
Apache and loads Python code into memory when the server starts. Code stays in