You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by el...@apache.org on 2017/08/18 08:24:46 UTC
svn commit: r1805373 [3/3] - in /httpd/httpd/trunk/docs/manual: ./
developer/ howto/ mod/ platform/ programs/ rewrite/ ssl/ vhosts/
Modified: httpd/httpd/trunk/docs/manual/new_features_2_4.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_4.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_4.html.en (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_4.html.en Fri Aug 18 08:24:45 2017
@@ -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>
Modified: httpd/httpd/trunk/docs/manual/platform/windows.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/platform/windows.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/windows.html.en (original)
+++ httpd/httpd/trunk/docs/manual/platform/windows.html.en Fri Aug 18 08:24:45 2017
@@ -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
Modified: httpd/httpd/trunk/docs/manual/programs/httpd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/httpd.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/httpd.html.en (original)
+++ httpd/httpd/trunk/docs/manual/programs/httpd.html.en Fri Aug 18 08:24:45 2017
@@ -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>
Modified: httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/avoid.html.en Fri Aug 18 08:24:45 2017
@@ -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
<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>
Modified: httpd/httpd/trunk/docs/manual/rewrite/flags.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/flags.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/flags.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/flags.html.en Fri Aug 18 08:24:45 2017
@@ -381,13 +381,13 @@ immediately without considering further
<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]</pr
<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>
Modified: httpd/httpd/trunk/docs/manual/rewrite/index.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/index.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/index.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/index.html.en Fri Aug 18 08:24:45 2017
@@ -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
Modified: httpd/httpd/trunk/docs/manual/rewrite/intro.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/intro.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/intro.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/intro.html.en Fri Aug 18 08:24:45 2017
@@ -319,11 +319,11 @@ rewriting for you. This is discussed in
<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>
Modified: httpd/httpd/trunk/docs/manual/rewrite/remapping.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/remapping.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/remapping.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/remapping.html.en Fri Aug 18 08:24:45 2017
@@ -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'">
Modified: httpd/httpd/trunk/docs/manual/rewrite/rewritemap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/rewritemap.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/rewritemap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/rewritemap.html.en Fri Aug 18 08:24:45 2017
@@ -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
<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>
Modified: httpd/httpd/trunk/docs/manual/rewrite/tech.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/tech.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/tech.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/tech.html.en Fri Aug 18 08:24:45 2017
@@ -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
Modified: httpd/httpd/trunk/docs/manual/sections.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.html.en (original)
+++ httpd/httpd/trunk/docs/manual/sections.html.en Fri Aug 18 08:24:45 2017
@@ -46,18 +46,18 @@ to change the scope of other configurati
<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&g
t;</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 st
</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
</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 d
</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 index
</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
</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/" st
<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 wil
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
<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
<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 conf
<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 specif
<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
<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 D
<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 a
<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 unde
<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>
Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_faq.html.en Fri Aug 18 08:24:45 2017
@@ -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>
Modified: httpd/httpd/trunk/docs/manual/suexec.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/suexec.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/suexec.html.en (original)
+++ httpd/httpd/trunk/docs/manual/suexec.html.en Fri Aug 18 08:24:45 2017
@@ -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
Modified: httpd/httpd/trunk/docs/manual/vhosts/details.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/details.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/details.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/details.html.en Fri Aug 18 08:24:45 2017
@@ -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
Modified: httpd/httpd/trunk/docs/manual/vhosts/examples.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/examples.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/examples.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/examples.html.en Fri Aug 18 08:24:45 2017
@@ -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
Modified: httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/fd-limits.html.en Fri Aug 18 08:24:45 2017
@@ -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>
Modified: httpd/httpd/trunk/docs/manual/vhosts/index.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/index.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/index.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/index.html.en Fri Aug 18 08:24:45 2017
@@ -80,7 +80,7 @@ hosts</a></li><li><a href="ip-based.html
<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>
Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en?rev=1805373&r1=1805372&r2=1805373&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.html.en Fri Aug 18 08:24:45 2017
@@ -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>