Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Edited faq.txt and fastcgi.txt changes from [4897]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 9b6a518e1748c6ef66450c9e75007e1e5ce3f98e 1 parent 72dfcab
@adrianholovaty adrianholovaty authored
Showing with 13 additions and 10 deletions.
  1. +3 −3 docs/faq.txt
  2. +10 −7 docs/fastcgi.txt
View
6 docs/faq.txt
@@ -328,9 +328,9 @@ Do I have to use mod_python?
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.
View
17 docs/fastcgi.txt
@@ -4,13 +4,14 @@ How to use Django with FastCGI, SCGI or AJP
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,10 +87,12 @@ or socket you specified when starting the FastCGI server.
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/
Please sign in to comment.
Something went wrong with that request. Please try again.