httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod directive-dict.html.en directive-dict.xml mod_headers.html.en mod_headers.xml
Date Wed, 23 Jul 2003 19:36:36 GMT
slive       2003/07/23 12:36:36

  Modified:    docs/manual sections.html.en sections.xml
               docs/manual/mod directive-dict.html.en directive-dict.xml
                        mod_headers.html.en mod_headers.xml
  Log:
  Hit a couple files that hadn't been adapted to account
  for the move from <Directory proxy:> to <proxy>
  
  Revision  Changes    Path
  1.28      +5 -0      httpd-2.0/docs/manual/sections.html.en
  
  Index: sections.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/sections.html.en,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -d -b -u -r1.27 -r1.28
  --- sections.html.en	29 May 2003 16:12:34 -0000	1.27
  +++ sections.html.en	23 Jul 2003 19:36:35 -0000	1.28
  @@ -376,6 +376,11 @@
       the virtual host definition. This allows virtual hosts to
       override the main server configuration.</p>
   
  +    <p>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#proxy">&lt;Proxy&gt;</a></code>
  +    container takes the place of the <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
container in the processing
  +    order.</p>
  +
       <p>Later sections override earlier ones.</p>
   
   <div class="note"><h3>Technical Note</h3>
  
  
  
  1.7       +6 -0      httpd-2.0/docs/manual/sections.xml
  
  Index: sections.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/sections.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -d -b -u -r1.6 -r1.7
  --- sections.xml	12 Apr 2003 15:04:43 -0000	1.6
  +++ sections.xml	23 Jul 2003 19:36:35 -0000	1.7
  @@ -400,6 +400,12 @@
       the virtual host definition. This allows virtual hosts to
       override the main server configuration.</p>
   
  +    <p>When the request is served by <module>mod_proxy</module>, the
  +    <directive module="mod_proxy" type="section">Proxy</directive>
  +    container takes the place of the <directive module="core"
  +    type="section">Directory</directive> container in the processing
  +    order.</p>
  +
       <p>Later sections override earlier ones.</p>
   
   <note><title>Technical Note</title>
  
  
  
  1.25      +4 -6      httpd-2.0/docs/manual/mod/directive-dict.html.en
  
  Index: directive-dict.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/directive-dict.html.en,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -d -b -u -r1.24 -r1.25
  --- directive-dict.html.en	29 May 2003 16:13:06 -0000	1.24
  +++ directive-dict.html.en	23 Jul 2003 19:36:36 -0000	1.25
  @@ -169,12 +169,10 @@
         <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#directory">&lt;Directory&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#files">&lt;Files&gt;</a></code>
  -      containers in the server configuration files, subject to the
  -      restrictions outlined in <a href="../sections.html">How
  -      Directory, Location and Files sections work</a>.</dd>
  +      used inside <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>,
<code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>,
and <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
containers
  +      in the server configuration files, subject to the restrictions
  +      outlined in <a href="../sections.html">Configuration
  +      Sections</a>.</dd>
   
         <dt>.htaccess</dt>
   
  
  
  
  1.5       +7 -6      httpd-2.0/docs/manual/mod/directive-dict.xml
  
  Index: directive-dict.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/directive-dict.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -d -b -u -r1.4 -r1.5
  --- directive-dict.xml	12 Apr 2003 15:04:46 -0000	1.4
  +++ directive-dict.xml	23 Jul 2003 19:36:36 -0000	1.5
  @@ -147,12 +147,13 @@
   
         <dd>A directive marked as being valid in this context may be
         used inside <directive module="core"
  -      type="section">Directory</directive>,
  -      <directive type="section" module="core">Location</directive>,
  -      and <directive module="core" type="section">Files</directive>
  -      containers in the server configuration files, subject to the
  -      restrictions outlined in <a href="../sections.html">How
  -      Directory, Location and Files sections work</a>.</dd>
  +      type="section">Directory</directive>, <directive type="section"
  +      module="core">Location</directive>, <directive module="core"
  +      type="section">Files</directive>, and <directive
  +      module="mod_proxy" type="section">Proxy</directive> containers
  +      in the server configuration files, subject to the restrictions
  +      outlined in <a href="../sections.html">Configuration
  +      Sections</a>.</dd>
   
         <dt>.htaccess</dt>
   
  
  
  
  1.19      +6 -20     httpd-2.0/docs/manual/mod/mod_headers.html.en
  
  Index: mod_headers.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_headers.html.en,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -d -b -u -r1.18 -r1.19
  --- mod_headers.html.en	29 May 2003 16:13:20 -0000	1.18
  +++ mod_headers.html.en	23 Jul 2003 19:36:36 -0000	1.19
  @@ -50,27 +50,13 @@
   <div class="section">
   <h2><a name="order" id="order">Order of Processing</a></h2>
   
  -    <p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code>
can occur
  -    almost anywhere within the server configuration. They are valid in the
  -    main server config and virtual host sections, inside
  -    <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>
and 
  -    <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>
sections,
  -    and within <code>.htaccess</code> files.</p>
  -
  -    <p>The directives are processed in the following order:</p>
  -
  -    <ol>
  -      <li>main server</li>
  -      <li>virtual host</li>
  -      <li><code class="directive">&lt;Directory&gt;</code> sections
and
  -      <code>.htaccess</code></li>
  -      <li><code class="directive">&lt;Files&gt;</code></li>
  -      <li><code class="directive">&lt;Location&gt;</code></li>
  -    </ol>
  +    <p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code>
can
  +    occur almost anywhere within the server configuration, and can be
  +    limited in scope by enclosing them in <a href="../sections.html">configuration
sections</a>.</p>
   
  -    <p>Order is important. These two headers have a different
  -    effect if reversed:</p>
  +    <p>Order of processing is important and is affected both by the
  +    order in the configuration file and by placement in <a href="../sections.html#mergin">configuration
sections</a>. These
  +    two headers have a different effect if reversed:</p>
   
       <div class="example"><p><code>
         RequestHeader append MirrorID "mirror 12"<br />
  
  
  
  1.7       +8 -20     httpd-2.0/docs/manual/mod/mod_headers.xml
  
  Index: mod_headers.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_headers.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -d -b -u -r1.6 -r1.7
  --- mod_headers.xml	11 Apr 2003 01:25:52 -0000	1.6
  +++ mod_headers.xml	23 Jul 2003 19:36:36 -0000	1.7
  @@ -20,27 +20,15 @@
   
   <section id="order"><title>Order of Processing</title>
   
  -    <p>The directives provided by <module>mod_headers</module> can occur
  -    almost anywhere within the server configuration. They are valid in the
  -    main server config and virtual host sections, inside
  -    <directive module="core" type="section">Directory</directive>,
  -    <directive module="core" type="section">Location</directive> and 
  -    <directive module="core" type="section">Files</directive> sections,
  -    and within <code>.htaccess</code> files.</p>
  -
  -    <p>The directives are processed in the following order:</p>
  -
  -    <ol>
  -      <li>main server</li>
  -      <li>virtual host</li>
  -      <li><directive type="section">Directory</directive> sections and
  -      <code>.htaccess</code></li>
  -      <li><directive type="section">Files</directive></li>
  -      <li><directive type="section">Location</directive></li>
  -    </ol>
  +    <p>The directives provided by <module>mod_headers</module> can
  +    occur almost anywhere within the server configuration, and can be
  +    limited in scope by enclosing them in <a
  +    href="../sections.html">configuration sections</a>.</p>
   
  -    <p>Order is important. These two headers have a different
  -    effect if reversed:</p>
  +    <p>Order of processing is important and is affected both by the
  +    order in the configuration file and by placement in <a
  +    href="../sections.html#mergin">configuration sections</a>. These
  +    two headers have a different effect if reversed:</p>
   
       <example>
         RequestHeader append MirrorID "mirror 12"<br />
  
  
  

Mime
View raw message