Author: simon Date: 2009-04-06 19:01:49 -0500 (Mon, 06 Apr 2009) New Revision: 10413
Modified: django/trunk/docs/howto/deployment/fastcgi.txt django/trunk/docs/howto/deployment/modpython.txt Log: Fixed #10714 - made mod_wsgi recommendation consistent across deployment documentation Modified: django/trunk/docs/howto/deployment/fastcgi.txt =================================================================== --- django/trunk/docs/howto/deployment/fastcgi.txt 2009-04-06 23:45:56 UTC (rev 10412) +++ django/trunk/docs/howto/deployment/fastcgi.txt 2009-04-07 00:01:49 UTC (rev 10413) @@ -7,10 +7,9 @@ .. 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 @@ process doesn't run inside the Web server process, but in a separate, persistent process. +.. _mod_wsgi: http://code.google.com/p/modwsgi/ +.. _mod_perl: http://perl.apache.org/ .. _mod_python: http://www.modpython.org/ -.. _mod_perl: http://perl.apache.org/ .. admonition:: Why run code in a separate process? Modified: django/trunk/docs/howto/deployment/modpython.txt =================================================================== --- django/trunk/docs/howto/deployment/modpython.txt 2009-04-06 23:45:56 UTC (rev 10412) +++ django/trunk/docs/howto/deployment/modpython.txt 2009-04-07 00:01:49 UTC (rev 10413) @@ -6,8 +6,9 @@ .. 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 --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---
