diff options
| author | Simon Willison <simon@simonwillison.net> | 2009-04-07 00:01:49 +0000 |
|---|---|---|
| committer | Simon Willison <simon@simonwillison.net> | 2009-04-07 00:01:49 +0000 |
| commit | 37c21ef05d678d09a1143c3699c2165d0b8fa300 (patch) | |
| tree | 6dae217a3800e87c38e7f5755d98872556347ca2 /docs | |
| parent | 7f7606070bd97444cee1c130022b4b7929d3c875 (diff) | |
Fixed #10714 - made mod_wsgi recommendation consistent across deployment documentation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/deployment/fastcgi.txt | 8 | ||||
| -rw-r--r-- | docs/howto/deployment/modpython.txt | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/docs/howto/deployment/fastcgi.txt b/docs/howto/deployment/fastcgi.txt index c29fa17d9a..cf05174390 100644 --- a/docs/howto/deployment/fastcgi.txt +++ b/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? 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 |