From cb73fed1ac4b4db06dbe85adf078b3d227f0c5d9 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Mon, 26 Jun 2006 12:43:21 +0000
Subject: [PATCH] Added links to FastCGI docs from various places

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3210 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/faq.txt       | 14 ++++++++------
 docs/fastcgi.txt   |  3 ++-
 docs/modpython.txt |  6 ++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/docs/faq.txt b/docs/faq.txt
index adcdbaca59..37e15878f2 100644
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@ -301,16 +301,18 @@ PostgreSQL fans, and MySQL_ and `SQLite 3`_ are also supported.
 Do I have to use mod_python?
 ----------------------------
 
-Not if you just want to play around and develop things on your local computer.
-Django comes with its own Web server, and things should Just Work.
+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. The most common non-mod_python deployment
+setup is FastCGI. See `How to use Django with FastCGI`_ for full information.
 
-For production use, though, we recommend mod_python. The Django developers have
-been running it on mod_python for several years, and it's quite stable.
+Also, see the `server arrangements wiki page`_ for other deployment strategies.
 
-However, if you don't want to use mod_python, you can use a different server,
-as long as that server has WSGI_ hooks. See the `server arrangements wiki page`_.
+If you just want to play around and develop things on your local computer, use
+the development Web server that comes with Django. Things should Just Work.
 
 .. _WSGI: http://www.python.org/peps/pep-0333.html
+.. _How to use Django with FastCGI: http://www.djangoproject.com/documentation/fastcgi/
 .. _server arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements
 
 How do I install mod_python on Windows?
diff --git a/docs/fastcgi.txt b/docs/fastcgi.txt
index b373cfd0bd..327a4f58e1 100644
--- a/docs/fastcgi.txt
+++ b/docs/fastcgi.txt
@@ -2,7 +2,7 @@
 How to use Django with FastCGI
 ==============================
 
-Although the current preferred setup for running Django is Apache_ with
+Although the `current preferred setup`_ for running Django is Apache_ with
 `mod_python`_, many people use shared hosting, on which FastCGI is the only
 viable option. In some setups, FastCGI also allows better security -- and,
 possibly, better performance -- than mod_python.
@@ -17,6 +17,7 @@ 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.
 
+.. _current preferred setup: http://www.djangoproject.com/documentation/modpython/
 .. _Apache: http://httpd.apache.org/
 .. _mod_python: http://www.modpython.org/
 .. _mod_perl: http://perl.apache.org/
diff --git a/docs/modpython.txt b/docs/modpython.txt
index 0c0219e2e9..b88874d3d3 100644
--- a/docs/modpython.txt
+++ b/docs/modpython.txt
@@ -10,15 +10,17 @@ Python code into memory when the server starts. Code stays in memory throughout
 the life of an Apache process, which leads to significant performance gains over
 other server arrangements.
 
-Django requires Apache 2.x and mod_python 3.x.
+Django requires Apache 2.x and mod_python 3.x, and you should use Apache's
+`prefork MPM`_, as opposed to the `worker MPM`_.
 
-We recommend you use Apache's `prefork MPM`_, as opposed to the `worker MPM`_.
+You may also be interested in `How to use Django with FastCGI`_.
 
 .. _Apache: http://httpd.apache.org/
 .. _mod_python: http://www.modpython.org/
 .. _mod_perl: http://perl.apache.org/
 .. _prefork MPM: http://httpd.apache.org/docs/2.2/mod/prefork.html
 .. _worker MPM: http://httpd.apache.org/docs/2.2/mod/worker.html
+.. _How to use Django with FastCGI: http://www.djangoproject.com/documentation/fastcgi/
 
 Basic configuration
 ===================