Fixed #10389, #10501, #10502, #10540, #10562, #10563, #10564, #10565, #10568, #10569, #10614, #10617, #10619 -- Fixed several typos as well as a couple minor issues in the docs, patches from timo, nih, bthomas, rduffield, UloPe, and sebleier@gmail.com.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10242 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 9 insertions, 13 deletions

diff --git a/docs/howto/deployment/fastcgi.txt b/docs/howto/deployment/fastcgi.txt
index 63f44eae19..2049cacf2a 100644
--- a/docs/howto/deployment/fastcgi.txt
+++ b/docs/howto/deployment/fastcgi.txt
@@ -1,8 +1,8 @@
 .. _howto-deployment-fastcgi:
 
-===========================================
-How to use Django with FastCGI, SCGI or AJP
-===========================================
+============================================
+How to use Django with FastCGI, SCGI, or AJP
+============================================
 
 .. highlight:: bash
 
@@ -379,5 +379,3 @@ have different script names in this case, but that is a rare situation.
 As an example of how to use it, if your Django configuration is serving all of
 the URLs under ``'/'`` and you wanted to use this setting, you would set
 ``FORCE_SCRIPT_NAME = ''`` in your settings file.
-
-
diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
index 8799b390fe..70f1e37749 100644
--- a/docs/howto/deployment/modpython.txt
+++ b/docs/howto/deployment/modpython.txt
@@ -17,8 +17,8 @@ performance gains over other server arrangements.
 Django requires Apache 2.x and mod_python 3.x, and you should use Apache's
 `prefork MPM`_, as opposed to the `worker MPM`_.
 
-You may also be interested in :ref:`How to use Django with FastCGI, SCGI or AJP
-<howto-deployment-fastcgi>` (which also covers SCGI and AJP).
+You may also be interested in :ref:`How to use Django with FastCGI, SCGI, or
+AJP <howto-deployment-fastcgi>`.
 
 .. _Apache: http://httpd.apache.org/
 .. _mod_python: http://www.modpython.org/
@@ -38,7 +38,7 @@ Then edit your ``httpd.conf`` file and add the following::
         SetHandler python-program
         PythonHandler django.core.handlers.modpython
         SetEnv DJANGO_SETTINGS_MODULE mysite.settings
-        PythonOption django.root /mysite        
+        PythonOption django.root /mysite
         PythonDebug On
     </Location>
 
@@ -84,7 +84,7 @@ computer, you'll have to tell mod_python where your project can be found:
         SetHandler python-program
         PythonHandler django.core.handlers.modpython
         SetEnv DJANGO_SETTINGS_MODULE mysite.settings
-        PythonOption django.root /mysite        
+        PythonOption django.root /mysite
         PythonDebug On
         **PythonPath "['/path/to/project'] + sys.path"**
     </Location>
@@ -273,7 +273,7 @@ Here are two recommended approaches:
        document root. This way, all of your Django-related files -- code **and**
        templates -- stay in one place, and you'll still be able to ``svn
        update`` your code to get the latest admin templates, if they change.
-       
+
     2. Or, copy the admin media files so that they live within your Apache
        document root.
 
@@ -337,7 +337,7 @@ of which has to do with Django itself.
     1. It may be because your Python code is importing the "pyexpat" module,
        which may conflict with the version embedded in Apache. For full
        information, see `Expat Causing Apache Crash`_.
-       
+
     2. It may be because you're running mod_python and mod_php in the same
        Apache instance, with MySQL as your database backend. In some cases,
        this causes a known mod_python issue due to version conflicts in PHP and
@@ -361,5 +361,3 @@ as necessary.
 .. _Expat Causing Apache Crash: http://www.dscpl.com.au/articles/modpython-006.html
 .. _mod_python FAQ entry: http://modpython.org/FAQ/faqw.py?req=show&file=faq02.013.htp
 .. _Getting mod_python Working: http://www.dscpl.com.au/articles/modpython-001.html
-
-