Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #10714 - made mod_wsgi recommendation consistent across deploym…

…ent documentation

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 37c21ef05d678d09a1143c3699c2165d0b8fa300 1 parent 7f76060
authored
8  docs/howto/deployment/fastcgi.txt
@@ -7,10 +7,9 @@ How to use Django with FastCGI, SCGI, or AJP
7 7
 .. highlight:: bash
8 8
 
9 9
 Although the current preferred setup for running Django is :ref:`Apache with
10  
-mod_python <howto-deployment-modpython>`, many people use shared hosting, on
  10
+mod_wsgi <howto-deployment-modwsgi>`, many people use shared hosting, on
11 11
 which protocols such as FastCGI, SCGI or AJP are the only viable options. In
12  
-some setups, these protocols also allow better security -- and, possibly, better
13  
-performance -- than mod_python_.
  12
+some setups, these protocols may provide better performance than mod_wsgi_.
14 13
 
15 14
 .. admonition:: Note
16 15
 
@@ -28,8 +27,9 @@ served with no startup time. Unlike mod_python_ (or `mod_perl`_), a FastCGI
28 27
 process doesn't run inside the Web server process, but in a separate,
29 28
 persistent process.
30 29
 
31  
-.. _mod_python: http://www.modpython.org/
  30
+.. _mod_wsgi: http://code.google.com/p/modwsgi/
32 31
 .. _mod_perl: http://perl.apache.org/
  32
+.. _mod_python: http://www.modpython.org/
33 33
 
34 34
 .. admonition:: Why run code in a separate process?
35 35
 
5  docs/howto/deployment/modpython.txt
@@ -6,8 +6,9 @@ How to use Django with Apache and mod_python
6 6
 
7 7
 .. highlight:: apache
8 8
 
9  
-Apache_ with `mod_python`_ currently is the preferred setup for using Django
10  
-on a production server.
  9
+The `mod_python`_ module for Apache_ can be used to deploy Django to a 
  10
+production server, although it has been mostly superseded by the simpler 
  11
+:ref:`mod_wsgi deployment option <howto-deployment-modwsgi>`.
11 12
 
12 13
 mod_python is similar to (and inspired by) `mod_perl`_ : It embeds Python within
13 14
 Apache and loads Python code into memory when the server starts. Code stays in

0 notes on commit 37c21ef

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