Skip to content
Browse files

[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
  • Loading branch information...
1 parent 3931829 commit ff4609b686d548b6a4050ee505d30bf96ce6245c @jacobian jacobian committed
Showing with 7 additions and 7 deletions.
  1. +4 −4 docs/howto/deployment/fastcgi.txt
  2. +0 −1 docs/howto/deployment/index.txt
  3. +3 −2 docs/howto/deployment/modpython.txt
View
8 docs/howto/deployment/fastcgi.txt
@@ -7,10 +7,9 @@ How to use Django with FastCGI, SCGI, or AJP
.. highlight:: bash
Although the current preferred setup for running Django is :ref:`Apache with
-mod_python <howto-deployment-modpython>`, many people use shared hosting, on
+mod_wsgi <howto-deployment-modwsgi>`, many people use shared hosting, on
which protocols such as FastCGI, SCGI or AJP are the only viable options. In
-some setups, these protocols also allow better security -- and, possibly, better
-performance -- than mod_python_.
+some setups, these protocols may provide better performance than mod_wsgi_.
.. admonition:: Note
@@ -28,8 +27,9 @@ served with no startup time. Unlike mod_python_ (or `mod_perl`_), a FastCGI
process doesn't run inside the Web server process, but in a separate,
persistent process.
-.. _mod_python: http://www.modpython.org/
+.. _mod_wsgi: http://code.google.com/p/modwsgi/
.. _mod_perl: http://perl.apache.org/
+.. _mod_python: http://www.modpython.org/
.. admonition:: Why run code in a separate process?
View
1 docs/howto/deployment/index.txt
@@ -13,7 +13,6 @@ ways to easily deploy Django:
modwsgi
modpython
- modwsgi
fastcgi
If you're new to deploying Django and/or Python, we'd recommend you try
View
5 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

0 comments on commit ff4609b

Please sign in to comment.
Something went wrong with that request. Please try again.