From 54c3367a6301f7f7978727aee92edbdc98b80dee Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Mon, 7 Nov 2005 14:39:13 +0000
Subject: [PATCH] Updated install.txt and modpython.txt to note required Apache
 and mod_python versions. Also gave full example for Apache config

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/install.txt   |  2 +-
 docs/modpython.txt | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/docs/install.txt b/docs/install.txt
index b18d26d5c8..40366e0228 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -15,7 +15,7 @@ mod_python is similar to mod_perl -- it embeds Python within Apache and loads
 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. Make sure you have Apache installed, with the
-mod_python module activated.
+mod_python module activated. Django requires Apache 2.x and mod_python 3.x.
 
 See `How to use Django with mod_python`_ for information on how to configure
 mod_python once you have it installed.
diff --git a/docs/modpython.txt b/docs/modpython.txt
index 13377ad2dd..b89eda9184 100644
--- a/docs/modpython.txt
+++ b/docs/modpython.txt
@@ -10,6 +10,8 @@ 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.
+
 .. _Apache: http://httpd.apache.org/
 .. _mod_python: http://www.modpython.org/
 .. _mod_perl: http://perl.apache.org/
@@ -129,7 +131,26 @@ particular part of the site::
         SetHandler None
     </Location>
 
-Just change ``Location`` to the root URL of your media files.
+Just change ``Location`` to the root URL of your media files. You can also use
+``<LocationMatch>`` to match a regular expression.
+
+This example sets up Django at the site root but explicitly disables Django for
+the ``media`` subdirectory and any URL that ends with ``.jpg``, ``.gif`` or
+``.png``::
+
+    <Location "/">
+        SetHandler python-program
+        PythonHandler django.core.handlers.modpython
+        SetEnv DJANGO_SETTINGS_MODULE myproject.settings
+    </Location>
+
+    <Location "media">
+        SetHandler None
+    </Location>
+
+    <LocationMatch "\.(jpg|gif|png)$">
+        SetHandler None
+    </Location>
 
 Note that the Django development server automagically serves admin media files,
 but this is not the case when you use any other server arrangement.