Django

Code

Show
Ignore:
Timestamp:
06/30/08 10:38:16 (6 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7768 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7808
  • django/branches/newforms-admin/docs/apache_auth.txt

    r7351 r7809  
    4040 
    4141    You'll also need to insert configuration directives that prevent Apache 
    42     from trying to use other authentication modules. Depending on which other 
    43     authentication modules you have loaded, you might need one or more of 
    44     the following directives:: 
     42    from trying to use other authentication modules, as well as specifying 
     43    the ``AuthUserFile`` directive and pointing it to ``/dev/null``. Depending 
     44    on which other authentication modules you have loaded, you might need one 
     45    or more of the following directives:: 
    4546 
    4647        AuthBasicAuthoritative Off 
     
    6667            AuthType Basic 
    6768            AuthName "example.com" 
     69            **AuthUserFile /dev/null** 
    6870            **AuthBasicAuthoritative Off** 
    6971            Require valid-user