diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/manual/mod/mod_cache.xml | 8 | ||||
-rw-r--r-- | docs/manual/mod/mod_headers.xml | 6 | ||||
-rw-r--r-- | docs/manual/mod/mod_ldap.xml | 68 |
3 files changed, 41 insertions, 41 deletions
diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml index a0561cb4c0..dd05e275f7 100644 --- a/docs/manual/mod/mod_cache.xml +++ b/docs/manual/mod/mod_cache.xml @@ -162,7 +162,7 @@ LoadModule cache_module modules/mod_cache.so CacheDirLevels 5 CacheDirLength 3 </IfModule> - + # When acting as a proxy, don't cache the list of security updates CacheDisable http://security.update.server/update-list/ </IfModule> @@ -344,10 +344,10 @@ CustomLog invalidated-requests.log common env=cache-invalidate manager</description> <syntax>CacheEnable <var>cache_type</var> [<var>url-string</var>]</syntax> <contextlist><context>server config</context><context>virtual host</context> -<context>directory</context> +<context>directory</context></contextlist> <compatibility>A url-string of '/' applied to forward proxy content in 2.2 and earlier.</compatibility> -</contextlist> + <usage> <p>The <directive>CacheEnable</directive> directive instructs @@ -374,7 +374,7 @@ manager</description> <directive type="section">LocationMatch</directive> sections are processed before globally defined <directive>CacheEnable</directive> directives.</p> - <p>When acting as a forward proxy server, <var>url-string</var> must + <p>When acting as a forward proxy server, <var>url-string</var> must minimally begin with a protocol for which caching should be enabled.</p> <highlight language="config"> diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index fc8c46b00a..7650a60ba5 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -248,7 +248,7 @@ Header merge Cache-Control no-store env=NO_STORE <dt><code>set</code></dt> <dd>The request header is set, replacing any previous header with this name</dd> - + <dt><code>setifempty</code></dt> <dd>The request header is set, but only if there is no previous header with this name</dd> @@ -481,8 +481,8 @@ Header merge Cache-Control no-store env=NO_STORE <p>For <code>edit</code> there is both a <var>value</var> argument which is a <glossary ref="regex">regular expression</glossary>, - and an additional <var>replacement</var> string.</p> As of version 2.4.7 - the replacement string may also contain format specifiers. + and an additional <var>replacement</var> string. As of version 2.4.7 + the replacement string may also contain format specifiers.</p> <p>The <directive>Header</directive> directive may be followed by an additional argument, which may be any of:</p> diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index b6c7022d77..d1a85851dd 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -72,9 +72,9 @@ LDAPOpCacheTTL 600 <Location /ldap-status> SetHandler ldap-status - + Require host yourdomain.example.com - + Satisfy any AuthType Basic AuthName "LDAP Protected" @@ -107,9 +107,9 @@ LDAPOpCacheTTL 600 credentials used when binding to an LDAP server. These credentials can be provided to LDAP servers that do not allow anonymous binds during referral chasing. To control - this feature, see the - <directive module="mod_ldap">LDAPReferrals</directive> and - <directive module="mod_ldap">LDAPReferralHopLimit</directive> + this feature, see the + <directive module="mod_ldap">LDAPReferrals</directive> and + <directive module="mod_ldap">LDAPReferralHopLimit</directive> directives. By default, this feature is enabled.</p> </section> @@ -197,26 +197,26 @@ LDAPOpCacheTTL 600 <section id="usingssltls"><title>Using SSL/TLS</title> <p>The ability to create an SSL and TLS connections to an LDAP server - is defined by the directives - <directive module="mod_ldap">LDAPTrustedGlobalCert</directive>, + is defined by the directives + <directive module="mod_ldap">LDAPTrustedGlobalCert</directive>, <directive module="mod_ldap">LDAPTrustedClientCert</directive> - and <directive module="mod_ldap">LDAPTrustedMode</directive>. - These directives specify the CA and optional client certificates to be used, - as well as the type of encryption to be used on the connection (none, SSL or + and <directive module="mod_ldap">LDAPTrustedMode</directive>. + These directives specify the CA and optional client certificates to be used, + as well as the type of encryption to be used on the connection (none, SSL or TLS/STARTTLS).</p> <highlight language="config"> -# Establish an SSL LDAP connection on port 636. Requires that -# mod_ldap and mod_authnz_ldap be loaded. Change the +# Establish an SSL LDAP connection on port 636. Requires that +# mod_ldap and mod_authnz_ldap be loaded. Change the # "yourdomain.example.com" to match your domain. LDAPTrustedGlobalCert CA_DER /certs/certfile.der <Location /ldap-status> SetHandler ldap-status - + Require host yourdomain.example.com - + Satisfy any AuthType Basic AuthName "LDAP Protected" @@ -227,17 +227,17 @@ LDAPTrustedGlobalCert CA_DER /certs/certfile.der </highlight> <highlight language="config"> -# Establish a TLS LDAP connection on port 389. Requires that -# mod_ldap and mod_authnz_ldap be loaded. Change the +# Establish a TLS LDAP connection on port 389. Requires that +# mod_ldap and mod_authnz_ldap be loaded. Change the # "yourdomain.example.com" to match your domain. LDAPTrustedGlobalCert CA_DER /certs/certfile.der <Location /ldap-status> SetHandler ldap-status - + Require host yourdomain.example.com - + Satisfy any AuthType Basic AuthName "LDAP Protected" @@ -356,9 +356,9 @@ LDAPTrustedGlobalCert CA_DER /certs/cacert1.der LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem <Location /ldap-status> SetHandler ldap-status - + Require host yourdomain.example.com - + LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem # CA certs respecified due to per-directory client certs @@ -515,31 +515,31 @@ valid</description> <usage> <p>Some LDAP servers divide their directory among multiple domains and use referrals to direct a client when a domain boundary is crossed. This is similar to a HTTP redirect. - LDAP client libraries may or may not chase referrals by default. This directive - explicitly configures the referral chasing in the underlying SDK.</p> - - + LDAP client libraries may or may not chase referrals by default. This directive + explicitly configures the referral chasing in the underlying SDK.</p> + + <p><directive>LDAPReferrals</directive> takes the takes the following values: + </p> <dl> <dt>"on"</dt> <dd> <p> When set to "on", the underlying SDK's referral chasing state - is enabled, <directive>LDAPReferralHopLimit</directive> is used to - override the SDK's hop limit, and an LDAP rebind callback is + is enabled, <directive>LDAPReferralHopLimit</directive> is used to + override the SDK's hop limit, and an LDAP rebind callback is registered.</p></dd> <dt>"off"</dt> <dd> <p> When set to "off", the underlying SDK's referral chasing state is disabled completely.</p></dd> <dt>"default"</dt> <dd> <p> When set to "default", the underlying SDK's referral chasing state - is not changed, <directive>LDAPReferralHopLimit</directive> is not - used to overide the SDK's hop limit, and no LDAP rebind callback is + is not changed, <directive>LDAPReferralHopLimit</directive> is not + used to overide the SDK's hop limit, and no LDAP rebind callback is registered.</p></dd> </dl> - </p> <p> The directive <code>LDAPReferralHopLimit</code> works in conjunction with this directive to limit the number of referral hops to follow before terminating the LDAP query. - When referral processing is enabled by a value of "On", client credentials will be provided, + When referral processing is enabled by a value of "On", client credentials will be provided, via a rebind callback, for any LDAP server requiring them. </p> </usage> </directivesynopsis> @@ -553,7 +553,7 @@ valid</description> <usage> <p>If <directive>LDAPRetryDelay</directive> is set to a non-zero - value, the server will delay retrying an LDAP request for the + value, the server will delay retrying an LDAP request for the specified amount of time. Setting this directive to 0 will result in any retry to occur without delay.</p> @@ -568,7 +568,7 @@ valid</description> <default>LDAPRetries 3</default> <contextlist><context>server config</context></contextlist> <usage> - <p>The server will retry failed LDAP requests up to + <p>The server will retry failed LDAP requests up to <directive>LDAPRetries</directive> times. Setting this directive to 0 disables retries.</p> <p>LDAP errors such as timeouts and refused connections are retryable.</p> @@ -754,10 +754,10 @@ connection client certificates.</description> connection pool. The default value of -1, and any other negative value, allows connections of any age to be reused.</p> - <p>The timemout is based on when the LDAP connection is returned to the + <p>The timemout is based on when the LDAP connection is returned to the pool, not based on the last time I/O has been performed over the backend connection. If the information is cached, the apparent idle time can exceed - the <directive>LDAPConnectionPoolTTL</directive>. </p> + the <directive>LDAPConnectionPoolTTL</directive>. </p> <note><p>This timeout defaults to units of seconds, but accepts suffixes for milliseconds (ms), minutes (min), and hours (h). |