diff options
| author | Luca Toscano <elukey@apache.org> | 2017-08-18 10:24:45 +0200 |
|---|---|---|
| committer | Luca Toscano <elukey@apache.org> | 2017-08-18 10:24:45 +0200 |
| commit | 05ed8fd266bbe2d005ab22f52b198245fb2b7295 (patch) | |
| tree | f5a6c65210fcdc88c219009a4537b987ee0018cd /docs/manual | |
| parent | doc xsl/dtd: introduce idtype attribute for directivesynopsis (diff) | |
| download | apache2-05ed8fd266bbe2d005ab22f52b198245fb2b7295.tar.xz apache2-05ed8fd266bbe2d005ab22f52b198245fb2b7295.zip | |
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805373 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
65 files changed, 382 insertions, 382 deletions
diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en index 76fdf27ae8..835ef5bb0f 100644 --- a/docs/manual/bind.html.en +++ b/docs/manual/bind.html.en @@ -44,7 +44,7 @@ <h2><a name="overview" id="overview">Overview</a></h2> - <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mpm_common.html">mpm_common</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code></li></ul></td></tr></table> + <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mpm_common.html">mpm_common</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code></li></ul></td></tr></table> <p>When httpd starts, it binds to some port and address on @@ -169,18 +169,18 @@ Listen 192.0.2.1:80</pre> <p> The <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> directive does not implement Virtual Hosts - it only tells the main server what addresses and ports to listen on. If no - <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> directives are used, the server will behave in the same way for all accepted requests. However, - <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> can be used to specify a different behavior for one or more of the addresses or ports. To implement a VirtualHost, the server must first be told to listen to the address and port to be used. Then a - <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> section + <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> section should be created for the specified address and port to set the behavior of this virtual host. Note that if the - <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> is set for an address and port that the server is not listening to, it cannot be accessed.</p> </div></div> diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en index cb8f444e4a..1adab4392d 100644 --- a/docs/manual/configuring.html.en +++ b/docs/manual/configuring.html.en @@ -44,7 +44,7 @@ Server.</p> <div class="section"> <h2><a name="main" id="main">Main Configuration Files</a></h2> - <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifdefinesection"><IfDefine></a></code></li><li><code class="directive"><a href="./mod/core.html#include">Include</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code></li></ul></td></tr></table> + <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code></li><li><code class="directive"><a href="./mod/core.html#include">Include</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code></li></ul></td></tr></table> <p>Apache HTTP Server is configured by placing <a href="mod/directives.html">directives</a> in plain text configuration files. The main configuration file is usually called @@ -112,8 +112,8 @@ Server.</p> <p>You can use <code class="module"><a href="./mod/mod_info.html">mod_info</a></code>'s <code>-DDUMP_CONFIG</code> to dump the configuration with all included files and environment variables resolved and all comments and non-matching - <code class="directive"><a href="./mod/core.html#ifdefinesection"><IfDefine></a></code> and - <code class="directive"><a href="./mod/core.html#ifmodulesection"><IfModule></a></code> sections + <code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code> and + <code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code> sections removed. However, the output does not reflect the merging or overriding that may happen for repeated directives.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> @@ -121,7 +121,7 @@ Server.</p> <h2><a name="modules" id="modules">Modules</a></h2> - <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifmodulesection"><IfModule></a></code></li><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table> + <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code></li><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table> <p>httpd is a modular server. This implies that only the most basic functionality is included in the core server. Extended @@ -134,7 +134,7 @@ Server.</p> directive. Otherwise, httpd must be recompiled to add or remove modules. Configuration directives may be included conditional on a - presence of a particular module by enclosing them in an <code class="directive"><a href="./mod/core.html#ifmodulesection"><IfModule></a></code> block. However, + presence of a particular module by enclosing them in an <code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code> block. However, <code class="directive"><IfModule></code> blocks are not required, and in some cases may mask the fact that you're missing an important module.</p> @@ -148,12 +148,12 @@ Server.</p> <h2><a name="scope" id="scope">Scope of Directives</a></h2> - <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatchsection"><DirectoryMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#filessection"><Files></a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatchsection"><FilesMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatchsection"><LocationMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code></li></ul></td></tr></table> + <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#directory"><Directory></a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#files"><Files></a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#location"><Location></a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code></li></ul></td></tr></table> <p>Directives placed in the main configuration files apply to the entire server. If you wish to change the configuration for only a part of the server, you can scope your directives by - placing them in <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code>, <code class="directive"><a href="./mod/core.html#directorymatchsection"><DirectoryMatch></a></code>, <code class="directive"><a href="./mod/core.html#filessection"><Files></a></code>, <code class="directive"><a href="./mod/core.html#filesmatchsection"><FilesMatch></a></code>, <code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code>, and <code class="directive"><a href="./mod/core.html#locationmatchsection"><LocationMatch></a></code> + placing them in <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code>, <code class="directive"><a href="./mod/core.html#files"><Files></a></code>, <code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code>, <code class="directive"><a href="./mod/core.html#location"><Location></a></code>, and <code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code> sections. These sections limit the application of the directives which they enclose to particular filesystem locations or URLs. They can also be nested, allowing for very @@ -162,7 +162,7 @@ Server.</p> <p>httpd has the capability to serve many different websites simultaneously. This is called <a href="vhosts/">Virtual Hosting</a>. Directives can also be scoped by placing them - inside <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> + inside <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> sections, so that they will only apply to requests for a particular website.</p> diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en index 9d0a70ec8d..d99408ea8f 100644 --- a/docs/manual/content-negotiation.html.en +++ b/docs/manual/content-negotiation.html.en @@ -214,7 +214,7 @@ Negotiation</a></li> <p><code>MultiViews</code> is a per-directory option, meaning it can be set with an <code class="directive"><a href="./mod/core.html#options">Options</a></code> - directive within a <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code>, <code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code> or <code class="directive"><a href="./mod/core.html#filessection"><Files></a></code> section in + directive within a <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="./mod/core.html#location"><Location></a></code> or <code class="directive"><a href="./mod/core.html#files"><Files></a></code> section in <code>httpd.conf</code>, or (if <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> is properly set) in <code>.htaccess</code> files. Note that <code>Options All</code> does not set <code>MultiViews</code>; you have to ask for it by diff --git a/docs/manual/developer/API.html.en b/docs/manual/developer/API.html.en index 9d15f7a7a5..8df5cb78ea 100644 --- a/docs/manual/developer/API.html.en +++ b/docs/manual/developer/API.html.en @@ -309,7 +309,7 @@ point to per-module configuration structures. Specifically, these hold pointers to the data structures which the module has built to describe the way it has been configured to operate in a given directory (via - <code>.htaccess</code> files or <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections), for private data it has built in the + <code>.htaccess</code> files or <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections), for private data it has built in the course of servicing the request (so modules' handlers for one phase can pass `notes' to their handlers for other phases). There is another such configuration vector in the <code>server_rec</code> data structure pointed @@ -911,7 +911,7 @@ void *request_config; /* Notes on *this* request */</pre><p><code> filesystem, following the translated pathname, to read any <code>.htaccess</code> files which might be present. The information which is read in then has to be <em>merged</em> with the applicable information - from the server's own config files (either from the <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections in + from the server's own config files (either from the <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections in <code>access.conf</code>, or from defaults in <code>srm.conf</code>, which actually behaves for most purposes almost exactly like <code><Directory /></code>).</p> @@ -937,7 +937,7 @@ void *request_config; /* Notes on *this* request */</pre><p><code> table *encoding_types; /* Added with AddEncoding... */ } mime_dir_config;</pre></div> - <p>When the server is reading a configuration file, or <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> section, which includes + <p>When the server is reading a configuration file, or <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section, which includes one of the MIME module's commands, it needs to create a <code>mime_dir_config</code> structure, so those commands have something to act on. It does this by invoking the function it finds in the module's diff --git a/docs/manual/developer/request.html.en b/docs/manual/developer/request.html.en index 5f97d7f163..c0de1bd487 100644 --- a/docs/manual/developer/request.html.en +++ b/docs/manual/developer/request.html.en @@ -99,7 +99,7 @@ <h3><a name="inital-location-walk" id="inital-location-walk">Initial URI Location Walk</a></h3> <p>Every request is subject to an <code>ap_location_walk()</code> call. This ensures that - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> sections + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections are consistently enforced for all requests. If the request is an internal redirect or a sub-request, it may borrow some or all of the processing from the previous or parent request's ap_location_walk, so this step @@ -122,11 +122,11 @@ <p>After the file or correct URI was determined, the appropriate per-dir configurations are merged together. For example, <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> compares and merges the appropriate - <code class="directive"><a href="../mod/mod_proxy.html#proxysection"><Proxy></a></code> sections. + <code class="directive"><a href="../mod/mod_proxy.html#proxy"><Proxy></a></code> sections. If the URI is nothing more than a local (non-proxy) <code>TRACE</code> request, the core handles the request and returns <code>DONE</code>. If no module answers this hook with <code>OK</code> or <code>DONE</code>, - the core will run the request filename against the <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> and <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code> sections. If the request + the core will run the request filename against the <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> and <code class="directive"><a href="../mod/core.html#files"><Files></a></code> sections. If the request 'filename' isn't an absolute, legal filename, a note is set for later termination.</p> @@ -135,7 +135,7 @@ <p>Every request is hardened by a second <code>ap_location_walk()</code> call. This reassures that a translated request is still subjected to the configured - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> sections. + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections. The request again borrows some or all of the processing from its previous <code>location_walk</code> above, so this step is almost always very efficient unless the translated URI mapped to a substantially different diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index 3ecc707dc8..36921a2f89 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -46,7 +46,7 @@ <li><img alt="" src="./images/down.gif" /> <a href="#other">Other</a></li> <li><img alt="" src="./images/down.gif" /> <a href="#sslrequire">Comparison with SSLRequire</a></li> <li><img alt="" src="./images/down.gif" /> <a href="#compatibility">Version History</a></li> -</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#ifsection"><If></a></code></li><li><code class="directive"><a href="./mod/core.html#elseifsection"><ElseIf></a></code></li><li><code class="directive"><a href="./mod/core.html#elsesection"><Else></a></code></li><li><code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code></li><li><code class="directive"><a href="./mod/mod_auth_basic.html#authbasicfake">AuthBasicFake</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformlogoutlocation">AuthFormLogoutLocation</a></code></li><li><code class="directive"><a href="./mod/mod_authn_core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="./mod/mod_authn_core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#requestheader">RequestHeader</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><code class="directive"><a href="./mod/mod_crypto.html#cryptokey">CryptoKey</a></code></li><li><code class="directive"><a href="./mod/mod_crypto.html#cryptoiv">CryptoIV</a></code></li><li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><a href="mod/mod_authnz_ldap.html#requser">Require ldap-user</a></li><li><a href="mod/mod_authnz_ldap.html#reqgroup">Require ldap-group</a></li><li><a href="mod/mod_authnz_ldap.html#reqdn">Require ldap-dn</a></li><li><a href="mod/mod_authnz_ldap.html#reqattribute">Require ldap-attribute</a></li><li><a href="mod/mod_authnz_ldap.html#reqfilter">Require ldap-filter</a></li><li><a href="mod/mod_authnz_ldap.html#reqsearch">Require ldap-search</a></li><li><a href="mod/mod_authz_dbd.html#reqgroup">Require dbd-group</a></li><li><a href="mod/mod_authz_dbm.html#reqgroup">Require dbm-group</a></li><li><a href="mod/mod_authz_groupfile.html#reqgroup">Require group</a></li><li><a href="mod/mod_authz_host.html#reqhost">Require host</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><a href="#comments_section">Comments</a></li></ul></div> +</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#if"><If></a></code></li><li><code class="directive"><a href="./mod/core.html#elseif"><ElseIf></a></code></li><li><code class="directive"><a href="./mod/core.html#else"><Else></a></code></li><li><code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code></li><li><code class="directive"><a href="./mod/mod_auth_basic.html#authbasicfake">AuthBasicFake</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformlogoutlocation">AuthFormLogoutLocation</a></code></li><li><code class="directive"><a href="./mod/mod_authn_core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="./mod/mod_authn_core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#requestheader">RequestHeader</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><code class="directive"><a href="./mod/mod_crypto.html#cryptokey">CryptoKey</a></code></li><li><code class="directive"><a href="./mod/mod_crypto.html#cryptoiv">CryptoIV</a></code></li><li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><a href="mod/mod_authnz_ldap.html#requser">Require ldap-user</a></li><li><a href="mod/mod_authnz_ldap.html#reqgroup">Require ldap-group</a></li><li><a href="mod/mod_authnz_ldap.html#reqdn">Require ldap-dn</a></li><li><a href="mod/mod_authnz_ldap.html#reqattribute">Require ldap-attribute</a></li><li><a href="mod/mod_authnz_ldap.html#reqfilter">Require ldap-filter</a></li><li><a href="mod/mod_authnz_ldap.html#reqsearch">Require ldap-search</a></li><li><a href="mod/mod_authz_dbd.html#reqgroup">Require dbd-group</a></li><li><a href="mod/mod_authz_dbm.html#reqgroup">Require dbm-group</a></li><li><a href="mod/mod_authz_groupfile.html#reqgroup">Require group</a></li><li><a href="mod/mod_authz_host.html#reqhost">Require host</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><a href="#comments_section">Comments</a></li></ul></div> <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> <h2><a name="grammar" id="grammar">Grammar in Backus-Naur Form notation</a></h2> diff --git a/docs/manual/getting-started.html.en b/docs/manual/getting-started.html.en index 3db9db2258..a9761363d3 100644 --- a/docs/manual/getting-started.html.en +++ b/docs/manual/getting-started.html.en @@ -136,9 +136,9 @@ arguments that set its value.</p> <p>The question of "<em>Where should I put that directive?</em>" is generally answered by considering where you want a directive to be effective. If it is a global setting, it should appear -in the configuration file, outside of any <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code>, <code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code>, <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code>, or other section. If it is to +in the configuration file, outside of any <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="./mod/core.html#location"><Location></a></code>, <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code>, or other section. If it is to apply only to a particular directory, then it should go inside a -<code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> section referring to +<code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> section referring to that directory, and so on. See the <a href="sections.html">Configuration Sections</a> document for further discussion of these sections.</p> diff --git a/docs/manual/howto/access.html.en b/docs/manual/howto/access.html.en index 00fa93161b..4efacc52a0 100644 --- a/docs/manual/howto/access.html.en +++ b/docs/manual/howto/access.html.en @@ -128,7 +128,7 @@ Require not host gov</pre> <div class="section"> <h2><a name="env" id="env">Access control by arbitrary variables</a></h2> - <p>Using the <code class="directive"><a href="../mod/core.html#ifsection"><If></a></code>, + <p>Using the <code class="directive"><a href="../mod/core.html#if"><If></a></code>, you can allow or deny access based on arbitrary environment variables or request header values. For example, to deny access based on user-agent (the browser type) you might do the @@ -178,7 +178,7 @@ RewriteRule "^/fridge" "-" [F]</pre> to check. You can also redirect, or otherwise rewrite these requests, if that approach is preferred.</p> - <p>The <code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> directive, + <p>The <code class="directive"><a href="../mod/core.html#if"><If></a></code> directive, added in 2.4, replaces many things that <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> has traditionally been used to do, and you should probably look there first before resorting to mod_rewrite.</p> diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en index e34bc5bddd..1deee65c4f 100644 --- a/docs/manual/howto/auth.html.en +++ b/docs/manual/howto/auth.html.en @@ -131,7 +131,7 @@ module from each group.</p> <h2><a name="theprerequisites" id="theprerequisites">The Prerequisites</a></h2> <p>The directives discussed in this article will need to go either in your main server configuration file (typically in a - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> section), or + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section), or in per-directory configuration files (<code>.htaccess</code> files).</p> <p>If you plan to use <code>.htaccess</code> files, you will @@ -437,9 +437,9 @@ Require group GroupName</pre> <p>To take authorization a little further, authorization container directives such as - <code class="directive"><a href="../mod/mod_authz_core.html#requireallsection"><RequireAll></a></code> + <code class="directive"><a href="../mod/mod_authz_core.html#requireall"><RequireAll></a></code> and - <code class="directive"><a href="../mod/mod_authz_core.html#requireanysection"><RequireAny></a></code> + <code class="directive"><a href="../mod/mod_authz_core.html#requireany"><RequireAny></a></code> allow logic to be applied so that the order in which authorization is handled can be completely controlled through the configuration. See <a href="../mod/mod_authz_core.html#logic">Authorization @@ -471,9 +471,9 @@ Require group GroupName</pre> <p>With the introduction of authorization container directives such as - <code class="directive"><a href="../mod/mod_authz_core.html#requireallsection"><RequireAll></a></code> + <code class="directive"><a href="../mod/mod_authz_core.html#requireall"><RequireAll></a></code> and - <code class="directive"><a href="../mod/mod_authz_core.html#requireanysection"><RequireAny></a></code>, + <code class="directive"><a href="../mod/mod_authz_core.html#requireany"><RequireAny></a></code>, the configuration also has control over when the authorization methods are called and what criteria determines when access is granted. See @@ -484,7 +484,7 @@ Require group GroupName</pre> <p>By default all <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directives are handled as though contained within a - <code class="directive"><a href="../mod/mod_authz_core.html#requireanysection"><RequireAny></a></code> + <code class="directive"><a href="../mod/mod_authz_core.html#requireany"><RequireAny></a></code> container directive. In other words, if any of the specified authorization methods succeed, then authorization is granted.</p> @@ -555,8 +555,8 @@ Require group GroupName</pre> </RequireAll></pre> - <p>Using <code class="directive"><a href="../mod/mod_authz_core.html#requireallsection"><RequireAll></a></code> - with multiple <code class="directive"><a href="../mod/mod_authz_core.html#requiresection"><Require></a></code> directives, each negated with <code>not</code>, + <p>Using <code class="directive"><a href="../mod/mod_authz_core.html#requireall"><RequireAll></a></code> + with multiple <code class="directive"><a href="../mod/mod_authz_core.html#require"><Require></a></code> directives, each negated with <code>not</code>, will only allow access, if all of negated conditions are true. In other words, access will be blocked, if any of the negated conditions fails.</p> @@ -601,7 +601,7 @@ Require group GroupName</pre> <p>You should also read the documentation for <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> and <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> which contain some more information about how this all works. The - directive <code class="directive"><a href="../mod/mod_authn_core.html#authnprovideraliassection"><AuthnProviderAlias></a></code> can also help + directive <code class="directive"><a href="../mod/mod_authn_core.html#authnprovideralias"><AuthnProviderAlias></a></code> can also help in simplifying certain authentication configurations.</p> <p>The various ciphers supported by Apache for authentication data are diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en index 8d171f0012..3a4434fe71 100644 --- a/docs/manual/howto/htaccess.html.en +++ b/docs/manual/howto/htaccess.html.en @@ -134,7 +134,7 @@ changes on a per-directory basis.</p> <p>However, in general, use of <code>.htaccess</code> files should be avoided when possible. Any configuration that you would consider putting in a <code>.htaccess</code> file, can just as effectively be - made in a <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> section in your main server + made in a <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section in your main server configuration file.</p> <p>There are two main reasons to avoid the use of @@ -260,7 +260,7 @@ changes on a per-directory basis.</p> configuration files</a></h3> <p>As discussed in the documentation on <a href="../sections.html">Configuration Sections</a>, - <code>.htaccess</code> files can override the <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections for + <code>.htaccess</code> files can override the <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections for the corresponding directory, but will be overridden by other types of configuration sections from the main configuration files. This fact can be used to enforce certain configurations, even in the @@ -289,7 +289,7 @@ changes on a per-directory basis.</p> common misconception that you are required to use <code>.htaccess</code> files in order to implement password authentication. This is not the case. Putting authentication directives - in a <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> + in a <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section, in your main server configuration file, is the preferred way to implement this, and <code>.htaccess</code> files should be used only if you don't have access to the main server configuration file. See <a href="#when">above</a> for a discussion of when you should and should diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en index a223153212..a65fb3abbf 100644 --- a/docs/manual/howto/public_html.html.en +++ b/docs/manual/howto/public_html.html.en @@ -42,7 +42,7 @@ <p>in the default config file <code>conf/httpd.conf</code>, and adapting the <code>httpd-userdir.conf</code> file as necessary, or by including the appropriate directives in a - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> block + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> block within the main config file.</p> </div> <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Per-user web directories</a></li> @@ -153,7 +153,7 @@ UserDir enabled rbowen krietz</pre> <p>In order to give each user their own cgi-bin directory, you can use - a <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> + a <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> directive to make a particular subdirectory of a user's home directory cgi-enabled.</p> diff --git a/docs/manual/howto/reverse_proxy.html.en b/docs/manual/howto/reverse_proxy.html.en index ad0fc2a286..692e63f605 100644 --- a/docs/manual/howto/reverse_proxy.html.en +++ b/docs/manual/howto/reverse_proxy.html.en @@ -116,7 +116,7 @@ ProxyPassReverse "/images" "http://www.example.com/"</pre> requests and for the reverse proxy to load balance and failover among them. This group is sometimes called a <em>cluster</em> but Apache httpd's term is a <em>balancer</em>. One defines a balancer by leveraging the - <code class="directive"><a href="../mod/mod_proxy.html#proxysection"><Proxy></a></code> and + <code class="directive"><a href="../mod/mod_proxy.html#proxy"><Proxy></a></code> and <code class="directive"><a href="../mod/mod_proxy.html#balancermember">BalancerMember</a></code> directives as shown: </p> diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en index dff993b986..cf017eb509 100644 --- a/docs/manual/logs.html.en +++ b/docs/manual/logs.html.en @@ -597,7 +597,7 @@ CustomLog "|$/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" commo hosts</a>, there are several options for dealing with log files. First, it is possible to use logs exactly as in a single-host server. Simply by placing the logging directives - outside the <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> sections in the + outside the <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> sections in the main server context, it is possible to log all requests in the same access log and error log. This technique does not allow for easy collection of statistics on individual virtual @@ -606,7 +606,7 @@ CustomLog "|$/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" commo <p>If <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> or <code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code> directives are placed inside a - <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> section, all requests or errors for that virtual host will be logged only to the specified file. Any virtual host which does not have logging directives will still have its requests sent diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index f60b805c27..abd62796b1 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -54,11 +54,11 @@ available</td></tr> <li><img alt="" src="../images/down.gif" /> <a href="#defaultruntimedir">DefaultRuntimeDir</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#defaulttype">DefaultType</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#define">Define</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#directorysection"><Directory></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#directorymatchsection"><DirectoryMatch></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#directory"><Directory></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#directorymatch"><DirectoryMatch></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#documentroot">DocumentRoot</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#elsesection"><Else></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#elseifsection"><ElseIf></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#else"><Else></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#elseif"><ElseIf></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#enablemmap">EnableMMAP</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#enablesendfile">EnableSendfile</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#error">Error</a></li> @@ -67,32 +67,32 @@ available</td></tr> <li><img alt="" src="../images/down.gif" /> <a href="#errorlogformat">ErrorLogFormat</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#extendedstatus">ExtendedStatus</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#fileetag">FileETag</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#filessection"><Files></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#filesmatchsection"><FilesMatch></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#files"><Files></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#filesmatch"><FilesMatch></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#forcetype">ForceType</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#gprofdir">GprofDir</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#hostnamelookups">HostnameLookups</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#httpprotocoloptions">HttpProtocolOptions</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#ifsection"><If></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#ifdefinesection"><IfDefine></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#ifdirectivesection"><IfDirective></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#iffilesection"><IfFile></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#ifmodulesection"><IfModule></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#ifsectionsection"><IfSection></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#if"><If></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#ifdefine"><IfDefine></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#ifdirective"><IfDirective></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#iffile"><IfFile></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#ifmodule"><IfModule></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#ifsection"><IfSection></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#include">Include</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#includeoptional">IncludeOptional</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#keepalive">KeepAlive</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#keepalivetimeout">KeepAliveTimeout</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#limitsection"><Limit></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#limitexceptsection"><LimitExcept></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#limit"><Limit></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#limitexcept"><LimitExcept></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#limitinternalrecursion">LimitInternalRecursion</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#limitrequestbody">LimitRequestBody</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#limitrequestfields">LimitRequestFields</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#limitrequestfieldsize">LimitRequestFieldSize</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#limitrequestline">LimitRequestLine</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#limitxmlrequestbody">LimitXMLRequestBody</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#locationsection"><Location></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#locationmatchsection"><LocationMatch></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#location"><Location></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#locationmatch"><LocationMatch></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#logleveloverride">LogLevelOverride</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li> @@ -128,7 +128,7 @@ available</td></tr> <li><img alt="" src="../images/down.gif" /> <a href="#undefine">UnDefine</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalname">UseCanonicalName</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#virtualhostsection"><VirtualHost></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost"><VirtualHost></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#warning">Warning</a></li> </ul> <h3>Bugfix checklist</h3><ul class="seealso"><li><a href="https://www.apache.org/dist/httpd/CHANGES_2.4">httpd changelog</a></li><li><a href="https://bz.apache.org/bugzilla/buglist.cgi?bug_status=__open__&list_id=144532&product=Apache%20httpd-2&query_format=specific&order=changeddate%20DESC%2Cpriority%2Cbug_severity&component=core">Known issues</a></li><li><a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&component=core">Report a bug</a></li></ul><h3>See also</h3> @@ -436,9 +436,9 @@ NoDecode option available in 2.3.12 and later.</td></tr> <div class="note"><h3>Only available in <Directory> sections</h3> <code class="directive">AllowOverride</code> is valid only in - <code class="directive"><a href="#directorysection"><Directory></a></code> - sections specified without regular expressions, not in <code class="directive"><a href="#locationsection"><Location></a></code>, <code class="directive"><a href="#directorymatchsection"><DirectoryMatch></a></code> or - <code class="directive"><a href="#filessection"><Files></a></code> sections. + <code class="directive"><a href="#directory"><Directory></a></code> + sections specified without regular expressions, not in <code class="directive"><a href="#location"><Location></a></code>, <code class="directive"><a href="#directorymatch"><DirectoryMatch></a></code> or + <code class="directive"><a href="#files"><Files></a></code> sections. </div> <p>When this directive is set to <code>None</code> and <code class="directive"><a href="#allowoverridelist">AllowOverrideList</a></code> is set to @@ -595,9 +595,9 @@ NoDecode option available in 2.3.12 and later.</td></tr> <div class="note"><h3>Only available in <Directory> sections</h3> <code class="directive">AllowOverrideList</code> is valid only in - <code class="directive"><a href="#directorysection"><Directory></a></code> - sections specified without regular expressions, not in <code class="directive"><a href="#locationsection"><Location></a></code>, <code class="directive"><a href="#directorymatchsection"><DirectoryMatch></a></code> or - <code class="directive"><a href="#filessection"><Files></a></code> sections. + <code class="directive"><a href="#directory"><Directory></a></code> + sections specified without regular expressions, not in <code class="directive"><a href="#location"><Location></a></code>, <code class="directive"><a href="#directorymatch"><DirectoryMatch></a></code> or + <code class="directive"><a href="#files"><Files></a></code> sections. </div> <p>When this directive is set to <code>None</code> and <code class="directive"><a href="#allowoverride">AllowOverride</a></code> is set to <code>None</code>, @@ -867,7 +867,7 @@ which no other media type configuration could be found. <p>In its one parameter form, <code class="directive">Define</code> is equivalent to passing the <code>-D</code> argument to <code class="program"><a href="../programs/httpd.html">httpd</a></code>. It can be used to toggle the use of - <code class="directive"><a href="#ifdefinesection"><IfDefine></a></code> + <code class="directive"><a href="#ifdefine"><IfDefine></a></code> sections without needing to alter <code>-D</code> arguments in any startup scripts.</p> @@ -898,7 +898,7 @@ DocumentRoot "/var/www/${servername}/htdocs"</pre> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="Directorysection" id="Directorysection"><Directory></a> <a name="directorysection" id="directorysection">Directive</a></h2> +<div class="directive-section"><h2><a name="Directory" id="Directory"><Directory></a> <a name="directory" id="directory">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose a group of directives that apply only to the named file-system directory, sub-directories, and their contents.</td></tr> @@ -1017,7 +1017,7 @@ named file-system directory, sub-directories, and their contents.</td></tr> <p>The directory sections occur in the <code>httpd.conf</code> file. <code class="directive"><Directory></code> directives - cannot nest, and cannot appear in a <code class="directive"><a href="#limitsection"><Limit></a></code> or <code class="directive"><a href="#limitexceptsection"><LimitExcept></a></code> section.</p> + cannot nest, and cannot appear in a <code class="directive"><a href="#limit"><Limit></a></code> or <code class="directive"><a href="#limitexcept"><LimitExcept></a></code> section.</p> <h3>See also</h3> <ul> @@ -1028,7 +1028,7 @@ named file-system directory, sub-directories, and their contents.</td></tr> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="DirectoryMatchsection" id="DirectoryMatchsection"><DirectoryMatch></a> <a name="directorymatchsection" id="directorymatchsection">Directive</a></h2> +<div class="directive-section"><h2><a name="DirectoryMatch" id="DirectoryMatch"><DirectoryMatch></a> <a name="directorymatch" id="directorymatch">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose directives that apply to the contents of file-system directories matching a regular expression.</td></tr> @@ -1041,7 +1041,7 @@ the contents of file-system directories matching a regular expression.</td></tr> <p><code class="directive"><DirectoryMatch></code> and <code></DirectoryMatch></code> are used to enclose a group of directives which will apply only to the named directory (and the files within), - the same as <code class="directive"><a href="#directorysection"><Directory></a></code>. + the same as <code class="directive"><a href="#directory"><Directory></a></code>. However, it takes as an argument a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>. For example:</p> @@ -1055,7 +1055,7 @@ the contents of file-system directories matching a regular expression.</td></tr> <div class="note"><h3>Compatibility</h3> Prior to 2.3.9, this directive implicitly applied to sub-directories - (like <code class="directive"><a href="#directorysection"><Directory></a></code>) and + (like <code class="directive"><a href="#directory"><Directory></a></code>) and could not match the end of line symbol ($). In 2.3.9 and later, only directories that match the expression are affected by the enclosed directives. @@ -1081,7 +1081,7 @@ the contents of file-system directories matching a regular expression.</td></tr> <h3>See also</h3> <ul> -<li><code class="directive"><a href="#directorysection"><Directory></a></code> for +<li><code class="directive"><a href="#directory"><Directory></a></code> for a description of how regular expressions are mixed in with normal <code class="directive"><Directory></code>s</li> <li><a href="../sections.html">How <Directory>, <Location> and @@ -1123,11 +1123,11 @@ Locations</a></li> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="Elsesection" id="Elsesection"><Else></a> <a name="elsesection" id="elsesection">Directive</a></h2> +<div class="directive-section"><h2><a name="Else" id="Else"><Else></a> <a name="else" id="else">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply only if the condition of a -previous <code class="directive"><a href="#ifsection"><If></a></code> or -<code class="directive"><a href="#elseifsection"><ElseIf></a></code> section is not +previous <code class="directive"><a href="#if"><If></a></code> or +<code class="directive"><a href="#elseif"><ElseIf></a></code> section is not satisfied by a request at runtime</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><Else> ... </Else></code></td></tr> <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr> @@ -1159,8 +1159,8 @@ satisfied by a request at runtime</td></tr> <h3>See also</h3> <ul> -<li><code class="directive"><a href="#ifsection"><If></a></code></li> -<li><code class="directive"><a href="#elseifsection"><ElseIf></a></code></li> +<li><code class="directive"><a href="#if"><If></a></code></li> +<li><code class="directive"><a href="#elseif"><ElseIf></a></code></li> <li><a href="../sections.html">How <Directory>, <Location>, <Files> sections work</a> for an explanation of how these different sections are combined when a request is received. @@ -1170,11 +1170,11 @@ satisfied by a request at runtime</td></tr> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="ElseIfsection" id="ElseIfsection"><ElseIf></a> <a name="elseifsection" id="elseifsection">Directive</a></h2> +<div class="directive-section"><h2><a name="ElseIf" id="ElseIf"><ElseIf></a> <a name="elseif" id="elseif">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply only if a condition is satisfied by a request at runtime while the condition of a previous -<code class="directive"><a href="#ifsection"><If></a></code> or +<code class="directive"><a href="#if"><If></a></code> or <code class="directive"><ElseIf></code> section is not satisfied</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><ElseIf <var>expression</var>> ... </ElseIf></code></td></tr> @@ -1210,8 +1210,8 @@ satisfied</td></tr> <ul> <li><a href="../expr.html">Expressions in Apache HTTP Server</a>, for a complete reference and more examples.</li> -<li><code class="directive"><a href="#ifsection"><If></a></code></li> -<li><code class="directive"><a href="#elsesection"><Else></a></code></li> +<li><code class="directive"><a href="#if"><If></a></code></li> +<li><code class="directive"><a href="#else"><Else></a></code></li> <li><a href="../sections.html">How <Directory>, <Location>, <Files> sections work</a> for an explanation of how these different sections are combined when a request is received. @@ -1813,7 +1813,7 @@ earlier.</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="Filessection" id="Filessection"><Files></a> <a name="filessection" id="filessection">Directive</a></h2> +<div class="directive-section"><h2><a name="Files" id="Files"><Files></a> <a name="files" id="files">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply to matched filenames</td></tr> @@ -1825,17 +1825,17 @@ filenames</td></tr> </table> <p>The <code class="directive"><Files></code> directive limits the scope of the enclosed directives by filename. It is comparable - to the <code class="directive"><a href="#directorysection"><Directory></a></code> - and <code class="directive"><a href="#locationsection"><Location></a></code> + to the <code class="directive"><a href="#directory"><Directory></a></code> + and <code class="directive"><a href="#location"><Location></a></code> directives. It should be matched with a <code></Files></code> directive. The directives given within this section will be applied to any object with a basename (last component of filename) matching the specified filename. <code class="directive"><Files></code> sections are processed in the order they appear in the - configuration file, after the <code class="directive"><a href="#directorysection"><Directory></a></code> sections and - <code>.htaccess</code> files are read, but before <code class="directive"><a href="#locationsection"><Location></a></code> sections. Note + configuration file, after the <code class="directive"><a href="#directory"><Directory></a></code> sections and + <code>.htaccess</code> files are read, but before <code class="directive"><a href="#location"><Location></a></code> sections. Note that <code class="directive"><Files></code> can be nested - inside <code class="directive"><a href="#directorysection"><Directory></a></code> sections to restrict the + inside <code class="directive"><a href="#directory"><Directory></a></code> sections to restrict the portion of the filesystem they apply to.</p> <p>The <var>filename</var> argument should include a filename, or @@ -1858,10 +1858,10 @@ filenames</td></tr> </Files></pre> - <p>would match most common Internet graphics formats. <code class="directive"><a href="#filesmatchsection"><FilesMatch></a></code> is preferred, + <p>would match most common Internet graphics formats. <code class="directive"><a href="#filesmatch"><FilesMatch></a></code> is preferred, however.</p> - <p>Note that unlike <code class="directive"><a href="#directorysection"><Directory></a></code> and <code class="directive"><a href="#locationsection"><Location></a></code> sections, <code class="directive"><Files></code> sections can be used inside + <p>Note that unlike <code class="directive"><a href="#directory"><Directory></a></code> and <code class="directive"><a href="#location"><Location></a></code> sections, <code class="directive"><Files></code> sections can be used inside <code>.htaccess</code> files. This allows users to control access to their own files, at a file-by-file level.</p> @@ -1874,7 +1874,7 @@ filenames</td></tr> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="FilesMatchsection" id="FilesMatchsection"><FilesMatch></a> <a name="filesmatchsection" id="filesmatchsection">Directive</a></h2> +<div class="directive-section"><h2><a name="FilesMatch" id="FilesMatch"><FilesMatch></a> <a name="filesmatch" id="filesmatch">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply to regular-expression matched filenames</td></tr> @@ -1886,7 +1886,7 @@ filenames</td></tr> </table> <p>The <code class="directive"><FilesMatch></code> directive limits the scope of the enclosed directives by filename, just as the - <code class="directive"><a href="#filessection"><Files></a></code> directive + <code class="directive"><a href="#files"><Files></a></code> directive does. However, it accepts a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>. For example:</p> @@ -1932,9 +1932,9 @@ media type in the HTTP Content-Type header field</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr> </table> <p>When placed into an <code>.htaccess</code> file or a - <code class="directive"><a href="#directorysection"><Directory></a></code>, or - <code class="directive"><a href="#locationsection"><Location></a></code> or - <code class="directive"><a href="#filessection"><Files></a></code> + <code class="directive"><a href="#directory"><Directory></a></code>, or + <code class="directive"><a href="#location"><Location></a></code> or + <code class="directive"><a href="#files"><Files></a></code> section, this directive forces all matching files to be served with the content type identification given by <var>media-type</var>. For example, if you had a directory full of @@ -2177,7 +2177,7 @@ media type in the HTTP Content-Type header field</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="Ifsection" id="Ifsection"><If></a> <a name="ifsection" id="ifsection">Directive</a></h2> +<div class="directive-section"><h2><a name="If" id="If"><If></a> <a name="if" id="if">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply only if a condition is satisfied by a request at runtime</td></tr> @@ -2226,8 +2226,8 @@ satisfied by a request at runtime</td></tr> <ul> <li><a href="../expr.html">Expressions in Apache HTTP Server</a>, for a complete reference and more examples.</li> -<li><code class="directive"><a href="#elseifsection"><ElseIf></a></code></li> -<li><code class="directive"><a href="#elsesection"><Else></a></code></li> +<li><code class="directive"><a href="#elseif"><ElseIf></a></code></li> +<li><code class="directive"><a href="#else"><Else></a></code></li> <li><a href="../sections.html">How <Directory>, <Location>, <Files> sections work</a> for an explanation of how these different sections are combined when a request is received. @@ -2237,7 +2237,7 @@ for a complete reference and more examples.</li> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="IfDefinesection" id="IfDefinesection"><IfDefine></a> <a name="ifdefinesection" id="ifdefinesection">Directive</a></h2> +<div class="directive-section"><h2><a name="IfDefine" id="IfDefine"><IfDefine></a> <a name="ifdefine" id="ifdefine">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that will be processed only if a test is true at startup</td></tr> @@ -2295,7 +2295,7 @@ if a test is true at startup</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="IfDirectivesection" id="IfDirectivesection"><IfDirective></a> <a name="ifdirectivesection" id="ifdirectivesection">Directive</a></h2> +<div class="directive-section"><h2><a name="IfDirective" id="IfDirective"><IfDirective></a> <a name="ifdirective" id="ifdirective">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that are processed conditional on the presence or absence of a specific directive</td></tr> @@ -2335,11 +2335,11 @@ presence or absence of a specific directive</td></tr> <h3>See also</h3> <ul> -<li><code class="directive"><a href="#ifsectionsection"><IfSection></a></code></li> +<li><code class="directive"><a href="#ifsection"><IfSection></a></code></li> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="IfFilesection" id="IfFilesection"><IfFile></a> <a name="iffilesection" id="iffilesection">Directive</a></h2> +<div class="directive-section"><h2><a name="IfFile" id="IfFile"><IfFile></a> <a name="iffile" id="iffile">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that will be processed only if file exists at startup</td></tr> @@ -2376,7 +2376,7 @@ if file exists at startup</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="IfModulesection" id="IfModulesection"><IfModule></a> <a name="ifmodulesection" id="ifmodulesection">Directive</a></h2> +<div class="directive-section"><h2><a name="IfModule" id="IfModule"><IfModule></a> <a name="ifmodule" id="ifmodule">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that are processed conditional on the presence or absence of a specific module</td></tr> @@ -2427,7 +2427,7 @@ presence or absence of a specific module</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="IfSectionsection" id="IfSectionsection"><IfSection></a> <a name="ifsectionsection" id="ifsectionsection">Directive</a></h2> +<div class="directive-section"><h2><a name="IfSection" id="IfSection"><IfSection></a> <a name="ifsection" id="ifsection">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that are processed conditional on the presence or absence of a specific section directive</td></tr> @@ -2482,7 +2482,7 @@ presence or absence of a specific section directive</td></tr> <h3>See also</h3> <ul> -<li><code class="directive"><a href="#ifdirectivesection"><IfDirective></a></code></li> +<li><code class="directive"><a href="#ifdirective"><IfDirective></a></code></li> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -2642,7 +2642,7 @@ requests on a persistent connection</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="Limitsection" id="Limitsection"><Limit></a> <a name="limitsection" id="limitsection">Directive</a></h2> +<div class="directive-section"><h2><a name="Limit" id="Limit"><Limit></a> <a name="limit" id="limit">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Restrict enclosed access controls to only certain HTTP methods</td></tr> @@ -2682,15 +2682,15 @@ methods</td></tr> restrict <code>HEAD</code> requests. The <code>TRACE</code> method cannot be limited (see <code class="directive"><a href="#traceenable">TraceEnable</a></code>).</p> - <div class="warning">A <code class="directive"><a href="#limitexceptsection"><LimitExcept></a></code> section should always be + <div class="warning">A <code class="directive"><a href="#limitexcept"><LimitExcept></a></code> section should always be used in preference to a <code class="directive"><Limit></code> - section when restricting access, since a <code class="directive"><a href="#limitexceptsection"><LimitExcept></a></code> section provides protection + section when restricting access, since a <code class="directive"><a href="#limitexcept"><LimitExcept></a></code> section provides protection against arbitrary methods.</div> <p>The <code class="directive"><Limit></code> and - <code class="directive"><a href="#limitexceptsection"><LimitExcept></a></code> + <code class="directive"><a href="#limitexcept"><LimitExcept></a></code> directives may be nested. In this case, each successive level of - <code class="directive"><Limit></code> or <code class="directive"><a href="#limitexceptsection"><LimitExcept></a></code> directives must + <code class="directive"><Limit></code> or <code class="directive"><a href="#limitexcept"><LimitExcept></a></code> directives must further restrict the set of methods to which access controls apply.</p> <div class="warning">When using @@ -2716,7 +2716,7 @@ methods</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="LimitExceptsection" id="LimitExceptsection"><LimitExcept></a> <a name="limitexceptsection" id="limitexceptsection">Directive</a></h2> +<div class="directive-section"><h2><a name="LimitExcept" id="LimitExcept"><LimitExcept></a> <a name="limitexcept" id="limitexcept">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Restrict access controls to all HTTP methods except the named ones</td></tr> @@ -2731,9 +2731,9 @@ except the named ones</td></tr> <code></LimitExcept></code> are used to enclose a group of access control directives which will then apply to any HTTP access method <strong>not</strong> listed in the arguments; - i.e., it is the opposite of a <code class="directive"><a href="#limitsection"><Limit></a></code> section and can be used to control + i.e., it is the opposite of a <code class="directive"><a href="#limit"><Limit></a></code> section and can be used to control both standard and nonstandard/unrecognized methods. See the - documentation for <code class="directive"><a href="#limitsection"><Limit></a></code> for more details.</p> + documentation for <code class="directive"><a href="#limit"><Limit></a></code> for more details.</p> <p>For example:</p> @@ -2980,7 +2980,7 @@ from the client</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="Locationsection" id="Locationsection"><Location></a> <a name="locationsection" id="locationsection">Directive</a></h2> +<div class="directive-section"><h2><a name="Location" id="Location"><Location></a> <a name="location" id="location">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Applies the enclosed directives only to matching URLs</td></tr> @@ -2992,11 +2992,11 @@ URLs</td></tr> </table> <p>The <code class="directive"><Location></code> directive limits the scope of the enclosed directives by URL. It is similar to the - <code class="directive"><a href="#directorysection"><Directory></a></code> + <code class="directive"><a href="#directory"><Directory></a></code> directive, and starts a subsection which is terminated with a <code></Location></code> directive. <code class="directive"><Location></code> sections are processed in the - order they appear in the configuration file, after the <code class="directive"><a href="#directorysection"><Directory></a></code> sections and - <code>.htaccess</code> files are read, and after the <code class="directive"><a href="#filessection"><Files></a></code> sections.</p> + order they appear in the configuration file, after the <code class="directive"><a href="#directory"><Directory></a></code> sections and + <code>.htaccess</code> files are read, and after the <code class="directive"><a href="#files"><Files></a></code> sections.</p> <p><code class="directive"><Location></code> sections operate completely outside the filesystem. This has several consequences. @@ -3041,7 +3041,7 @@ URLs</td></tr> <p>Use <code class="directive"><Location></code> to apply directives to content that lives outside the filesystem. For - content that lives in the filesystem, use <code class="directive"><a href="#directorysection"><Directory></a></code> and <code class="directive"><a href="#filessection"><Files></a></code>. An exception is + content that lives in the filesystem, use <code class="directive"><a href="#directory"><Directory></a></code> and <code class="directive"><a href="#files"><Files></a></code>. An exception is <code><Location "/"></code>, which is an easy way to apply a configuration to the entire server.</p> </div> @@ -3067,7 +3067,7 @@ URLs</td></tr> <p>would match URLs that contained the substring <code>/extra/data</code> - or <code>/special/data</code>. The directive <code class="directive"><a href="#locationmatchsection"><LocationMatch></a></code> behaves + or <code>/special/data</code>. The directive <code class="directive"><a href="#locationmatch"><LocationMatch></a></code> behaves identical to the regex version of <code class="directive"><Location></code>, and is preferred, for the simple reason that <code>~</code> is hard to distinguish from <code>-</code> in many fonts.</p> @@ -3090,7 +3090,7 @@ URLs</td></tr> where multiple adjacent slashes are frequently collapsed to a single slash (<em>i.e.</em>, <code>/home///foo</code> is the same as <code>/home/foo</code>). In URL-space this is not necessarily true. - The <code class="directive"><a href="#locationmatchsection"><LocationMatch></a></code> + The <code class="directive"><a href="#locationmatch"><LocationMatch></a></code> directive and the regex version of <code class="directive"><Location></code> require you to explicitly specify multiple slashes if that is your intention.</p> @@ -3112,7 +3112,7 @@ URLs</td></tr> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="LocationMatchsection" id="LocationMatchsection"><LocationMatch></a> <a name="locationmatchsection" id="locationmatchsection">Directive</a></h2> +<div class="directive-section"><h2><a name="LocationMatch" id="LocationMatch"><LocationMatch></a> <a name="locationmatch" id="locationmatch">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Applies the enclosed directives only to regular-expression matching URLs</td></tr> @@ -3124,7 +3124,7 @@ matching URLs</td></tr> </table> <p>The <code class="directive"><LocationMatch></code> directive limits the scope of the enclosed directives by URL, in an identical manner - to <code class="directive"><a href="#locationsection"><Location></a></code>. However, + to <code class="directive"><a href="#location"><Location></a></code>. However, it takes a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a> as an argument instead of a simple string. For example:</p> @@ -3397,7 +3397,7 @@ LogLevel info ssl_module:warn</pre> processing. Therefore, <code class="directive">LogLevelOverride</code> allows to change the log level for things like the SSL handshake which happen before a <code class="directive"><a href="#loglevel">LogLevel</a></code> directive in an - <code class="directive"><a href="#ifsection"><If></a></code> container would + <code class="directive"><a href="#if"><If></a></code> container would be evaluated.</p> <p><code class="directive">LogLevelOverride</code> accepts either a single @@ -3858,10 +3858,10 @@ directory</td></tr> the default setting. <div class="note"> <p>Even though the server follows the symlink it does <em>not</em> - change the pathname used to match against <code class="directive"><a href="#directorysection"><Directory></a></code> sections.</p> + change the pathname used to match against <code class="directive"><a href="#directory"><Directory></a></code> sections.</p> <p>The <code>FollowSymLinks</code> and - <code>SymLinksIfOwnerMatch</code> <code class="directive"><a href="#options">Options</a></code> work only in <code class="directive"><a href="#directorysection"><Directory></a></code> sections or + <code>SymLinksIfOwnerMatch</code> <code class="directive"><a href="#options">Options</a></code> work only in <code class="directive"><a href="#directory"><Directory></a></code> sections or <code>.htaccess</code> files.</p> <p>Omitting this option should not be considered a security restriction, @@ -3901,7 +3901,7 @@ directory</td></tr> "MultiViews" are allowed using <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>. <div class="note"><h3>Note</h3> <p>This option gets ignored if set - anywhere other than <code class="directive"><a href="#directorysection"><Directory></a></code>, as <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> + anywhere other than <code class="directive"><a href="#directory"><Directory></a></code>, as <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> needs real resources to compare against and evaluate from.</p></div> </dd> @@ -3913,7 +3913,7 @@ directory</td></tr> <div class="note"><h3>Note</h3> <p>The <code>FollowSymLinks</code> and - <code>SymLinksIfOwnerMatch</code> <code class="directive"><a href="#options">Options</a></code> work only in <code class="directive"><a href="#directorysection"><Directory></a></code> sections or + <code>SymLinksIfOwnerMatch</code> <code class="directive"><a href="#options">Options</a></code> work only in <code class="directive"><a href="#directory"><Directory></a></code> sections or <code>.htaccess</code> files.</p> <p>This option should not be considered a security restriction, @@ -4388,11 +4388,11 @@ to name-virtual hosts</td></tr> </VirtualHost></pre> - <p>Name-based virtual hosts for the best-matching set of <code class="directive"><a href="#virtualhostsection"><virtualhost></a></code>s are processed + <p>Name-based virtual hosts for the best-matching set of <code class="directive"><a href="#virtualhost"><virtualhost></a></code>s are processed in the order they appear in the configuration. The first matching <code class="directive"><a href="#servername">ServerName</a></code> or <code class="directive"><a href="#serveralias">ServerAlias</a></code> is used, with no different precedence for wildcards (nor for ServerName vs. ServerAlias). </p> - <p>The complete list of names in the <code class="directive"><a href="#virtualhostsection"><VirtualHost></a></code> + <p>The complete list of names in the <code class="directive"><a href="#virtualhost"><VirtualHost></a></code> directive are treated just like a (non wildcard) <code class="directive">ServerAlias</code>.</p> @@ -4453,7 +4453,7 @@ itself</td></tr> <p>If you are using <a href="../vhosts/name-based.html">name-based virtual hosts</a>, the <code class="directive">ServerName</code> inside a - <code class="directive"><a href="#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="#virtualhost"><VirtualHost></a></code> section specifies what hostname must appear in the request's <code>Host:</code> header to match this virtual host.</p> @@ -4666,8 +4666,8 @@ handler</td></tr> <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.5 and later</td></tr> </table> <p>When placed into an <code>.htaccess</code> file or a - <code class="directive"><a href="#directorysection"><Directory></a></code> or - <code class="directive"><a href="#locationsection"><Location></a></code> + <code class="directive"><a href="#directory"><Directory></a></code> or + <code class="directive"><a href="#location"><Location></a></code> section, this directive forces all matching files to be parsed through the <a href="../handler.html">handler</a> given by <var>handler-name</var>. For example, if you had a directory you @@ -4868,7 +4868,7 @@ certain events before failing a request</td></tr> </table> <p>Undoes the effect of a <code class="directive"><a href="#define">Define</a></code> or of passing a <code>-D</code> argument to <code class="program"><a href="../programs/httpd.html">httpd</a></code>.</p> - <p>This directive can be used to toggle the use of <code class="directive"><a href="#ifdefinesection"><IfDefine></a></code> sections without needing to alter + <p>This directive can be used to toggle the use of <code class="directive"><a href="#ifdefine"><IfDefine></a></code> sections without needing to alter <code>-D</code> arguments in any startup scripts.</p> <p>While this directive is supported in virtual host context, the changes it makes are visible to any later configuration @@ -5000,7 +5000,7 @@ port</td></tr> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="VirtualHostsection" id="VirtualHostsection"><VirtualHost></a> <a name="virtualhostsection" id="virtualhostsection">Directive</a></h2> +<div class="directive-section"><h2><a name="VirtualHost" id="VirtualHost"><VirtualHost></a> <a name="virtualhost" id="virtualhost">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply only to a specific hostname or IP address</td></tr> diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en index 7a91a84bf8..c2feba1216 100644 --- a/docs/manual/mod/directive-dict.html.en +++ b/docs/manual/mod/directive-dict.html.en @@ -175,22 +175,22 @@ <dd>This means that the directive may be used in the server configuration files (<em>e.g.</em>, <code>httpd.conf</code>), but <strong>not</strong> within any - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> - or <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> + or <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> containers. It is not allowed in <code>.htaccess</code> files at all.</dd> <dt>virtual host</dt> <dd>This context means that the directive may appear inside - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> containers in the server configuration files.</dd> <dt>directory</dt> <dd>A directive marked as being valid in this context may be - used inside <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code>, <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code>, <code class="directive"><a href="../mod/core.html#ifsection"><If></a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxysection"><Proxy></a></code> containers + used inside <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#location"><Location></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, <code class="directive"><a href="../mod/core.html#if"><If></a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxy"><Proxy></a></code> containers in the server configuration files, subject to the restrictions outlined in <a href="../sections.html">Configuration Sections</a>.</dd> @@ -215,8 +215,8 @@ words, a directive that is marked as being valid in "<code>server config, .htaccess</code>" can be used in the <code>httpd.conf</code> file and in <code>.htaccess</code> - files, but not within any <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> or - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + files, but not within any <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> or + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> containers.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> diff --git a/docs/manual/mod/mod_access_compat.html.en b/docs/manual/mod/mod_access_compat.html.en index 1fb6350ec9..090e27fc43 100644 --- a/docs/manual/mod/mod_access_compat.html.en +++ b/docs/manual/mod/mod_access_compat.html.en @@ -43,9 +43,9 @@ have been deprecated by the new authz refactoring. Please see <h3>Summary</h3> <p>The directives provided by <code class="module"><a href="../mod/mod_access_compat.html">mod_access_compat</a></code> are - used in <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code>, - <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code>, and - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> sections + used in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, + <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, and + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections as well as <code><a href="core.html#accessfilename">.htaccess</a> </code> files to control access to particular parts of the server. Access can be controlled based on the client hostname, IP address, or @@ -78,7 +78,7 @@ have been deprecated by the new authz refactoring. Please see <code>POST</code>, etc). This is the desired behavior in most cases. However, it is possible to restrict some methods, while leaving other methods unrestricted, by enclosing the directives - in a <code class="directive"><a href="../mod/core.html#limitsection"><Limit></a></code> section.</p> + in a <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> section.</p> <div class="note"> <h3>Merging of configuration sections</h3> <p>When any directive provided by this module is used in a new @@ -381,9 +381,9 @@ Deny from foo.example.org</pre> directive processing only within each phase of the server's configuration processing. This implies, for example, that an <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directive occurring in a - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> section will + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section will always be evaluated after an <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directive occurring in a - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> section or + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section or <code>.htaccess</code> file, regardless of the setting of the <code class="directive">Order</code> directive. For details on the merging of configuration sections, see the documentation on <a href="../sections.html">How Directory, Location and Files sections @@ -451,7 +451,7 @@ Satisfy Any</pre> for the <code>/var/www/private/public</code> directory.</p> <p>Since version 2.0.51 <code class="directive">Satisfy</code> directives can - be restricted to particular methods by <code class="directive"><a href="../mod/core.html#limitsection"><Limit></a></code> and <code class="directive"><a href="../mod/core.html#limitexceptsection"><LimitExcept></a></code> sections.</p> + be restricted to particular methods by <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> and <code class="directive"><a href="../mod/core.html#limitexcept"><LimitExcept></a></code> sections.</p> <div class="note"> <h3>Merging of configuration sections</h3> <p>When any directive provided by this module is used in a new diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en index 27074da7e0..3bbf0b28df 100644 --- a/docs/manual/mod/mod_alias.html.en +++ b/docs/manual/mod/mod_alias.html.en @@ -57,8 +57,8 @@ <p>When the <code class="directive"><a href="#alias">Alias</a></code>, <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and <code class="directive"><a href="#redirect">Redirect</a></code> directives are used - within a <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> - or <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> + within a <code class="directive"><a href="../mod/core.html#location"><Location></a></code> + or <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section, <a href="../expr.html">expression syntax</a> can be used to manipulate the destination path or URL. </p> @@ -95,7 +95,7 @@ <p>Aliases and Redirects occurring in different contexts are processed like other directives according to standard <a href="../sections.html#mergin">merging rules</a>. But when multiple Aliases or Redirects occur in the same context (for example, in the - same <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + same <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section) they are processed in a particular order.</p> <p>First, all Redirects are processed before Aliases are processed, @@ -121,8 +121,8 @@ Alias "/foo" "/gaq"</pre> <p>When the <code class="directive"><a href="#alias">Alias</a></code>, <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and <code class="directive"><a href="#redirect">Redirect</a></code> directives are used - within a <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> - or <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> + within a <code class="directive"><a href="../mod/core.html#location"><Location></a></code> + or <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section, these directives will take precedence over any globally defined <code class="directive"><a href="#alias">Alias</a></code>, <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and @@ -169,11 +169,11 @@ Alias "/foo" "/gaq"</pre> <var>URL-path</var> then you must also omit it from the <var>file-path</var>.</p> - <p>Note that you may need to specify additional <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections which + <p>Note that you may need to specify additional <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections which cover the <em>destination</em> of aliases. Aliasing occurs before - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections are checked, so only the destination of aliases are affected. - (Note however <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> + (Note however <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections are run through once before aliases are performed, so they will apply.)</p> @@ -191,8 +191,8 @@ Alias "/foo" "/gaq"</pre> matches any number of slashes in the requested URL-path.</p> <p>If the <code class="directive">Alias</code> directive is used within a - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> - or <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> + or <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section the URL-path is omitted, and the file-path is interpreted using <a href="../expr.html">expression syntax</a>.<br /> This syntax is available in Apache 2.4.19 and later.</p> @@ -393,8 +393,8 @@ Redirect 303 "/three" "http://example.com/other"</pre> <p>If the <code class="directive">Redirect</code> directive is used within a - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> - or <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> + or <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section with the <var>URL-path</var> omitted, then the <var>URL</var> parameter will be interpreted using <a href="../expr.html">expression syntax</a>.<br /> This syntax is available in Apache 2.4.19 and later.</p> @@ -530,7 +530,7 @@ target as a CGI script</td></tr> URL and designating CGI scripts at the same time. If you do choose to place your CGI scripts in a directory already accessible from the web, do not use - <code class="directive">ScriptAlias</code>. Instead, use <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>, and <code class="directive"><a href="../mod/core.html#options">Options</a></code> as in: + <code class="directive">ScriptAlias</code>. Instead, use <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>, and <code class="directive"><a href="../mod/core.html#options">Options</a></code> as in: <pre class="prettyprint lang-config"><Directory "/usr/local/apache2/htdocs/cgi-bin"> SetHandler cgi-script Options ExecCGI @@ -543,8 +543,8 @@ target as a CGI script</td></tr> <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> section.</div> <p>If the <code class="directive">ScriptAlias</code> directive is used within - a <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> - or <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> + a <code class="directive"><a href="../mod/core.html#location"><Location></a></code> + or <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section with the URL-path omitted, then the URL parameter will be interpreted using <a href="../expr.html">expression syntax</a>.<br /> This syntax is available in Apache 2.4.19 and later.</p> diff --git a/docs/manual/mod/mod_authn_core.html.en b/docs/manual/mod/mod_authn_core.html.en index d61d40898a..5e2492822a 100644 --- a/docs/manual/mod/mod_authn_core.html.en +++ b/docs/manual/mod/mod_authn_core.html.en @@ -47,7 +47,7 @@ </ul><h3 class="directives">Directives</h3> <ul id="toc"> <li><img alt="" src="../images/down.gif" /> <a href="#authname">AuthName</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#authnprovideraliassection"><AuthnProviderAlias></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#authnprovideralias"><AuthnProviderAlias></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#authtype">AuthType</a></li> </ul> <h3>Bugfix checklist</h3><ul class="seealso"><li><a href="https://www.apache.org/dist/httpd/CHANGES_2.4">httpd changelog</a></li><li><a href="https://bz.apache.org/bugzilla/buglist.cgi?bug_status=__open__&list_id=144532&product=Apache%20httpd-2&query_format=specific&order=changeddate%20DESC%2Cpriority%2Cbug_severity&component=mod_authn_core">Known issues</a></li><li><a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&component=mod_authn_core">Report a bug</a></li></ul><h3>See also</h3> @@ -168,7 +168,7 @@ authentication</td></tr> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="AuthnProviderAliassection" id="AuthnProviderAliassection"><AuthnProviderAlias></a> <a name="authnprovideraliassection" id="authnprovideraliassection">Directive</a></h2> +<div class="directive-section"><h2><a name="AuthnProviderAlias" id="AuthnProviderAlias"><AuthnProviderAlias></a> <a name="authnprovideralias" id="authnprovideralias">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose a group of directives that represent an extension of a base authentication provider and referenced by diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index d140beb9f1..2c02e0f087 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.en +++ b/docs/manual/mod/mod_authnz_ldap.html.en @@ -806,7 +806,7 @@ Require group "mygroupfile"</pre> the extent of a user's access to the FrontPage web.</li> <li>The directives must be put in the <code>.htaccess</code> - files. Attempting to put them inside <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> or <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> directives won't work. This + files. Attempting to put them inside <code class="directive"><a href="../mod/core.html#location"><Location></a></code> or <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> directives won't work. This is because <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> has to be able to grab the <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> directive that is found in FrontPage <code>.htaccess</code> diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index fa4557bdf0..8c67657348 100644 --- a/docs/manual/mod/mod_authz_core.html.en +++ b/docs/manual/mod/mod_authz_core.html.en @@ -54,12 +54,12 @@ </ul><h3 class="directives">Directives</h3> <ul id="toc"> <li><img alt="" src="../images/down.gif" /> <a href="#authmerging">AuthMerging</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#authzprovideraliassection"><AuthzProviderAlias></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#authzprovideralias"><AuthzProviderAlias></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#require">Require</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#requireallsection"><RequireAll></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#requireanysection"><RequireAny></a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#requirenonesection"><RequireNone></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#requireall"><RequireAll></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#requireany"><RequireAny></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#requirenone"><RequireNone></a></li> </ul> <h3>Bugfix checklist</h3><ul class="seealso"><li><a href="https://www.apache.org/dist/httpd/CHANGES_2.4">httpd changelog</a></li><li><a href="https://bz.apache.org/bugzilla/buglist.cgi?bug_status=__open__&list_id=144532&product=Apache%20httpd-2&query_format=specific&order=changeddate%20DESC%2Cpriority%2Cbug_severity&component=mod_authz_core">Known issues</a></li><li><a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&component=mod_authz_core">Report a bug</a></li></ul><h3>See also</h3> <ul class="seealso"> @@ -69,10 +69,10 @@ <h2><a name="logic" id="logic">Authorization Containers</a></h2> <p>The authorization container directives - <code class="directive"><a href="#requireallsection"><RequireAll></a></code>, - <code class="directive"><a href="#requireanysection"><RequireAny></a></code> + <code class="directive"><a href="#requireall"><RequireAll></a></code>, + <code class="directive"><a href="#requireany"><RequireAny></a></code> and - <code class="directive"><a href="#requirenonesection"><RequireNone></a></code> + <code class="directive"><a href="#requirenone"><RequireNone></a></code> may be combined with each other and with the <code class="directive"><a href="#require">Require</a></code> directive to express complex authorization logic.</p> @@ -299,8 +299,8 @@ sections.</td></tr> predecessor (according to the overall order of configuration sections) which also contains authorization logic as if the two sections were jointly contained within a - <code class="directive"><a href="#requireallsection"><RequireAll></a></code> or - <code class="directive"><a href="#requireanysection"><RequireAny></a></code> + <code class="directive"><a href="#requireall"><RequireAll></a></code> or + <code class="directive"><a href="#requireany"><RequireAny></a></code> directive, respectively.</p> <div class="note">The setting of <code class="directive">AuthMerging</code> is not @@ -310,7 +310,7 @@ sections.</td></tr> groups <code>alpha</code> or <code>beta</code> may access <code>/www/docs/ab</code>. However, the default <code>Off</code> setting of <code class="directive">AuthMerging</code> applies to the - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> configuration section for <code>/www/docs/ab/gamma</code>, so that section's authorization directives override those of the preceding sections. Thus only users belong to the group @@ -336,7 +336,7 @@ sections.</td></tr> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="AuthzProviderAliassection" id="AuthzProviderAliassection"><AuthzProviderAlias></a> <a name="authzprovideraliassection" id="authzprovideraliassection">Directive</a></h2> +<div class="directive-section"><h2><a name="AuthzProviderAlias" id="AuthzProviderAlias"><AuthzProviderAlias></a> <a name="authzprovideralias" id="authzprovideralias">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose a group of directives that represent an extension of a base authorization provider and referenced by the specified @@ -469,7 +469,7 @@ Require group admin</pre> desired.</strong> If you wish to apply access controls only to specific methods, while leaving other methods unprotected, then place the <code class="directive">Require</code> statement into a - <code class="directive"><a href="../mod/core.html#limitsection"><Limit></a></code> + <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> section.</p> <p>The result of the <code class="directive">Require</code> directive @@ -496,9 +496,9 @@ Require group admin</pre> used in a single <a href="../sections.html#merging">configuration section</a> and are not contained in another authorization directive like - <code class="directive"><a href="#requireallsection"><RequireAll></a></code>, + <code class="directive"><a href="#requireall"><RequireAll></a></code>, they are implicitly contained within a - <code class="directive"><a href="#requireanysection"><RequireAny></a></code> + <code class="directive"><a href="#requireany"><RequireAny></a></code> directive. Thus the first one to authorize a user authorizes the entire request, and subsequent <code class="directive">Require</code> directives are ignored.</p> @@ -524,7 +524,7 @@ Require group admin</pre> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="RequireAllsection" id="RequireAllsection"><RequireAll></a> <a name="requireallsection" id="requireallsection">Directive</a></h2> +<div class="directive-section"><h2><a name="RequireAll" id="RequireAll"><RequireAll></a> <a name="requireall" id="requireall">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose a group of authorization directives of which none must fail and at least one must succeed for the enclosing directive to @@ -557,7 +557,7 @@ succeed.</td></tr> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="RequireAnysection" id="RequireAnysection"><RequireAny></a> <a name="requireanysection" id="requireanysection">Directive</a></h2> +<div class="directive-section"><h2><a name="RequireAny" id="RequireAny"><RequireAny></a> <a name="requireany" id="requireany">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose a group of authorization directives of which one must succeed for the enclosing directive to succeed.</td></tr> @@ -596,7 +596,7 @@ must succeed for the enclosing directive to succeed.</td></tr> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="RequireNonesection" id="RequireNonesection"><RequireNone></a> <a name="requirenonesection" id="requirenonesection">Directive</a></h2> +<div class="directive-section"><h2><a name="RequireNone" id="RequireNone"><RequireNone></a> <a name="requirenone" id="requirenone">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose a group of authorization directives of which none must succeed for the enclosing directive to not fail.</td></tr> diff --git a/docs/manual/mod/mod_authz_host.html.en b/docs/manual/mod/mod_authz_host.html.en index 5ed7577282..9fb3f8428a 100644 --- a/docs/manual/mod/mod_authz_host.html.en +++ b/docs/manual/mod/mod_authz_host.html.en @@ -40,9 +40,9 @@ address)</td></tr> <p>The authorization providers implemented by <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> are registered using the <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive. The directive can be referenced within a - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code>, - <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code>, - or <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> section + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, + <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, + or <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section as well as <code><a href="core.html#accessfilename">.htaccess</a> </code> files to control access to particular parts of the server. Access can be controlled based on the client hostname or IP address.</p> @@ -52,7 +52,7 @@ address)</td></tr> <code>POST</code>, etc). This is the desired behavior in most cases. However, it is possible to restrict some methods, while leaving other methods unrestricted, by enclosing the directives - in a <code class="directive"><a href="../mod/core.html#limitsection"><Limit></a></code> section.</p> + in a <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> section.</p> </div> <div id="quickview"><h3>Topics</h3> <ul id="topics"> diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en index 0c405742f9..10608671d5 100644 --- a/docs/manual/mod/mod_autoindex.html.en +++ b/docs/manual/mod/mod_autoindex.html.en @@ -548,7 +548,7 @@ a directory</td></tr> <div class="note"><h3>Regular Expressions</h3> <p>This directive does not currently work in configuration sections - that have regular expression arguments, such as <code class="directive"><a href="../mod/core.html#directorymatchsection"><DirectoryMatch></a></code> + that have regular expression arguments, such as <code class="directive"><a href="../mod/core.html#directorymatch"><DirectoryMatch></a></code> </p> </div> diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en index 12ac013ea8..34f450ccd2 100644 --- a/docs/manual/mod/mod_cache.html.en +++ b/docs/manual/mod/mod_cache.html.en @@ -389,8 +389,8 @@ CustomLog "invalidated-requests.log" common env=cache-invalidate</pre> used by the service and client.</p> <p>If the normal handler is used, this directive may appear within a - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> or - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> directive. If the quick handler + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> or + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> directive. If the quick handler is used, this directive must appear within a server or virtual host context, otherwise the setting will be ignored.</p> @@ -534,8 +534,8 @@ CacheEnable disk http://.example.org/</pre> <p>When the <code class="directive"><a href="#cacheheader">CacheHeader</a></code> directive is switched on, an <strong>X-Cache</strong> header will be added to the response with the cache status of this response. If the normal handler is used, this - directive may appear within a <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> - or <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> directive. If the quick + directive may appear within a <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> + or <code class="directive"><a href="../mod/core.html#location"><Location></a></code> directive. If the quick handler is used, this directive must appear within a server or virtual host context, otherwise the setting will be ignored.</p> diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en index 346f5a5755..789bdeddb2 100644 --- a/docs/manual/mod/mod_dav.html.en +++ b/docs/manual/mod/mod_dav.html.en @@ -88,7 +88,7 @@ and <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code> under which Apache is running.</p> - <p>You may wish to add a <code class="directive"><a href="../mod/core.html#limitsection"><Limit></a></code> clause inside the <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> directive to limit access to + <p>You may wish to add a <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> clause inside the <code class="directive"><a href="../mod/core.html#location"><Location></a></code> directive to limit access to DAV-enabled locations. If you want to set the maximum amount of bytes that a DAV client can send at one request, you have to use the <code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code> diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index ce2c8e4aad..997edd7a63 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -93,8 +93,8 @@ RequestHeader unset MirrorID</pre> configuration is traversed, early headers can only be set in a main server or virtual host context. Early directives cannot depend on a request path, so they will fail in contexts such as - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> or - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code>.</p> + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> or + <code class="directive"><a href="../mod/core.html#location"><Location></a></code>.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> <h2><a name="examples" id="examples">Examples</a></h2> diff --git a/docs/manual/mod/mod_http2.html.en b/docs/manual/mod/mod_http2.html.en index 0e5f6ac1ea..7466252663 100644 --- a/docs/manual/mod/mod_http2.html.en +++ b/docs/manual/mod/mod_http2.html.en @@ -59,7 +59,7 @@ <pre class="prettyprint lang-config">Protocols h2 http/1.1</pre> <p>Allows HTTP/2 negotiation (h2) via TLS ALPN in a secure - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code>. + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>. HTTP/2 preamble checking (Direct mode, see <code class="directive"><a href="#h2direct">H2Direct</a></code>) is disabled by default for <code>h2</code>.</p> </div> @@ -67,7 +67,7 @@ <pre class="prettyprint lang-config">Protocols h2 h2c http/1.1</pre> <p>Allows HTTP/2 negotiation (h2) via TLS ALPN for secure - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code>. Allows + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>. Allows HTTP/2 cleartext negotiation (h2c) upgrading from an initial HTTP/1.1 connection or via HTTP/2 preamble checking (Direct mode, see <code class="directive"><a href="#h2direct">H2Direct</a></code>).</p> @@ -264,7 +264,7 @@ <p> This directive toggles the usage of the HTTP/2 Direct Mode. This should be used inside a - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section to enable direct HTTP/2 communication for that virtual host. </p> <p> @@ -412,7 +412,7 @@ <p> This directive toggles the security checks on HTTP/2 connections in TLS mode (https:). This can be used server wide or for specific - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code>s. + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>s. </p> <p> The security checks require that the TSL protocol is at least @@ -515,7 +515,7 @@ <p> This directive toggles the maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection. This can be used inside the - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section to influence the number for all connections to that virtual host. </p> <p> @@ -750,7 +750,7 @@ H2PushPriority text/css interleaved # weight 256 default</pre> connection before the TLS write size falls back to small (~1300 bytes) length. This can be used server wide or for specific - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code>s. + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>s. </p> <p> See <code class="directive"><a href="#h2tlswarmupsize">H2TLSWarmUpSize</a></code> for a @@ -789,7 +789,7 @@ H2PushPriority text/css interleaved # weight 256 default</pre> TLS records (~1300 bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections. This can be used server wide or for specific - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code>s. + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>s. </p> <p> Measurements by <a href="https://www.igvita.com">google performance @@ -836,7 +836,7 @@ H2PushPriority text/css interleaved # weight 256 default</pre> This directive toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2. This should be used inside a - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section to enable Upgrades to HTTP/2 for that virtual host. </p> <p> diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en index 5777e4878a..5b1488585e 100644 --- a/docs/manual/mod/mod_include.html.en +++ b/docs/manual/mod/mod_include.html.en @@ -89,7 +89,7 @@ AddOutputFilter INCLUDES .shtml</pre> <p>The following directive must be given for the directories containing the shtml files (typically in a - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> section, + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section, but this directive is also valid in <code>.htaccess</code> files if <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> <code>Options</code> is set):</p> diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en index 0c8fbf1ad2..d1616be89d 100644 --- a/docs/manual/mod/mod_info.html.en +++ b/docs/manual/mod/mod_info.html.en @@ -47,7 +47,7 @@ configuration</td></tr> <p>You may wish to use <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> inside the - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> directive to limit access to your server configuration information:</p> @@ -139,8 +139,8 @@ configuration</td></tr> <p>Pre-parsed means that directives like - <code class="directive"><a href="../mod/core.html#ifdefinesection"><IfDefine></a></code> and - <code class="directive"><a href="../mod/core.html#ifmodulesection"><IfModule></a></code> are + <code class="directive"><a href="../mod/core.html#ifdefine"><IfDefine></a></code> and + <code class="directive"><a href="../mod/core.html#ifmodule"><IfModule></a></code> are evaluated and environment variables are replaced. However it does not represent the final state of the configuration. In particular, it does not represent the merging or overriding that may happen @@ -162,18 +162,18 @@ configuration</td></tr> <code class="directive"><a href="../mod/mod_so.html#loadfile">LoadFile</a></code>.</li> <li>Directives which control the configuration file itself, such as <code class="directive"><a href="../mod/core.html#include">Include</a></code>, - <code class="directive"><a href="../mod/core.html#ifmodulesection"><IfModule></a></code> and - <code class="directive"><a href="../mod/core.html#ifdefinesection"><IfDefine></a></code> are not + <code class="directive"><a href="../mod/core.html#ifmodule"><IfModule></a></code> and + <code class="directive"><a href="../mod/core.html#ifdefine"><IfDefine></a></code> are not listed, but the included configuration directives are.</li> <li>Comments are not listed. (This may be considered a feature.)</li> <li>Configuration directives from <code>.htaccess</code> files are not listed (since they do not form part of the permanent server configuration).</li> <li>Container directives such as - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> are listed normally, but <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> cannot figure out the line number for the closing - <code class="directive"><a href="../mod/core.html#directorysection"></Directory></a></code>.</li> + <code class="directive"><a href="../mod/core.html#directory"></Directory></a></code>.</li> <li>Directives generated by third party modules such as <a href="http://perl.apache.org">mod_perl</a> might not be listed.</li> </ul> diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en index cf6d7481d2..84235b1e86 100644 --- a/docs/manual/mod/mod_lua.html.en +++ b/docs/manual/mod/mod_lua.html.en @@ -1555,7 +1555,7 @@ function silly_mapper(r) end</pre> - <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code>, or htaccess + <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, or htaccess context.</p></div> <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late" @@ -1809,10 +1809,10 @@ LuaPackagePath /scripts/lib/?/init.lua</pre> This phase is run immediately after the request has been mapped to a virtal host, and can be used to either do some request processing before the other phases kick in, or to serve a request without the need to translate, map to storage et cetera. - As this phase is run before anything else, directives such as <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> or <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> are void in this phase, just as + As this phase is run before anything else, directives such as <code class="directive"><a href="../mod/core.html#location"><Location></a></code> or <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> are void in this phase, just as URIs have not been properly parsed yet. </p> - <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code>, or htaccess + <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, or htaccess context.</p></div> </div> diff --git a/docs/manual/mod/mod_macro.html.en b/docs/manual/mod/mod_macro.html.en index e936c9b49a..da3b07d5c2 100644 --- a/docs/manual/mod/mod_macro.html.en +++ b/docs/manual/mod/mod_macro.html.en @@ -50,7 +50,7 @@ <li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li> </ul><h3 class="directives">Directives</h3> <ul id="toc"> -<li><img alt="" src="../images/down.gif" /> <a href="#macrosection"><Macro></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#macro"><Macro></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#macroignorebadnesting">MacroIgnoreBadNesting</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#macroignoreemptyargs">MacroIgnoreEmptyArgs</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#undefmacro">UndefMacro</a></li> @@ -63,11 +63,11 @@ <div class="section"> <h2><a name="usage" id="usage">Usage</a></h2> -<p>Macros are defined using <code class="directive"><a href="#macrosection"><Macro></a></code> blocks, which contain the portion of +<p>Macros are defined using <code class="directive"><a href="#macro"><Macro></a></code> blocks, which contain the portion of your configuration that needs to be repeated, complete with variables for those parts that will need to be substituted.</p> -<p>For example, you might use a macro to define a <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> block, in order to define +<p>For example, you might use a macro to define a <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> block, in order to define multiple similar virtual hosts:</p> <pre class="prettyprint lang-config"><Macro VHost $name $domain> @@ -97,7 +97,7 @@ UndefMacro VHost</pre> <p>At server startup time, each of these <code class="directive"><a href="#use">Use</a></code> invocations would be expanded into a full virtualhost, as -described by the <code class="directive"><a href="#macrosection"><Macro></a></code> +described by the <code class="directive"><a href="#macro"><Macro></a></code> definition.</p> <p>The <code class="directive"><a href="#undefmacro">UndefMacro</a></code> directive is @@ -199,7 +199,7 @@ UndefMacro DirGroup</pre> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="Macrosection" id="Macrosection"><Macro></a> <a name="macrosection" id="macrosection">Directive</a></h2> +<div class="directive-section"><h2><a name="Macro" id="Macro"><Macro></a> <a name="macro" id="macro">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define a configuration file macro</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code> diff --git a/docs/manual/mod/mod_md.html.en b/docs/manual/mod/mod_md.html.en index d2590d24e6..9acbb6264b 100644 --- a/docs/manual/mod/mod_md.html.en +++ b/docs/manual/mod/mod_md.html.en @@ -113,7 +113,7 @@ mod_md will request one single certificate that is valid for all these names. This directive uses the global settings (see other MD directives below). If you need specific settings for one MD, use - the <code class="directive"><a href="#manageddomainsection"><ManagedDomain></a></code>. + the <code class="directive"><a href="#manageddomain"><ManagedDomain></a></code>. </p><p> There are 2 additional settings that are necessary for a Managed Domain: <code class="directive"><a href="../mod/core.html#serveradmin">ServerAdmin</a></code> @@ -319,7 +319,7 @@ MDCertificateAgreement https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2 <p> If you use it in the global context, outside a specific MD, you can only specify one value, 'auto' or 'manual' as the default for all other MDs. See - <code class="directive"><a href="#manageddomainsection"><ManagedDomain></a></code> for a + <code class="directive"><a href="#manageddomain"><ManagedDomain></a></code> for a description of these special values. </p> diff --git a/docs/manual/mod/mod_md.xml b/docs/manual/mod/mod_md.xml index 7fc489b0de..7b084ce3a6 100644 --- a/docs/manual/mod/mod_md.xml +++ b/docs/manual/mod/mod_md.xml @@ -157,7 +157,7 @@ ManagedDomain example.org </usage> </directivesynopsis> - <directivesynopsis type="section"> + <directivesynopsis type="section" idtype="section"> <name>ManagedDomain</name> <description>Container for directives applied to the same managed domains</description> <syntax><ManagedDomain <var>dns-name</var> [ <var>other-dns-name</var>... ]>...</ManagedDomain></syntax> diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en index 1c97c8e7c3..b8d3b920be 100644 --- a/docs/manual/mod/mod_mime.html.en +++ b/docs/manual/mod/mod_mime.html.en @@ -66,7 +66,7 @@ <p>While <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> associates metadata with filename extensions, the <code class="module"><a href="../mod/core.html">core</a></code> server provides directives that are used to associate all the files in a - given container (<em>e.g.</em>, <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code>, <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code>, or <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code>) with particular + given container (<em>e.g.</em>, <code class="directive"><a href="../mod/core.html#location"><Location></a></code>, <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, or <code class="directive"><a href="../mod/core.html#files"><Files></a></code>) with particular metadata. These directives include <code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code>, <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>, <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code>, and <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>. The core directives override any filename extension mappings defined in <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code>.</p> @@ -639,7 +639,7 @@ assigned a language-tag by some other means.</td></tr> </table> <p>The <code class="directive">DefaultLanguage</code> directive tells Apache that all resources in the directive's scope (<em>e.g.</em>, all resources - covered by the current <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> container) that don't have an explicit language + covered by the current <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> container) that don't have an explicit language extension (such as <code>.fr</code> or <code>.de</code> as configured by <code class="directive"><a href="#addlanguage">AddLanguage</a></code>) should be assigned a Content-Language of <var>language-tag</var>. This allows @@ -748,7 +748,7 @@ a matching file with MultiViews</td></tr> <p><code class="directive">MultiviewsMatch</code> is not allowed in a - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> or <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> section.</p> + <code class="directive"><a href="../mod/core.html#location"><Location></a></code> or <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section.</p> <h3>See also</h3> diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index c3868f4e2d..f7f790ba27 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -106,14 +106,14 @@ <li><img alt="" src="../images/down.gif" /> <a href="#balancermember">BalancerMember</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#balancerpersist">BalancerPersist</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#proxysection"><Proxy></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#proxy"><Proxy></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxyaddheaders">ProxyAddHeaders</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxybadheader">ProxyBadHeader</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxyblock">ProxyBlock</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxydomain">ProxyDomain</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxyerroroverride">ProxyErrorOverride</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxyiobuffersize">ProxyIOBufferSize</a></li> -<li><img alt="" src="../images/down.gif" /> <a href="#proxymatchsection"><ProxyMatch></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#proxymatch"><ProxyMatch></a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li> <li><img alt="" src="../images/down.gif" /> <a href="#proxypassinherit">ProxyPassInherit</a></li> @@ -357,7 +357,7 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10</pre> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> <h2><a name="access" id="access">Controlling Access to Your Proxy</a></h2> - <p>You can control who can access your proxy via the <code class="directive"><a href="#proxysection"><Proxy></a></code> control block as in + <p>You can control who can access your proxy via the <code class="directive"><a href="#proxy"><Proxy></a></code> control block as in the following example:</p> <pre class="prettyprint lang-config"><Proxy *> @@ -550,7 +550,7 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10</pre> directive and can take any of the key value pair parameters available to <code class="directive"><a href="#proxypass">ProxyPass</a></code> directives.</p> <p>One additional parameter is available only to <code class="directive">BalancerMember</code> directives: - <var>loadfactor</var>. This is the member load factor - a floating pount number between 1.0 + <var>loadfactor</var>. This is the member load factor - a decimal between 1.0 (default) and 100.0, which defines the weighted load to be applied to the member in question.</p> <p>The <var>balancerurl</var> is only needed when not within a @@ -706,7 +706,7 @@ NoProxy .example.com 192.168.112.0/21</pre> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="Proxysection" id="Proxysection"><Proxy></a> <a name="proxysection" id="proxysection">Directive</a></h2> +<div class="directive-section"><h2><a name="Proxy" id="Proxy"><Proxy></a> <a name="proxy" id="proxy">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Container for directives applied to proxied resources</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><Proxy <var>wildcard-url</var>> ...</Proxy></code></td></tr> @@ -754,7 +754,7 @@ NoProxy .example.com 192.168.112.0/21</pre> <Proxy http://example.com/foo> matches all of http://example.com/foo, http://example.com/foo/bar, and http://example.com/foobar. The matching of the final URL differs - from the behavior of the <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> section, which for purposes of this note + from the behavior of the <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section, which for purposes of this note treats the final path component as if it ended in a slash.</p> <p>For more control over the matching, see <code class="directive"><ProxyMatch></code>.</p> </div> @@ -762,7 +762,7 @@ NoProxy .example.com 192.168.112.0/21</pre> <h3>See also</h3> <ul> -<li><code class="directive"><a href="#proxymatchsection"><ProxyMatch></a></code></li> +<li><code class="directive"><a href="#proxymatch"><ProxyMatch></a></code></li> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -943,7 +943,7 @@ ProxyDomain ".example.com"</pre> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="ProxyMatchsection" id="ProxyMatchsection"><ProxyMatch></a> <a name="proxymatchsection" id="proxymatchsection">Directive</a></h2> +<div class="directive-section"><h2><a name="ProxyMatch" id="ProxyMatch"><ProxyMatch></a> <a name="proxymatch" id="proxymatch">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Container for directives applied to regular-expression-matched proxied resources</td></tr> @@ -953,7 +953,7 @@ proxied resources</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr> </table> <p>The <code class="directive"><ProxyMatch></code> directive is - identical to the <code class="directive"><a href="#proxysection"><Proxy></a></code> directive, except that it matches URLs + identical to the <code class="directive"><a href="#proxy"><Proxy></a></code> directive, except that it matches URLs using <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expressions</a>.</p> <p>From 2.4.8 onwards, named groups and backreferences are captured and @@ -970,7 +970,7 @@ proxied resources</td></tr> <h3>See also</h3> <ul> -<li><code class="directive"><a href="#proxysection"><Proxy></a></code></li> +<li><code class="directive"><a href="#proxy"><Proxy></a></code></li> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -1025,8 +1025,8 @@ through</td></tr> with this section.</div> <div class="note">This directive is not supported within - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> and - <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code> containers.</div> + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> and + <code class="directive"><a href="../mod/core.html#files"><Files></a></code> containers.</div> <div class="warning">The <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive should usually be set <strong>off</strong> when using @@ -1046,9 +1046,9 @@ through</td></tr> the <code>[P,NE]</code> option to prevent the <code>'|'</code> character from being escaped.</div> - <p>When used inside a <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> section, the first argument is omitted and the local - directory is obtained from the <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code>. The same will occur inside a - <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> section; + <p>When used inside a <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section, the first argument is omitted and the local + directory is obtained from the <code class="directive"><a href="../mod/core.html#location"><Location></a></code>. The same will occur inside a + <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section; however, ProxyPass does not interpret the regexp as such, so it is necessary to use <code class="directive">ProxyPassMatch</code> in this situation instead.</p> @@ -1481,7 +1481,7 @@ ProxyPass "/" "balancer://mycluster/" stickysession=JSESSIONID|jsess <pre class="prettyprint lang-config">ProxyPass "/" "balancer://hotcluster/" <Proxy balancer://hotcluster> BalancerMember ajp://1.2.3.4:8009 loadfactor=1 - BalancerMember ajp://1.2.3.5:8009 loadfactor=2.5 + BalancerMember ajp://1.2.3.5:8009 loadfactor=2.25 # The server below is on hot standby BalancerMember ajp://1.2.3.6:8009 status=+H ProxySet lbmethod=bytraffic @@ -1618,8 +1618,8 @@ ProxyPassReverse "/mirror/foo/" "https://backend.example.com/"</pre> <p>The <code>!</code> directive is useful in situations where you don't want to reverse-proxy a subdirectory.</p> - <p>When used inside a <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> section, the first argument is omitted and the - regexp is obtained from the <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code>.</p> + <p>When used inside a <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section, the first argument is omitted and the + regexp is obtained from the <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code>.</p> <p>If you require a more flexible reverse-proxy configuration, see the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive with the @@ -1703,13 +1703,13 @@ ProxyPassReverseCookiePath "/" "/mirror/foo/"</pre> Note that interpolation is not supported within the scheme portion of a URL.</p> - <p>When used inside a <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> section, the first argument is omitted and the local - directory is obtained from the <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code>. The same occurs inside a <code class="directive"><a href="../mod/core.html#locationmatchsection"><LocationMatch></a></code> section, but will probably not work as + <p>When used inside a <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section, the first argument is omitted and the local + directory is obtained from the <code class="directive"><a href="../mod/core.html#location"><Location></a></code>. The same occurs inside a <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section, but will probably not work as intended, as ProxyPassReverse will interpret the regexp literally as a path; if needed in this situation, specify the ProxyPassReverse outside - the section or in a separate <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> section.</p> + the section or in a separate <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section.</p> - <p>This directive is not supported in <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> or <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code> sections.</p> + <p>This directive is not supported in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> or <code class="directive"><a href="../mod/core.html#files"><Files></a></code> sections.</p> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index ee54f3934d..8a2358cd9f 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1803254:1805188 (outdated) --> +<!-- English Revision: 1803254:1805323 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 74556a0a10..c237bcdc18 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?> -<!-- English Revision: 344971:1805188 (outdated) --> +<!-- English Revision: 344971:1805323 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_proxy_wstunnel.html.en b/docs/manual/mod/mod_proxy_wstunnel.html.en index 9472681097..bc5c6e0f9d 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.html.en +++ b/docs/manual/mod/mod_proxy_wstunnel.html.en @@ -45,7 +45,7 @@ Connection: Upgrade</pre> </div> <p>Proxying requests to a websockets server like <code>echo.websocket.org</code> can be done using the -<code class="directive"><a href="../mod/mod_proxy.html#proxypassProxyPass">ProxyPass</a></code> directive:</p> +<code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> directive:</p> <pre class="prettyprint lang-config">ProxyPass "/ws2/" "ws://echo.websocket.org/" ProxyPass "/wss2/" "wss://echo.websocket.org/"</pre> @@ -53,7 +53,7 @@ ProxyPass "/wss2/" "wss://echo.websocket.org/"</pre> <p>Load balancing for multiple backends can be achieved using <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>.</p> <p>In fact the module can be used to upgrade to other protocols, you can set the <code>upgrade</code> -parameter in the <code class="directive"><a href="../mod/mod_proxy.html#proxypassProxyPass">ProxyPass</a></code> +parameter in the <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> directive to allow the module to accept other protocol. NONE means you bypass the check for the header but still upgrade to WebSocket. ANY means that <code>Upgrade</code> will read in the request headers and use diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 648fe8e449..70ab42e76e 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -902,7 +902,7 @@ RewriteRule "^/$" "/homepage.std.html" [L]</pre> server are inherited. In per-directory context this means that conditions and rules of the parent directory's <code>.htaccess</code> configuration or - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections are inherited. The inherited rules are virtually copied to the section where this directive is being used. If used in combination with local rules, the inherited rules are copied behind @@ -1104,7 +1104,7 @@ RewriteRule "^/$" "/homepage.std.html" [L]</pre> <div class="note"><h3>Per-directory Rewrites</h3> <ul> -<li>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files and in <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections, with some additional +<li>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files and in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections, with some additional complexity.</li> <li>To enable the rewrite engine in this context, you need to set @@ -1126,7 +1126,7 @@ a <code class="directive"><a href="#rewritecond">RewriteCond</a></code>.</li> <em>never</em> has a leading slash. Therefore, a <em>Pattern</em> with <code>^/</code> never matches in per-directory context.</li> -<li>Although rewrite rules are syntactically permitted in <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code> and <code class="directive"><a href="../mod/core.html#filessection"><Files></a></code> sections +<li>Although rewrite rules are syntactically permitted in <code class="directive"><a href="../mod/core.html#location"><Location></a></code> and <code class="directive"><a href="../mod/core.html#files"><Files></a></code> sections (including their regular expression counterparts), this should never be necessary and is unsupported. A likely feature to break in these contexts is relative substitutions.</li> diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en index 183dedb48a..351c140f6f 100644 --- a/docs/manual/mod/mod_setenvif.html.en +++ b/docs/manual/mod/mod_setenvif.html.en @@ -274,7 +274,7 @@ for additional examples. <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_setenvif</td></tr> </table> <p>The <code class="directive">SetEnvIfExpr</code> directive defines - environment variables based on an <code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> + environment variables based on an <code class="directive"><a href="../mod/core.html#if"><If></a></code> <code>ap_expr</code>. These expressions will be evaluated at runtime, and applied <em>env-variable</em> in the same fashion as <code class="directive">SetEnvIf</code>.</p> @@ -294,7 +294,7 @@ for additional examples. <ul> <li><a href="../expr.html">Expressions in Apache HTTP Server</a>, for a complete reference and more examples.</li> -<li><code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> can be used to achieve similar +<li><code class="directive"><a href="../mod/core.html#if"><If></a></code> can be used to achieve similar results.</li> <li><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></li> </ul> diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index a69fb17ba6..6f040627f1 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -958,7 +958,7 @@ SSLCryptoDevice ubsec</pre> </table> <p> This directive toggles the usage of the SSL/TLS Protocol Engine. This -is should be used inside a <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> section to enable SSL/TLS for a +is should be used inside a <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section to enable SSL/TLS for a that virtual host. By default the SSL/TLS Protocol Engine is disabled for both the main server and all configured virtual hosts.</p> <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"><VirtualHost _default_:443> @@ -1918,13 +1918,13 @@ for additional information.</p> </table> <p> This directive toggles the usage of the SSL/TLS Protocol Engine for proxy. This -is usually used inside a <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> section to enable SSL/TLS for proxy +is usually used inside a <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section to enable SSL/TLS for proxy usage in a particular virtual host. By default the SSL/TLS Protocol Engine is disabled for proxy both for the main server and all configured virtual hosts.</p> <p>Note that the <code class="directive">SSLProxyEngine</code> directive should not, in general, be included in a virtual host that will be acting as a -forward proxy (using <code class="directive"><a href="../mod/mod_proxy.html#proxysection"><Proxy></a></code> +forward proxy (using <code class="directive"><a href="../mod/mod_proxy.html#proxy"><Proxy></a></code> or <code class="directive"><a href="../mod/mod_proxy.html#proxyrequests">ProxyRequests</a></code> directives). <code class="directive">SSLProxyEngine</code> is not required to enable a forward proxy server to proxy SSL/TLS requests.</p> diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 42bf29632a..90aa076664 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -2813,7 +2813,7 @@ SSLOpenSSLConfCmd SignatureAlgorithms RSA+SHA384:ECDSA+SHA256 </usage> </directivesynopsis> -<directivesynopsis type="section"> +<directivesynopsis type="section" idtype="section"> <name>SSLPolicy</name> <description>Define a named set of SSL configurations</description> <syntax><SSLPolicy <em>name</em>></syntax> diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr index 703b413052..3a43f48234 100644 --- a/docs/manual/mod/mod_ssl.xml.fr +++ b/docs/manual/mod/mod_ssl.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1793934:1805203 (outdated) --> +<!-- English Revision: 1793934:1805302 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- diff --git a/docs/manual/mod/mod_version.html.en b/docs/manual/mod/mod_version.html.en index af40c6b1bc..115e827ba8 100644 --- a/docs/manual/mod/mod_version.html.en +++ b/docs/manual/mod/mod_version.html.en @@ -38,7 +38,7 @@ <p>This module is designed for the use in test suites and large networks which have to deal with different httpd versions and - different configurations. It provides a new container -- <code class="directive"><a href="#ifversionsection"><IfVersion></a></code>, which + different configurations. It provides a new container -- <code class="directive"><a href="#ifversion"><IfVersion></a></code>, which allows a flexible version checking including numeric comparisons and regular expressions.</p> @@ -55,14 +55,14 @@ </div> <div id="quickview"><h3 class="directives">Directives</h3> <ul id="toc"> -<li><img alt="" src="../images/down.gif" /> <a href="#ifversionsection"><IfVersion></a></li> +<li><img alt="" src="../images/down.gif" /> <a href="#ifversion"><IfVersion></a></li> </ul> <h3>Bugfix checklist</h3><ul class="seealso"><li><a href="https://www.apache.org/dist/httpd/CHANGES_2.4">httpd changelog</a></li><li><a href="https://bz.apache.org/bugzilla/buglist.cgi?bug_status=__open__&list_id=144532&product=Apache%20httpd-2&query_format=specific&order=changeddate%20DESC%2Cpriority%2Cbug_severity&component=mod_version">Known issues</a></li><li><a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&component=mod_version">Report a bug</a></li></ul><h3>See also</h3> <ul class="seealso"> <li><a href="#comments_section">Comments</a></li></ul></div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> -<div class="directive-section"><h2><a name="IfVersionsection" id="IfVersionsection"><IfVersion></a> <a name="ifversionsection" id="ifversionsection">Directive</a></h2> +<div class="directive-section"><h2><a name="IfVersion" id="IfVersion"><IfVersion></a> <a name="ifversion" id="ifversion">Directive</a></h2> <table class="directive"> <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>contains version dependent configuration</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><IfVersion [[!]<var>operator</var>] <var>version</var>> ... diff --git a/docs/manual/mod/module-dict.html.en b/docs/manual/mod/module-dict.html.en index a515b76619..50126c0d0a 100644 --- a/docs/manual/mod/module-dict.html.en +++ b/docs/manual/mod/module-dict.html.en @@ -94,7 +94,7 @@ <p>This quite simply lists the name of the source file which contains the code for the module. This is also the name used by - the <code class="directive"><a href="../mod/core.html#ifmodulesection"><IfModule></a></code> + the <code class="directive"><a href="../mod/core.html#ifmodule"><IfModule></a></code> directive.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> diff --git a/docs/manual/mod/overrides.html.en b/docs/manual/mod/overrides.html.en index 6088fe90bb..3744426944 100644 --- a/docs/manual/mod/overrides.html.en +++ b/docs/manual/mod/overrides.html.en @@ -98,13 +98,13 @@ <tr><td colspan="2" class="descr">Maximum inflation ratio for request bodies</td></tr> <tr class="odd"><td><a href="core.html#else"><Else></a></td><td class="module"><a href="core.html">core</a></td></tr> <tr class="odd"><td colspan="2" class="descr">Contains directives that apply only if the condition of a -previous <code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> or -<code class="directive"><a href="../mod/core.html#elseifsection"><ElseIf></a></code> section is not +previous <code class="directive"><a href="../mod/core.html#if"><If></a></code> or +<code class="directive"><a href="../mod/core.html#elseif"><ElseIf></a></code> section is not satisfied by a request at runtime</td></tr> <tr><td><a href="core.html#elseif"><ElseIf></a></td><td class="module"><a href="core.html">core</a></td></tr> <tr><td colspan="2" class="descr">Contains directives that apply only if a condition is satisfied by a request at runtime while the condition of a previous -<code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> or +<code class="directive"><a href="../mod/core.html#if"><If></a></code> or <code class="directive"><ElseIf></code> section is not satisfied</td></tr> <tr class="odd"><td><a href="core.html#error">Error</a></td><td class="module"><a href="core.html">core</a></td></tr> diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 8f1f09ee7f..aa4e43c86b 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -448,12 +448,12 @@ from the web</td></tr> <tr class="odd"><td><a href="mod_dumpio.html#dumpioinput">DumpIOInput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dump all input data to the error log</td></tr> <tr><td><a href="mod_dumpio.html#dumpiooutput">DumpIOOutput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Dump all output data to the error log</td></tr> <tr class="odd"><td><a href="core.html#else" id="E" name="E"><Else> ... </Else></a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply only if the condition of a -previous <code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> or -<code class="directive"><a href="../mod/core.html#elseifsection"><ElseIf></a></code> section is not +previous <code class="directive"><a href="../mod/core.html#if"><If></a></code> or +<code class="directive"><a href="../mod/core.html#elseif"><ElseIf></a></code> section is not satisfied by a request at runtime</td></tr> <tr><td><a href="core.html#elseif"><ElseIf <var>expression</var>> ... </ElseIf></a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply only if a condition is satisfied by a request at runtime while the condition of a previous -<code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> or +<code class="directive"><a href="../mod/core.html#if"><If></a></code> or <code class="directive"><ElseIf></code> section is not satisfied</td></tr> <tr class="odd"><td><a href="mpm_common.html#enableexceptionhook">EnableExceptionHook On|Off</a></td><td> Off </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Enables a hook that runs exception handlers diff --git a/docs/manual/new_features_2_0.html.en b/docs/manual/new_features_2_0.html.en index 34fb277a9d..aa9b27d674 100644 --- a/docs/manual/new_features_2_0.html.en +++ b/docs/manual/new_features_2_0.html.en @@ -193,7 +193,7 @@ <dd>The proxy module has been completely rewritten to take advantage of the new filter infrastructure and to implement a more reliable, HTTP/1.1 compliant proxy. In addition, new - <code class="directive"><a href="./mod/mod_proxy.html#proxysection"><Proxy></a></code> + <code class="directive"><a href="./mod/mod_proxy.html#proxy"><Proxy></a></code> configuration sections provide more readable (and internally faster) control of proxied sites; overloaded <code><Directory "proxy:..."></code> configuration are not supported. The module diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en index 89c4738168..66f5ffa4bf 100644 --- a/docs/manual/new_features_2_4.html.en +++ b/docs/manual/new_features_2_4.html.en @@ -66,9 +66,9 @@ level.</dd> <dt>Per-request configuration sections</dt> - <dd><code class="directive"><a href="./mod/core.html#ifsection"><If></a></code>, - <code class="directive"><a href="./mod/core.html#elseifsection"><ElseIf></a></code>, - and <code class="directive"><a href="./mod/core.html#elsesection"><Else></a></code> + <dd><code class="directive"><a href="./mod/core.html#if"><If></a></code>, + <code class="directive"><a href="./mod/core.html#elseif"><ElseIf></a></code>, + and <code class="directive"><a href="./mod/core.html#else"><Else></a></code> sections can be used to set the configuration based on per-request criteria.</dd> @@ -79,7 +79,7 @@ <code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code>, <code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>, <code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code>, - <code class="directive"><a href="./mod/core.html#ifsection"><If></a></code>, + <code class="directive"><a href="./mod/core.html#if"><If></a></code>, and others. </dd> @@ -287,7 +287,7 @@ <dd>Advanced authorization logic may now be specified using the <code class="directive"><a href="./mod/mod_authz_core.html#require">Require</a></code> directive and the related container directives, such as - <code class="directive"><a href="./mod/mod_authz_core.html#requireallsection"><RequireAll></a></code>.</dd> + <code class="directive"><a href="./mod/mod_authz_core.html#requireall"><RequireAll></a></code>.</dd> <dt><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></dt> <dd><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code> adds the <code>[QSD]</code> @@ -401,7 +401,7 @@ <dd>Authorization modules now register as a provider, via ap_register_auth_provider(), to support advanced authorization logic, - such as <code class="directive"><a href="./mod/mod_authz_core.html#requireallsection"><RequireAll></a></code>.</dd> + such as <code class="directive"><a href="./mod/mod_authz_core.html#requireall"><RequireAll></a></code>.</dd> <dt>Small-Object Caching Interface</dt> diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en index ccb68de921..14f67e0a83 100644 --- a/docs/manual/platform/windows.html.en +++ b/docs/manual/platform/windows.html.en @@ -134,10 +134,10 @@ <li><p>While filenames are generally case-insensitive on Windows, URLs are still treated internally as case-sensitive before they are mapped to the filesystem. For example, the - <code class="directive"><a href="../mod/core.html#locationsection"><Location></a></code>, + <code class="directive"><a href="../mod/core.html#location"><Location></a></code>, <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>, and <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> directives all use case-sensitive arguments. For this reason, it is particularly - important to use the <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> directive when attempting + important to use the <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> directive when attempting to limit access to content in the filesystem, since this directive applies to any content in a directory, regardless of how it is accessed. If you wish to assure that only lowercase diff --git a/docs/manual/programs/httpd.html.en b/docs/manual/programs/httpd.html.en index 0a053a1647..e2338995f0 100644 --- a/docs/manual/programs/httpd.html.en +++ b/docs/manual/programs/httpd.html.en @@ -100,7 +100,7 @@ files.</dd> <dt><code>-D <var>parameter</var></code></dt> <dd>Sets a configuration <var>parameter </var>which can be used with -<code class="directive"><a href="../mod/core.html#ifdefinesection"><IfDefine></a></code> sections +<code class="directive"><a href="../mod/core.html#ifdefine"><IfDefine></a></code> sections in the configuration files to conditionally skip or process commands at server startup and restart. Also can be used to set certain less-common startup parameters including <code>-DNO_DETACH</code> diff --git a/docs/manual/rewrite/avoid.html.en b/docs/manual/rewrite/avoid.html.en index 449252ee36..17ed075b94 100644 --- a/docs/manual/rewrite/avoid.html.en +++ b/docs/manual/rewrite/avoid.html.en @@ -147,7 +147,7 @@ server.</p> <h2><a name="vhosts" id="vhosts">Virtual Hosting</a></h2> <p>Although it is possible to handle <a href="vhosts.html">virtual hosts with mod_rewrite</a>, it is seldom the right way. Creating individual -<code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> blocks is +<code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> blocks is almost always the right way to go. In the event that you have an enormous number of virtual hosts, consider using <code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code> to create these hosts automatically.</p> @@ -201,12 +201,12 @@ accomplish.</p> <p><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> is frequently used to take a particular action based on the presence or absence of a particular environment variable or request header. This can be done more efficiently using the -<code class="directive"><a href="../mod/core.html#ifsection"><If></a></code>.</p> +<code class="directive"><a href="../mod/core.html#if"><If></a></code>.</p> <p>Consider, for example, the common scenario where <code class="directive">RewriteRule</code> is used to enforce a canonical hostname, such as <code>www.example.com</code> instead of -<code>example.com</code>. This can be done using the <code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> directive, as shown here:</p> +<code>example.com</code>. This can be done using the <code class="directive"><a href="../mod/core.html#if"><If></a></code> directive, as shown here:</p> <pre class="prettyprint lang-config"><If "req('Host') != 'www.example.com'"> Redirect "/" "http://www.example.com/" @@ -219,7 +219,7 @@ header, response header, or environment variable, replacing <p>See especially the <a href="../expr.html">expression evaluation documentation</a> for a overview of what types of expressions you can -use in <code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> sections, +use in <code class="directive"><a href="../mod/core.html#if"><If></a></code> sections, and in certain other directives.</p> </div></div> diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en index 8005d0164e..722e6462c9 100644 --- a/docs/manual/rewrite/flags.html.en +++ b/docs/manual/rewrite/flags.html.en @@ -381,13 +381,13 @@ immediately without considering further rules.</p> <p>If you are using <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> in either <code>.htaccess</code> files or in -<code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections, +<code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections, it is important to have some understanding of how the rules are processed. The simplified form of this is that once the rules have been processed, the rewritten request is handed back to the URL parsing engine to do what it may with it. It is possible that as the rewritten request is handled, the <code>.htaccess</code> file or -<code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> section +<code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section may be encountered again, and thus the ruleset may be run again from the start. Most commonly this will happen if one of the rules causes a redirect - either internal or external - causing the request process to @@ -579,7 +579,7 @@ the next phase of processing.</p> <p>Note that the <code>PT</code> flag is implied in per-directory contexts such as -<code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections +<code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections or in <code>.htaccess</code> files. The only way to circumvent that is to rewrite to <code>-</code>.</p> @@ -747,7 +747,7 @@ RewriteRule "IMG" "-" [T=image/jpg]</pre> <p>Please note that this is a trivial example, and could be better done -using <code class="directive"><a href="../mod/core.html#filesmatchsection"><FilesMatch></a></code> +using <code class="directive"><a href="../mod/core.html#filesmatch"><FilesMatch></a></code> instead. Always consider the alternate solutions to a problem before resorting to rewrite, which will invariably be a less efficient solution than the alternatives.</p> diff --git a/docs/manual/rewrite/index.html.en b/docs/manual/rewrite/index.html.en index 59a925318b..f893604853 100644 --- a/docs/manual/rewrite/index.html.en +++ b/docs/manual/rewrite/index.html.en @@ -46,8 +46,8 @@ <p>Rewrite rules can operate on the full URLs, including the path-info and query string portions, and may be used in per-server context - (<code>httpd.conf</code>), per-virtualhost context (<code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> blocks), or - per-directory context (<code>.htaccess</code> files and <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> blocks). The + (<code>httpd.conf</code>), per-virtualhost context (<code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> blocks), or + per-directory context (<code>.htaccess</code> files and <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> blocks). The rewritten result can lead to further rules, internal sub-processing, external request redirection, or proxy passthrough, depending on what <a href="flags.html">flags</a> you diff --git a/docs/manual/rewrite/intro.html.en b/docs/manual/rewrite/intro.html.en index 33a6c2ef1e..aa98e739e3 100644 --- a/docs/manual/rewrite/intro.html.en +++ b/docs/manual/rewrite/intro.html.en @@ -319,11 +319,11 @@ rewriting for you. This is discussed in greater detail in the <a href="rewritema <h2><a name="htaccess" id="htaccess">.htaccess files</a></h2> <p>Rewriting is typically configured in the main server configuration -setting (outside any <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> section) or -inside <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> +setting (outside any <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section) or +inside <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> containers. This is the easiest way to do rewriting and is recommended. It is possible, however, to do rewriting -inside <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> +inside <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections or <a href="../howto/htaccess.html"><code>.htaccess</code> files</a> at the expense of some additional complexity. This technique is called per-directory rewrites.</p> diff --git a/docs/manual/rewrite/remapping.html.en b/docs/manual/rewrite/remapping.html.en index 996b449905..c03fa9141a 100644 --- a/docs/manual/rewrite/remapping.html.en +++ b/docs/manual/rewrite/remapping.html.en @@ -288,7 +288,7 @@ hostname(s).</p> <p>You can alternatively accomplish this using the -<code class="directive"><a href="../mod/core.html#ifsection"><If></a></code> +<code class="directive"><a href="../mod/core.html#if"><If></a></code> directive: (<strong>2.4 and later</strong>)</p> <pre class="prettyprint lang-config"><If "%{HTTP_HOST} != 'www.example.com'"> diff --git a/docs/manual/rewrite/rewritemap.html.en b/docs/manual/rewrite/rewritemap.html.en index 704ec78e4e..a07e4d6642 100644 --- a/docs/manual/rewrite/rewritemap.html.en +++ b/docs/manual/rewrite/rewritemap.html.en @@ -108,7 +108,7 @@ in the map:</p> <div class="note"><h3>Per-directory and .htaccess context</h3> <p> The <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> directive may not be -used in <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> sections or +used in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections or <code>.htaccess</code> files. You must declare the map in server or virtualhost context. You may use the map, once created, in your <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> and @@ -441,7 +441,7 @@ this process, or if the script itself is very slow.</li> <p>While you cannot <strong>declare</strong> a map in per-directory context (<code>.htaccess</code> files or - <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> blocks) it is + <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> blocks) it is possible to <strong>use</strong> this map in per-directory context.</p> </div></div> diff --git a/docs/manual/rewrite/tech.html.en b/docs/manual/rewrite/tech.html.en index f539a63563..4fa9f3b254 100644 --- a/docs/manual/rewrite/tech.html.en +++ b/docs/manual/rewrite/tech.html.en @@ -57,12 +57,12 @@ and URL matching.</p> virtual host has been determined, the rewriting engine starts processing any <code>mod_rewrite</code> directives appearing in the per-server configuration. (i.e., in the main server configuration file - and <code class="directive"><a href="../mod/core.html#virtualhostsection"><Virtualhost></a></code> + and <code class="directive"><a href="../mod/core.html#virtualhost"><Virtualhost></a></code> sections.) This happens in the URL-to-filename phase.</p> <p>A few steps later, once the final data directories have been found, the per-directory configuration directives (<code>.htaccess</code> - files and <code class="directive"><a href="../mod/core.html#directorysection"><Directory></a></code> blocks) are applied. This + files and <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> blocks) are applied. This happens in the Fixup phase.</p> <p>In each of these cases, mod_rewrite rewrites the diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en index ff3b090259..2504dd9566 100644 --- a/docs/manual/sections.html.en +++ b/docs/manual/sections.html.en @@ -46,18 +46,18 @@ to change the scope of other configuration directives.</p> <div class="section"> <h2><a name="types" id="types">Types of Configuration Section Containers</a></h2> -<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mod_version.html">mod_version</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatchsection"><DirectoryMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#filessection"><Files></a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatchsection"><FilesMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#ifsection"><If></a></code></li><li><code class="directive"><a href="./mod/core.html#ifdefinesection"><IfDefine></a></code></li><li><code class="directive"><a href="./mod/core.html#ifmodulesection"><IfModule></a></code></li><li><code class="directive"><a href="./mod/mod_version.html#ifversionsection"><IfVersion></a></code></li><li><code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatchsection"><LocationMatch></a></code></li><li><code class="directive"><a href="./mod/md.html#mangeddomainsection"><MangedDomain></a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxysection"><Proxy></a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxymatchsection"><ProxyMatch></a></code></li><li><code class="directive"><a href="./mod/ssl.html#sslpolicysection"><SSLPolicy></a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code></li></ul></td></tr></table> +<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mod_version.html">mod_version</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#directory"><Directory></a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#files"><Files></a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#if"><If></a></code></li><li><code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code></li><li><code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code></li><li><code class="directive"><a href="./mod/mod_version.html#ifversion"><IfVersion></a></code></li><li><code class="directive"><a href="./mod/core.html#location"><Location></a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code></li><li><code class="directive"><a href="./mod/md.html#mangeddomain"><MangedDomain></a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxy"><Proxy></a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxymatch"><ProxyMatch></a></code></li><li><code class="directive"><a href="./mod/ssl.html#sslpolicy"><SSLPolicy></a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code></li></ul></td></tr></table> <p>There are two basic types of containers. Most containers are evaluated for each request. The enclosed directives are applied only -for those requests that match the containers. The <code class="directive"><a href="./mod/core.html#ifdefinesection"><IfDefine></a></code>, <code class="directive"><a href="./mod/core.html#ifmodulesection"><IfModule></a></code>, and -<code class="directive"><a href="./mod/mod_version.html#ifversionsection"><IfVersion></a></code> +for those requests that match the containers. The <code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code>, <code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code>, and +<code class="directive"><a href="./mod/mod_version.html#ifversion"><IfVersion></a></code> containers, on the other hand, are evaluated only at server startup and restart. If their conditions are true at startup, then the enclosed directives will apply to all requests. If the conditions are not true, the enclosed directives will be ignored.</p> -<p>The <code class="directive"><a href="./mod/core.html#ifdefinesection"><IfDefine></a></code> directive +<p>The <code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code> directive encloses directives that will only be applied if an appropriate parameter is defined on the <code class="program"><a href="./programs/httpd.html">httpd</a></code> command line. For example, with the following configuration, all requests will be redirected @@ -69,7 +69,7 @@ to another site only if the server is started using </IfDefine></pre> -<p>The <code class="directive"><a href="./mod/core.html#ifmodulesection"><IfModule></a></code> +<p>The <code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code> directive is very similar, except it encloses directives that will only be applied if a particular module is available in the server. The module must either be statically compiled in the server, or it @@ -88,8 +88,8 @@ applied only if <code class="module"><a href="./mod/mod_mime_magic.html">mod_mim </IfModule></pre> -<p>The <code class="directive"><a href="./mod/mod_version.html#ifversionsection"><IfVersion></a></code> -directive is very similar to <code class="directive"><a href="./mod/core.html#ifdefinesection"><IfDefine></a></code> and <code class="directive"><a href="./mod/core.html#ifmodulesection"><IfModule></a></code>, except it encloses directives that will +<p>The <code class="directive"><a href="./mod/mod_version.html#ifversion"><IfVersion></a></code> +directive is very similar to <code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code> and <code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code>, except it encloses directives that will only be applied if a particular version of the server is executing. This module is designed for the use in test suites and large networks which have to deal with different httpd versions and different configurations.</p> @@ -100,9 +100,9 @@ deal with different httpd versions and different configurations.</p> </IfVersion></pre> -<p><code class="directive"><a href="./mod/core.html#ifdefinesection"><IfDefine></a></code>, -<code class="directive"><a href="./mod/core.html#ifmodulesection"><IfModule></a></code>, and the -<code class="directive"><a href="./mod/mod_version.html#ifversionsection"><IfVersion></a></code> +<p><code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code>, +<code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code>, and the +<code class="directive"><a href="./mod/mod_version.html#ifversion"><IfVersion></a></code> can apply negative conditions by preceding their test with "!". Also, these sections can be nested to achieve more complex restrictions.</p> @@ -129,11 +129,11 @@ from databases or other locations.</p> <h3><a name="filesystem" id="filesystem">Filesystem Containers</a></h3> -<p>The <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> -and <code class="directive"><a href="./mod/core.html#filessection"><Files></a></code> +<p>The <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> +and <code class="directive"><a href="./mod/core.html#files"><Files></a></code> directives, along with their <a class="glossarylink" href="./glossary.html#regex" title="see glossary">regex</a> counterparts, apply directives to -parts of the filesystem. Directives enclosed in a <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> section apply to +parts of the filesystem. Directives enclosed in a <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> section apply to the named filesystem directory and all subdirectories of that directory (as well as the files in those directories). The same effect can be obtained using <a href="howto/htaccess.html">.htaccess files</a>. For example, in the @@ -145,7 +145,7 @@ following configuration, directory indexes will be enabled for the </Directory></pre> -<p>Directives enclosed in a <code class="directive"><a href="./mod/core.html#filessection"><Files></a></code> section apply to any file with +<p>Directives enclosed in a <code class="directive"><a href="./mod/core.html#files"><Files></a></code> section apply to any file with the specified name, regardless of what directory it lies in. So for example, the following configuration directives will, when placed in the main section of the configuration file, @@ -158,8 +158,8 @@ of where it is found.</p> <p>To address files found in a particular part of the filesystem, the -<code class="directive"><a href="./mod/core.html#filessection"><Files></a></code> and -<code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> sections +<code class="directive"><a href="./mod/core.html#files"><Files></a></code> and +<code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> sections can be combined. For example, the following configuration will deny access to <code>/var/web/dir1/private.html</code>, <code>/var/web/dir1/subdir2/private.html</code>, @@ -177,7 +177,7 @@ directory.</p> <h3><a name="webspace" id="webspace">Webspace Containers</a></h3> -<p>The <code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code> +<p>The <code class="directive"><a href="./mod/core.html#location"><Location></a></code> directive and its <a class="glossarylink" href="./glossary.html#regex" title="see glossary">regex</a> counterpart, on the other hand, change the configuration for content in the webspace. For example, the following @@ -193,7 +193,7 @@ as any other requests starting with the <code>/private</code> string.</p> </LocationMatch></pre> -<p>The <code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code> +<p>The <code class="directive"><a href="./mod/core.html#location"><Location></a></code> directive need not have anything to do with the filesystem. For example, the following example shows how to map a particular URL to an internal Apache HTTP Server handler provided by <code class="module"><a href="./mod/mod_status.html">mod_status</a></code>. @@ -209,13 +209,13 @@ filesystem.</p> <h3><a name="overlapping-webspace" id="overlapping-webspace">Overlapping Webspace</a></h3> <p>In order to have two overlapping URLs one has to consider the order in which certain sections or directives are evaluated. For -<code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code> this would be:</p> +<code class="directive"><a href="./mod/core.html#location"><Location></a></code> this would be:</p> <pre class="prettyprint lang-config"><Location "/foo"> </Location> <Location "/foo/bar"> </Location></pre> -<p><code class="directive"><a href="./mod/mod_alias.html#aliassection"><Alias></a></code>es on the other hand, +<p><code class="directive"><a href="./mod/mod_alias.html#alias"><Alias></a></code>es on the other hand, are mapped vice-versa:</p> <pre class="prettyprint lang-config">Alias "/foo/bar" "/srv/www/uncommon/bar" Alias "/foo" "/srv/www/common/foo"</pre> @@ -229,9 +229,9 @@ ProxyPass "/" "balancer://mycluster/" stickysession=JSESSIONID|jsessionid nofail <h3><a name="wildcards" id="wildcards">Wildcards and Regular Expressions</a></h3> -<p>The <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code>, -<code class="directive"><a href="./mod/core.html#filessection"><Files></a></code>, and -<code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code> +<p>The <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>, +<code class="directive"><a href="./mod/core.html#files"><Files></a></code>, and +<code class="directive"><a href="./mod/core.html#location"><Location></a></code> directives can each use shell-style wildcard characters as in <code>fnmatch</code> from the C standard library. The character "*" matches any sequence of characters, "?" matches any single character, @@ -240,7 +240,7 @@ character will not be matched by any wildcard; it must be specified explicitly.</p> <p>If even more flexible matching is required, each -container has a regular expression (regex) counterpart <code class="directive"><a href="./mod/core.html#directorymatchsection"><DirectoryMatch></a></code>, <code class="directive"><a href="./mod/core.html#filesmatchsection"><FilesMatch></a></code>, and <code class="directive"><a href="./mod/core.html#locationmatchsection"><LocationMatch></a></code> that allow +container has a regular expression (regex) counterpart <code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code>, <code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code>, and <code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code> that allow perl-compatible <a class="glossarylink" href="./glossary.html#regex" title="see glossary">regular expressions</a> to be used in choosing the matches. But see the section below on @@ -276,7 +276,7 @@ and modules like <code class="module"><a href="./mod/mod_rewrite.html">mod_rewri <h3><a name="expressions" id="expressions">Boolean expressions</a></h3> -<p>The <code class="directive"><a href="./mod/core.html#ifsection"><If></a></code> +<p>The <code class="directive"><a href="./mod/core.html#if"><If></a></code> directive change the configuration depending on a condition which can be expressed by a boolean expression. For example, the following configuration denies access if the HTTP Referer header does not start with @@ -292,11 +292,11 @@ denies access if the HTTP Referer header does not start with <p>Choosing between filesystem containers and webspace containers is actually quite easy. When applying directives to objects that reside -in the filesystem always use <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> or <code class="directive"><a href="./mod/core.html#filessection"><Files></a></code>. When applying directives to objects +in the filesystem always use <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> or <code class="directive"><a href="./mod/core.html#files"><Files></a></code>. When applying directives to objects that do not reside in the filesystem (such as a webpage generated from -a database), use <code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code>.</p> +a database), use <code class="directive"><a href="./mod/core.html#location"><Location></a></code>.</p> -<p>It is important to never use <code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code> when trying to restrict +<p>It is important to never use <code class="directive"><a href="./mod/core.html#location"><Location></a></code> when trying to restrict access to objects in the filesystem. This is because many different webspace locations (URLs) could map to the same filesystem location, allowing your restrictions to be circumvented. @@ -311,11 +311,11 @@ For example, consider the following configuration:</p> <code>http://yoursite.example.com/dir/</code>. But what if you are on a case-insensitive filesystem? Then your restriction could be easily circumvented by requesting -<code>http://yoursite.example.com/DIR/</code>. The <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> directive, in +<code>http://yoursite.example.com/DIR/</code>. The <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> directive, in contrast, will apply to any content served from that location, regardless of how it is called. (An exception is filesystem links. The same directory can be placed in more than one part of the -filesystem using symbolic links. The <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> directive will follow the symbolic +filesystem using symbolic links. The <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> directive will follow the symbolic link without resetting the pathname. Therefore, for the highest level of security, symbolic links should be disabled with the appropriate <code class="directive"><a href="./mod/core.html#options">Options</a></code> directive.)</p> @@ -333,12 +333,12 @@ to all requests regardless of the specific URL.</p> <h3><a name="nesting" id="nesting">Nesting of sections</a></h3> <p>Some section types can be nested inside other section types. On the one -hand, <code class="directive"><a href="./mod/core.html#filessection"><Files></a></code> can be used -inside <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code>. On -the other hand, <code class="directive"><a href="./mod/core.html#ifsection"><If></a></code> can -be used inside <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code>, -<code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code>, and <code class="directive"><a href="./mod/core.html#filessection"><Files></a></code> sections (but not inside another -<code class="directive"><a href="./mod/core.html#ifsection"><If></a></code>). The regex +hand, <code class="directive"><a href="./mod/core.html#files"><Files></a></code> can be used +inside <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>. On +the other hand, <code class="directive"><a href="./mod/core.html#if"><If></a></code> can +be used inside <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>, +<code class="directive"><a href="./mod/core.html#location"><Location></a></code>, and <code class="directive"><a href="./mod/core.html#files"><Files></a></code> sections (but not inside another +<code class="directive"><a href="./mod/core.html#if"><If></a></code>). The regex counterparts of the named section behave identically.</p> <p>Nested sections are merged after non-nested sections of the same type.</p> @@ -349,7 +349,7 @@ counterparts of the named section behave identically.</p> <div class="section"> <h2><a name="virtualhost" id="virtualhost">Virtual Hosts</a></h2> -<p>The <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> +<p>The <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> container encloses directives that apply to specific hosts. This is useful when serving multiple hosts from the same machine with a different configuration for each. For more information, @@ -358,8 +358,8 @@ see the <a href="vhosts/">Virtual Host Documentation</a>.</p> <div class="section"> <h2><a name="proxy" id="proxy">Proxy</a></h2> -<p>The <code class="directive"><a href="./mod/mod_proxy.html#proxysection"><Proxy></a></code> -and <code class="directive"><a href="./mod/mod_proxy.html#proxymatchsection"><ProxyMatch></a></code> +<p>The <code class="directive"><a href="./mod/mod_proxy.html#proxy"><Proxy></a></code> +and <code class="directive"><a href="./mod/mod_proxy.html#proxymatch"><ProxyMatch></a></code> containers apply enclosed configuration directives only to sites accessed through <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>'s proxy server that match the specified URL. For example, the following configuration @@ -377,29 +377,29 @@ will allow only a subset of clients to access the <p>To find out what directives are allowed in what types of configuration sections, check the <a href="mod/directive-dict.html#Context">Context</a> of the directive. Everything that is allowed in -<code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> +<code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> sections is also syntactically allowed in -<code class="directive"><a href="./mod/core.html#directorymatchsection"><DirectoryMatch></a></code>, -<code class="directive"><a href="./mod/core.html#filessection"><Files></a></code>, -<code class="directive"><a href="./mod/core.html#filesmatchsection"><FilesMatch></a></code>, -<code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code>, -<code class="directive"><a href="./mod/core.html#locationmatchsection"><LocationMatch></a></code>, -<code class="directive"><a href="./mod/mod_proxy.html#proxysection"><Proxy></a></code>, -and <code class="directive"><a href="./mod/mod_proxy.html#proxymatchsection"><ProxyMatch></a></code> +<code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code>, +<code class="directive"><a href="./mod/core.html#files"><Files></a></code>, +<code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code>, +<code class="directive"><a href="./mod/core.html#location"><Location></a></code>, +<code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code>, +<code class="directive"><a href="./mod/mod_proxy.html#proxy"><Proxy></a></code>, +and <code class="directive"><a href="./mod/mod_proxy.html#proxymatch"><ProxyMatch></a></code> sections. There are some exceptions, however:</p> <ul> <li>The <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> directive -works only in <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> +works only in <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> sections.</li> <li>The <code>FollowSymLinks</code> and -<code>SymLinksIfOwnerMatch</code> <code class="directive"><a href="./mod/core.html#options">Options</a></code> work only in <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> sections or +<code>SymLinksIfOwnerMatch</code> <code class="directive"><a href="./mod/core.html#options">Options</a></code> work only in <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> sections or <code>.htaccess</code> files.</li> <li>The <code class="directive"><a href="./mod/core.html#options">Options</a></code> directive cannot -be used in <code class="directive"><a href="./mod/core.html#filessection"><Files></a></code> -and <code class="directive"><a href="./mod/core.html#filesmatchsection"><FilesMatch></a></code> +be used in <code class="directive"><a href="./mod/core.html#files"><Files></a></code> +and <code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code> sections.</li> </ul> </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> @@ -413,52 +413,52 @@ are interpreted, it is important to understand how this works.</p> <p>The order of merging is:</p> <ol> - <li> <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> (except regular expressions) + <li> <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> (except regular expressions) and <code>.htaccess</code> done simultaneously (with <code>.htaccess</code>, if allowed, overriding - <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code>)</li> + <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>)</li> - <li><code class="directive"><a href="./mod/core.html#directorymatchsection"><DirectoryMatch></a></code> + <li><code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code> (and <code><Directory ~></code>)</li> - <li><code class="directive"><a href="./mod/core.html#filessection"><Files></a></code> and <code class="directive"><a href="./mod/core.html#filesmatchsection"><FilesMatch></a></code> done + <li><code class="directive"><a href="./mod/core.html#files"><Files></a></code> and <code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code> done simultaneously</li> - <li><code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code> - and <code class="directive"><a href="./mod/core.html#locationmatchsection"><LocationMatch></a></code> done simultaneously</li> + <li><code class="directive"><a href="./mod/core.html#location"><Location></a></code> + and <code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code> done simultaneously</li> - <li><code class="directive"><a href="./mod/core.html#ifsection"><If></a></code> + <li><code class="directive"><a href="./mod/core.html#if"><If></a></code> </li> </ol> <p>Some important remarks:</p> <ul> - <li>Apart from <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code>, within each group the sections are + <li>Apart from <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>, within each group the sections are processed in the order they appear in the configuration files. For example, a request for <em>/foo</em> will match <code><Location "/foo/bar"></code> and <code><Location "/foo"></code> (group 4 in this case): both sections will be evaluated but in the order they appear in the configuration files.</li> - <li><code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> + <li><code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> (group 1 above) is processed in the order shortest directory component to longest. For example, <code><Directory "/var/web/dir"></code> will be processed before <code><Directory "/var/web/dir/subdir"></code>.</li> - <li>If multiple <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> sections apply + <li>If multiple <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> sections apply to the same directory they are processed in the configuration file order.</li> <li>Configurations included via the <code class="directive"><a href="./mod/core.html#include">Include</a></code> directive will be treated as if they were inside the including file at the location of the <code class="directive"><a href="./mod/core.html#include">Include</a></code> directive.</li> - <li>Sections inside <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> sections + <li>Sections inside <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> sections are applied <em>after</em> the corresponding sections outside the virtual host definition. This allows virtual hosts to override the main server configuration.</li> <li>When the request is served by <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>, the - <code class="directive"><a href="./mod/mod_proxy.html#proxysection"><Proxy></a></code> - container takes the place of the <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> container in the processing + <code class="directive"><a href="./mod/mod_proxy.html#proxy"><Proxy></a></code> + container takes the place of the <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> container in the processing order.</li> </ul> @@ -545,7 +545,7 @@ E.</p> <p>For a more concrete example, consider the following. Regardless of -any access restrictions placed in <code class="directive"><a href="./mod/core.html#directorysection"><Directory></a></code> sections, the <code class="directive"><a href="./mod/core.html#locationsection"><Location></a></code> section will be +any access restrictions placed in <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> sections, the <code class="directive"><a href="./mod/core.html#location"><Location></a></code> section will be evaluated last and will allow unrestricted access to the server. In other words, order of merging is important, so be careful!</p> diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en index 51ff7c3ee2..207940d8dd 100644 --- a/docs/manual/ssl/ssl_faq.html.en +++ b/docs/manual/ssl/ssl_faq.html.en @@ -160,7 +160,7 @@ relative hyperlinks?</a></li> <p> This error can be caused by an incorrect configuration. Please make sure that your <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> directives match your - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> directives. If all else fails, please start afresh, using the default configuration provided by <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>.</p> diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en index ceb2c6ac4d..c515535aeb 100644 --- a/docs/manual/suexec.html.en +++ b/docs/manual/suexec.html.en @@ -553,8 +553,8 @@ Group webgroup</pre> <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> definitions. By setting this directive to values different from the main server user ID, all requests for CGI resources will be executed as the - <em>User</em> and <em>Group</em> defined for that <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code>. If this - directive is not specified for a <code class="directive"><a href="./mod/core.html#virtualhostsection"><VirtualHost></a></code> then the main server userid + <em>User</em> and <em>Group</em> defined for that <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code>. If this + directive is not specified for a <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code> then the main server userid is assumed.</p> <p><strong>User directories:</strong><br /> Requests that are diff --git a/docs/manual/vhosts/details.html.en b/docs/manual/vhosts/details.html.en index 68020099bf..39459fa923 100644 --- a/docs/manual/vhosts/details.html.en +++ b/docs/manual/vhosts/details.html.en @@ -58,7 +58,7 @@ <p>There are virtual servers, called <em>vhosts</em>, which are defined by - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> sections.</p> <p>Each <code>VirtualHost</code> directive includes one diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en index dc28aa8d07..574874b965 100644 --- a/docs/manual/vhosts/examples.html.en +++ b/docs/manual/vhosts/examples.html.en @@ -114,7 +114,7 @@ Listen 80 as the <cite>default</cite> or <cite>primary</cite> server. That means that if a request is received that does not match one of the specified <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> directives, it will be served by this first - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code>.</p> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>.</p> <p>The above configuration is what you will want to use in almost all name-based virtual hosting situations. The only thing that this @@ -193,7 +193,7 @@ DocumentRoot "/www/mainserver" (<code>192.168.1.1</code>).</p> <p>The server can be made to respond to internal and external requests - with the same content, with just one <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> section.</p> + with the same content, with just one <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section.</p> <pre class="prettyprint lang-config"><VirtualHost 192.168.1.1 172.20.30.40> DocumentRoot "/www/server1" @@ -203,7 +203,7 @@ DocumentRoot "/www/mainserver" <p>Now requests from both networks will be served from the same - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code>.</p> + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>.</p> <div class="note"> <h3>Note:</h3><p>On the internal diff --git a/docs/manual/vhosts/fd-limits.html.en b/docs/manual/vhosts/fd-limits.html.en index cd9dcecfaa..48f88327bb 100644 --- a/docs/manual/vhosts/fd-limits.html.en +++ b/docs/manual/vhosts/fd-limits.html.en @@ -63,7 +63,7 @@ <ul> <li>Reduce the number of log files; don't specify log files - in the <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + in the <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> sections, but only log to the main log files. (See <a href="#splitlogs">Splitting up your log files</a>, below, for more information on doing this.)</li> diff --git a/docs/manual/vhosts/index.html.en b/docs/manual/vhosts/index.html.en index 71d8351085..a90cfd437c 100644 --- a/docs/manual/vhosts/index.html.en +++ b/docs/manual/vhosts/index.html.en @@ -80,7 +80,7 @@ hosts</a></li><li><a href="ip-based.html">IP-based virtual hosts</a></li><li><a <h2><a name="directives" id="directives">Configuration directives</a></h2> <ul> - <li><code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code></li> + <li><code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code></li> <li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li> <li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li> <li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li> diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en index 9bd0fe5df4..3339e0aa80 100644 --- a/docs/manual/vhosts/name-based.html.en +++ b/docs/manual/vhosts/name-based.html.en @@ -75,7 +75,7 @@ IP-based mapping irrelevant.</p> <p>When a request arrives, the server will find the best (most specific) matching - <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> argument based on + <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> argument based on the IP address and port used by the request. If there is more than one virtual host containing this best-match address and port combination, Apache will further compare the <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> and <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> directives to the server name @@ -96,17 +96,17 @@ <div class="section"> <h2><a name="using" id="using">Using Name-based Virtual Hosts</a></h2> -<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li><li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code></li></ul></td></tr></table> +<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li><li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code></li></ul></td></tr></table> - <p>The first step is to create a <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> block for - each different host that you would like to serve. Inside each <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> block, you will need at minimum a + <p>The first step is to create a <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> block for + each different host that you would like to serve. Inside each <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> block, you will need at minimum a <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> directive to designate which host is served and a <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directive to show where in the filesystem the content for that host lives.</p> <div class="note"><h3>Main host goes away</h3> - <p> Any request that doesn't match an existing <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> is handled by the global + <p> Any request that doesn't match an existing <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> is handled by the global server configuration, regardless of the hostname or ServerName.</p> <p> When you add a name-based virtual host to an existing server, and @@ -150,13 +150,13 @@ <p>You can alternatively specify an explicit IP address in place of the - <code>*</code> in <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> directives. For example, you might want to do this + <code>*</code> in <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> directives. For example, you might want to do this in order to run some name-based virtual hosts on one IP address, and either IP-based, or another set of name-based virtual hosts on another address.</p> <p>Many servers want to be accessible by more than one name. This is possible with the <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> - directive, placed inside the <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> section. For example in the first <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> block above, the + directive, placed inside the <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section. For example in the first <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> block above, the <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> directive indicates that the listed names are other names which people can use to see that same web site:</p> @@ -171,7 +171,7 @@ first have your DNS server properly configured to map those names to an IP address associated with your server.</p> - <p>Name-based virtual hosts for the best-matching set of <code class="directive"><a href="../mod/core.html#virtualhostsection"><virtualhost></a></code>s are processed + <p>Name-based virtual hosts for the best-matching set of <code class="directive"><a href="../mod/core.html#virtualhost"><virtualhost></a></code>s are processed in the order they appear in the configuration. The first matching <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> or <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> is used, with no different precedence for wildcards (nor for ServerName vs. ServerAlias). </p> @@ -180,12 +180,12 @@ <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code>.</p> <p>Finally, you can fine-tune the configuration of the virtual hosts - by placing other directives inside the <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> containers. Most directives can be + by placing other directives inside the <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> containers. Most directives can be placed in these containers and will then change the configuration only of the relevant virtual host. To find out if a particular directive is allowed, check the <a href="../mod/directive-dict.html#Context">Context</a> of the directive. Configuration directives set in the <em>main server context</em> - (outside any <code class="directive"><a href="../mod/core.html#virtualhostsection"><VirtualHost></a></code> + (outside any <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> container) will be used only if they are not overridden by the virtual host settings.</p> |