Commit 9d70ffbe authored by Luca Toscano's avatar Luca Toscano
Browse files

Documentation rebuild 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805196 13f79535-47bb-0310-9956-ffa450edef68
parent fd4951d1

docs/manual/bind.html.en

+5 −5
Original line number Diff line number Diff line
@@ -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#virtualhost">&lt;VirtualHost&gt;</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#virtualhostsection">&lt;VirtualHost&gt;</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#virtualhost">&lt;VirtualHost&gt;</a></code>

    <code class="directive"><a href="./mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</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#virtualhost">&lt;VirtualHost&gt;</a></code>

    <code class="directive"><a href="./mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</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#virtualhost">&lt;VirtualHost&gt;</a></code> section

    <code class="directive"><a href="./mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</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#virtualhost">&lt;VirtualHost&gt;</a></code>

    <code class="directive"><a href="./mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</a></code>

    is set for an address and port that the

    server is not listening to, it cannot be accessed.</p>

  </div></div>

docs/manual/configuring.html.en

+8 −8
Original line number Diff line number Diff line
@@ -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#ifdefine">&lt;IfDefine&gt;</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#ifdefinesection">&lt;IfDefine&gt;</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#ifdefine">&lt;IfDefine&gt;</a></code> and

    <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> sections

    <code class="directive"><a href="./mod/core.html#ifdefinesection">&lt;IfDefine&gt;</a></code> and

    <code class="directive"><a href="./mod/core.html#ifmodulesection">&lt;IfModule&gt;</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#ifmodule">&lt;IfModule&gt;</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#ifmodulesection">&lt;IfModule&gt;</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#ifmodule">&lt;IfModule&gt;</a></code> block. However,

    presence of a particular module by enclosing them in an <code class="directive"><a href="./mod/core.html#ifmodulesection">&lt;IfModule&gt;</a></code> block. However,

    <code class="directive">&lt;IfModule&gt;</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#directory">&lt;Directory&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</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#directorysection">&lt;Directory&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatchsection">&lt;DirectoryMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filessection">&lt;Files&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatchsection">&lt;FilesMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationsection">&lt;Location&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatchsection">&lt;LocationMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</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#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>, <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, and <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>

    placing them in <code class="directive"><a href="./mod/core.html#directorysection">&lt;Directory&gt;</a></code>, <code class="directive"><a href="./mod/core.html#directorymatchsection">&lt;DirectoryMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#filessection">&lt;Files&gt;</a></code>, <code class="directive"><a href="./mod/core.html#filesmatchsection">&lt;FilesMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#locationsection">&lt;Location&gt;</a></code>, and <code class="directive"><a href="./mod/core.html#locationmatchsection">&lt;LocationMatch&gt;</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#virtualhost">&lt;VirtualHost&gt;</a></code>

    inside <code class="directive"><a href="./mod/core.html#virtualhostsection">&lt;VirtualHost&gt;</a></code>

    sections, so that they will only apply to requests for a

    particular website.</p>

docs/manual/content-negotiation.html.en

+1 −1
Original line number Diff line number Diff line
@@ -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#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> section in

    directive within a <code class="directive"><a href="./mod/core.html#directorysection">&lt;Directory&gt;</a></code>, <code class="directive"><a href="./mod/core.html#locationsection">&lt;Location&gt;</a></code> or <code class="directive"><a href="./mod/core.html#filessection">&lt;Files&gt;</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

docs/manual/developer/API.html.en

+3 −3
Original line number Diff line number Diff line
@@ -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#directory">&lt;Directory&gt;</a></code> sections), for private data it has built in the

      <code>.htaccess</code> files or <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</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#directory">&lt;Directory&gt;</a></code> sections in

    from the server's own config files (either from the <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</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>&lt;Directory

    /&gt;</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#directory">&lt;Directory&gt;</a></code> section, which includes

      <p>When the server is reading a configuration file, or <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</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

docs/manual/developer/request.html.en

+4 −4
Original line number Diff line number Diff line
@@ -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#location">&lt;Location&gt;</a></code> sections

      <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</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#proxy">&lt;Proxy&gt;</a></code> sections.

      <code class="directive"><a href="../mod/mod_proxy.html#proxysection">&lt;Proxy&gt;</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#directory">&lt;Directory&gt;</a></code> and <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> sections. If the request

      the core will run the request filename against the <code class="directive"><a href="../mod/core.html#directorysection">&lt;Directory&gt;</a></code> and <code class="directive"><a href="../mod/core.html#filessection">&lt;Files&gt;</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#location">&lt;Location&gt;</a></code> sections.

      <code class="directive"><a href="../mod/core.html#locationsection">&lt;Location&gt;</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