Ticket #4538: installing.diff

install.txt

@@ -105 +105 @@
-=======================
-
-Installation instructions are slightly different depending on whether you're
-
+
+
-
-
+
+
-
+Check the `distribution specific notes`_ to see if your
+platform/distribution provides official Django packages/installers.
+Distribution-provided packages will typically allow for automatic
+installation of dependancies and easy upgrade paths.
+
-Installing the official version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-
-
-
+
-
-Download the latest release from our `download page`_
+Untar the downloaded file (e.g. ``tar xzvf Django-NNN.tar.gz``)
-
-Untar the downloaded file (e.g. ``tar xzvf Django-NNN.tar.gz
+Change into the downloaded directory (e.g. ``cd Django-NNN
-
-Change into the downloaded directory (e.g. ``cd Django-NNN``)
+Run ``sudo python setup.py install``
-
-    5. Run ``sudo python setup.py install``.
-
-The command will install Django in your Python installation's ``site-packages``
-directory.
-

apache_auth.txt

@@ -29 +29 @@
-        PythonAuthenHandler django.contrib.auth.handlers.modpython
-    </Location>
-
+Note: If you're using Apache 2.2 or later, you'll also need to insert directives
+to prevent Apache from using other available auth modules. The full list of
+such modules is:
+
+    AuthBasicAuthoritative
+    AuthDefaultAuthoritative
+    AuthzLDAPAuthoritative
+    AuthzDBMAuthoritative
+    AuthzDefaultAuthoritative
+    AuthzGroupFileAuthoritative
+    AuthzOwnerAuthoritative
+    AuthzUserAuthoritative
+
+To tell Apache not to use a particular module, add a line for each of your   
+installed auth modules to your Apache configuration, like this:
+
+    AuthBasicAuthoritative Off
+
-By default, the authentication handler will limit access to the ``/example/``
-location to users marked as staff members.  You can use a set of
-``PythonOption`` directives to modify this behavior: