From: André Malo Date: Thu, 23 Jan 2003 13:32:20 +0000 (+0000) Subject: update transformations of recent changes. X-Git-Tag: pre_ajp_proxy~2218 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b3e0250fc52c64b19047e0ba727ce3d969ff58b;p=apache update transformations of recent changes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98472 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en index 906ebf492a..382a70f664 100644 --- a/docs/manual/glossary.html.en +++ b/docs/manual/glossary.html.en @@ -205,7 +205,7 @@ HTTP, the MIME-type is transmitted in the Content-Type Module
An independent part of a program. Much of Apache's functionality is contained in modules that you can choose to include or exclude. Modules that are compiled into -the the Apache httpd binary are called static modules, while +the Apache httpd binary are called static modules, while modules that are stored seperately and can be optionally loaded at run-time are called dynamic modules or DSOs. Modules that are included by default are called base modules. Many modules are available for Apache that are diff --git a/docs/manual/mod/mod_auth_ldap.html.en b/docs/manual/mod/mod_auth_ldap.html.en index 84e368a6de..35ebe21c43 100644 --- a/docs/manual/mod/mod_auth_ldap.html.en +++ b/docs/manual/mod/mod_auth_ldap.html.en @@ -281,16 +281,16 @@ for HTTP Basic authentication. is part of the just-fetched LDAP entry. Multiple users can be granted access by putting multiple usernames on the line, separated with spaces. If a username has a space in it, then it - must be the only user on the line. In this case, multiple users - can be granted access by using multiple require user + must be surrounded with double quotes. Multiple users can also be + granted access by using multiple require user directives, with one user per line. For example, with a AuthLDAPURL of ldap://ldap/o=Airius?cn (i.e., cn is used for searches), the following require directives could be used to restrict access:

-require user Barbara Jenson
-require user Fred User
-require user Joe Manager
+require user "Barbara Jenson"
+require user "Fred User"
+require user "Joe Manager"

Because of the way that mod_auth_ldap handles this @@ -321,7 +321,7 @@ uniqueMember: cn=Fred User, o=Airius

The following directive would grant access to both Fred and Barbara:

-

require group cn=Administrators, o=Airius

+

require group "cn=Administrators, o=Airius"

Behavior of this directive is modified by the AuthLDAPGroupAttribute and AuthLDAPGroupAttributeIsDN @@ -339,7 +339,7 @@ uniqueMember: cn=Fred User, o=Airius

The following directive would grant access to a specific DN:

-

require dn cn=Barbara Jenson, o=Airius

+

require dn "cn=Barbara Jenson, o=Airius"

Behavior of this directive is modified by the AuthLDAPCompareDNOnServer directive.

@@ -353,7 +353,7 @@ uniqueMember: cn=Fred User, o=Airius
Grant access to anyone who exists in the LDAP directory, using their UID for searches.

-AuthLDAPURL ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)
+AuthLDAPURL "ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)"
require valid-user

@@ -362,7 +362,7 @@ require valid-user The next example is the same as above; but with the fields that have useful defaults omitted. Also, note the use of a redundant LDAP server. -

AuthLDAPURL ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius
+

AuthLDAPURL "ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius"
require valid-user

@@ -377,7 +377,7 @@ require valid-user choose an attribute that is guaranteed unique in your directory, such as uid.

-AuthLDAPURL ldap://ldap.airius.com/ou=People, o=Airius?cn
+AuthLDAPURL "ldap://ldap.airius.com/ou=People, o=Airius?cn"
require valid-user

@@ -386,7 +386,7 @@ require valid-user Grant access to anybody in the Administrators group. The users must authenticate using their UID.

-AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid
+AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid"
require group cn=Administrators, o=Airius

@@ -398,7 +398,7 @@ require group cn=Administrators, o=Airius only to people (authenticated via their UID) who have alphanumeric pagers:

-AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)
+AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)"
require valid-user

@@ -414,7 +414,7 @@ require valid-user have a pager, but does need to access the same resource:

-AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))
+AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))"
require valid-user

@@ -484,7 +484,7 @@ require valid-user directives to every .htaccess file that gets created in the web

-AuthLDAPURL            the url
+AuthLDAPURL            "the url"
 AuthLDAPAuthoritative  off
 AuthLDAPFrontPageHack  on
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index f821548ef9..c2ff431a2c 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -470,7 +470,7 @@ proxied ProxyErrorOverride On|Off Off svEOverride error pages for proxied content ProxyIOBufferSize bytessvEIO buffer size for outgoing HTTP and FTP connections -<Proxy regex> ...</Proxy>svEContainer for directives applied to regular-expression-matched +<ProxyMatch regex> ...</ProxyMatch>svEContainer for directives applied to regular-expression-matched proxied resources ProxyMaxForwards number 10 svEMaximium number of proxies that a request can be forwarded through diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 93471d46bc..d290a6c22f 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -464,7 +464,7 @@ proxied ProxyErrorOverride On|Off Off svEOverride error pages for proxied content ProxyIOBufferSize bytessvEIO buffer size for outgoing HTTP and FTP connections -<Proxy regex> ...</Proxy>svEContainer for directives applied to regular-expression-matched +<ProxyMatch regex> ...</ProxyMatch>svEContainer for directives applied to regular-expression-matched proxied resources ProxyMaxForwards number 10 svEMaximium number of proxies that a request can be forwarded through