Author: adrian Date: 2007-04-01 01:40:01 -0500 (Sun, 01 Apr 2007) New Revision: 4898
Modified: django/trunk/docs/faq.txt django/trunk/docs/fastcgi.txt Log: Edited faq.txt and fastcgi.txt changes from [4897] Modified: django/trunk/docs/faq.txt =================================================================== --- django/trunk/docs/faq.txt 2007-04-01 06:00:45 UTC (rev 4897) +++ django/trunk/docs/faq.txt 2007-04-01 06:40:01 UTC (rev 4898) @@ -328,9 +328,9 @@ Although we recommend mod_python for production use, you don't have to use it, thanks to the fact that Django uses an arrangement called WSGI_. Django can -talk to any WSGI-enabled server. Other common non-mod_python deployment -setups are FastCGI, SCGI, or AJP. See `How to use Django with FastCGI, SCGI or -AJP`_ for full information. +talk to any WSGI-enabled server. Other non-mod_python deployment setups are +FastCGI, SCGI or AJP. See `How to use Django with FastCGI, SCGI or AJP`_ for +full information. Also, see the `server arrangements wiki page`_ for other deployment strategies. Modified: django/trunk/docs/fastcgi.txt =================================================================== --- django/trunk/docs/fastcgi.txt 2007-04-01 06:00:45 UTC (rev 4897) +++ django/trunk/docs/fastcgi.txt 2007-04-01 06:40:01 UTC (rev 4898) @@ -4,13 +4,14 @@ Although the `current preferred setup`_ for running Django is Apache_ with `mod_python`_, many people use shared hosting, on which protocols such as -FastCGI, SCGI, or AJP are the only viable options. In some setups, these protocols +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. .. admonition:: Note - This document primarily talks about FastCGI, although other flup-supported - protocols such as SCGI and AJP are supported. + This document primarily focuses on FastCGI. Other protocols, such as SCGI + and AJP, are also supported, through the ``flup`` Python package. See the + "Protocols" section below for specifics about SCGI and AJP. Essentially, FastCGI is an efficient way of letting an external application serve pages to a Web server. The Web server delegates the incoming Web requests @@ -86,11 +87,13 @@ Protocols --------- -Django supports all the protocols that flup_ does, namely fastcgi_, `SCGI`_, and `AJP1.3`_. -Your preferred protocol can be selected by using the `protocol=`<protocol_name> option with -`./manage.py runfcgi` where <protocol-name> may currently be one of: `fcgi` (the default), -`scgi`, or `ajp`. +Django supports all the protocols that flup_ does, namely fastcgi_, `SCGI`_ and `AJP1.3`_ +(the Apache JServ Protocol, version 1.3). Select your preferred protocol by using the +`protocol=`<protocol_name> option with `./manage.py runfcgi` -- where <protocol_name> +may be one of: `fcgi` (the default), `scgi` or `ajp`. For example:: + ./manage.py runfcgi --protocol=scgi + .. _flup: http://www.saddi.com/software/flup/ .. _fastcgi: http://www.fastcgi.com/ .. _SCGI: http://python.ca/scgi/protocol.txt --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---
