diff options
| -rw-r--r-- | docs/manual/glossary.html.en | 2 | ||||
| -rw-r--r-- | docs/manual/mod/mod_auth_ldap.html.en | 28 | ||||
| -rw-r--r-- | docs/manual/mod/quickreference.html.de | 2 | ||||
| -rw-r--r-- | docs/manual/mod/quickreference.html.en | 2 |
4 files changed, 17 insertions, 17 deletions
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 <code>Content-Type</code> <a href="#he <dt><a name="module">Module</a></dt> <dd>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 <em>static modules</em>, while +the Apache httpd binary are called <em>static modules</em>, while modules that are stored seperately and can be optionally loaded at run-time are called <em>dynamic modules</em> or <a href="#dso">DSOs</a>. Modules that are included by default are called <em>base modules</em>. 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.</td></tr> 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 <code>require user</code> + must be surrounded with double quotes. Multiple users can also be + granted access by using multiple <code>require user</code> directives, with one user per line. For example, with a <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code> of <code>ldap://ldap/o=Airius?cn</code> (i.e., <code>cn</code> is used for searches), the following require directives could be used to restrict access:</p> <div class="example"><p><code> -require user Barbara Jenson<br /> -require user Fred User<br /> -require user Joe Manager<br /> +require user "Barbara Jenson"<br /> +require user "Fred User"<br /> +require user "Joe Manager"<br /> </code></p></div> <p>Because of the way that <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> handles this @@ -321,7 +321,7 @@ uniqueMember: cn=Fred User, o=Airius<br /> <p>The following directive would grant access to both Fred and Barbara:</p> -<div class="example"><p><code>require group cn=Administrators, o=Airius</code></p></div> +<div class="example"><p><code>require group "cn=Administrators, o=Airius"</code></p></div> <p>Behavior of this directive is modified by the <code class="directive"><a href="#authldapgroupattribute">AuthLDAPGroupAttribute</a></code> and <code class="directive"><a href="#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN</a></code> @@ -339,7 +339,7 @@ uniqueMember: cn=Fred User, o=Airius<br /> <p>The following directive would grant access to a specific DN:</p> -<div class="example"><p><code>require dn cn=Barbara Jenson, o=Airius</code></p></div> +<div class="example"><p><code>require dn "cn=Barbara Jenson, o=Airius"</code></p></div> <p>Behavior of this directive is modified by the <code class="directive"><a href="#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></code> directive.</p> @@ -353,7 +353,7 @@ uniqueMember: cn=Fred User, o=Airius<br /> Grant access to anyone who exists in the LDAP directory, using their UID for searches. <div class="example"><p><code> -AuthLDAPURL ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)<br /> +AuthLDAPURL "ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)"<br /> require valid-user </code></p></div> </li> @@ -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. -<div class="example"><p><code>AuthLDAPURL ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius<br /> +<div class="example"><p><code>AuthLDAPURL "ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius"<br /> require valid-user </code></p></div> </li> @@ -377,7 +377,7 @@ require valid-user choose an attribute that is guaranteed unique in your directory, such as <code>uid</code>. <div class="example"><p><code> -AuthLDAPURL ldap://ldap.airius.com/ou=People, o=Airius?cn<br /> +AuthLDAPURL "ldap://ldap.airius.com/ou=People, o=Airius?cn"<br /> require valid-user </code></p></div> </li> @@ -386,7 +386,7 @@ require valid-user Grant access to anybody in the Administrators group. The users must authenticate using their UID. <div class="example"><p><code> -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid<br /> +AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid"<br /> require group cn=Administrators, o=Airius </code></p></div> </li> @@ -398,7 +398,7 @@ require group cn=Administrators, o=Airius only to people (authenticated via their UID) who have alphanumeric pagers: <div class="example"><p><code> -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)<br /> +AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)"<br /> require valid-user </code></p></div> </li> @@ -414,7 +414,7 @@ require valid-user have a pager, but does need to access the same resource:</p> <div class="example"><p><code> -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))<br /> +AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))"<br /> require valid-user </code></p></div> @@ -484,7 +484,7 @@ require valid-user directives to <em>every</em> <code>.htaccess</code> file that gets created in the web</p> <div class="example"><pre> -AuthLDAPURL the url +AuthLDAPURL "the url" AuthLDAPAuthoritative off AuthLDAPFrontPageHack on </pre></div> 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</td></tr> <tr class="odd"><td><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Override error pages for proxied content</td></tr> <tr><td><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize <em>bytes</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">IO buffer size for outgoing HTTP and FTP connections</td></tr> -<tr class="odd"><td><a href="mod_proxy.html#proxymatch"><Proxy <em>regex</em>> ...</Proxy></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Container for directives applied to regular-expression-matched +<tr class="odd"><td><a href="mod_proxy.html#proxymatch"><ProxyMatch <em>regex</em>> ...</ProxyMatch></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Container for directives applied to regular-expression-matched proxied resources</td></tr> <tr><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <em>number</em></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded through</td></tr> 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</td></tr> <tr class="odd"><td><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Override error pages for proxied content</td></tr> <tr><td><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize <em>bytes</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">IO buffer size for outgoing HTTP and FTP connections</td></tr> -<tr class="odd"><td><a href="mod_proxy.html#proxymatch"><Proxy <em>regex</em>> ...</Proxy></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Container for directives applied to regular-expression-matched +<tr class="odd"><td><a href="mod_proxy.html#proxymatch"><ProxyMatch <em>regex</em>> ...</ProxyMatch></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Container for directives applied to regular-expression-matched proxied resources</td></tr> <tr><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <em>number</em></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded through</td></tr> |