Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Adrian Holovaty authored April 01, 2007
6  docs/faq.txt
@@ -328,9 +328,9 @@ Do I have to use mod_python?
328 328
 
329 329
 Although we recommend mod_python for production use, you don't have to use it,
330 330
 thanks to the fact that Django uses an arrangement called WSGI_. Django can
331  
-talk to any WSGI-enabled server. Other common non-mod_python deployment
332  
-setups are FastCGI, SCGI, or AJP. See `How to use Django with FastCGI, SCGI or
333  
-AJP`_ for full information.
  331
+talk to any WSGI-enabled server. Other non-mod_python deployment setups are
  332
+FastCGI, SCGI or AJP. See `How to use Django with FastCGI, SCGI or AJP`_ for
  333
+full information.
334 334
 
335 335
 Also, see the `server arrangements wiki page`_ for other deployment strategies.
336 336
 
17  docs/fastcgi.txt
@@ -4,13 +4,14 @@ How to use Django with FastCGI, SCGI or AJP
4 4
 
5 5
 Although the `current preferred setup`_ for running Django is Apache_ with
6 6
 `mod_python`_, many people use shared hosting, on which protocols such as
7  
-FastCGI, SCGI, or AJP are the only viable options. In some setups, these protocols
  7
+FastCGI, SCGI or AJP are the only viable options. In some setups, these protocols
8 8
 also allow better security -- and, possibly, better performance -- than mod_python.
9 9
 
10 10
 .. admonition:: Note
11 11
 
12  
-    This document primarily talks about FastCGI, although other flup-supported
13  
-    protocols such as SCGI and AJP are supported. 
  12
+    This document primarily focuses on FastCGI. Other protocols, such as SCGI
  13
+    and AJP, are also supported, through the ``flup`` Python package. See the
  14
+    "Protocols" section below for specifics about SCGI and AJP.
14 15
 
15 16
 Essentially, FastCGI is an efficient way of letting an external application
16 17
 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.
86 87
 Protocols
87 88
 ---------
88 89
 
89  
-Django supports all the protocols that flup_ does, namely fastcgi_, `SCGI`_, and `AJP1.3`_. 
90  
-Your preferred protocol can be selected by using the `protocol=`<protocol_name> option with
91  
-`./manage.py runfcgi` where <protocol-name> may currently be one of: `fcgi` (the default), 
92  
-`scgi`, or `ajp`. 
  90
+Django supports all the protocols that flup_ does, namely fastcgi_, `SCGI`_ and `AJP1.3`_
  91
+(the Apache JServ Protocol, version 1.3). Select your preferred protocol by using the
  92
+`protocol=`<protocol_name> option with `./manage.py runfcgi` -- where <protocol_name>
  93
+may be one of: `fcgi` (the default), `scgi` or `ajp`. For example::
  94
+
  95
+    ./manage.py runfcgi --protocol=scgi
93 96
 
94 97
 .. _flup: http://www.saddi.com/software/flup/
95 98
 .. _fastcgi: http://www.fastcgi.com/

0 notes on commit 9b6a518

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