httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject cvs commit: httpd-2.0/docs/manual sections.html
Date Tue, 06 Feb 2001 16:31:17 GMT
pepper      01/02/06 08:31:17

  Modified:    docs/manual sections.html
  Added note about later sections overriding earlier.
  Removed note about order reversal in 1.2-1.3a versions.
  Fixed a couple typos.
  Matched up <p> & </p>.
  Revision  Changes    Path
  1.11      +26 -33    httpd-2.0/docs/manual/sections.html
  Index: sections.html
  RCS file: /home/cvs/httpd-2.0/docs/manual/sections.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sections.html	2000/10/04 13:44:28	1.10
  +++ sections.html	2001/02/06 16:31:17	1.11
  @@ -12,9 +12,10 @@
   <!--#include virtual="header.html" -->
   <H1 ALIGN="CENTER">How Directory, Location and Files sections work</H1>
  -The sections <A
  +<p>The sections <A
and <A
can contain
  @@ -23,31 +24,31 @@
   apply directives to that directory. This document explains how these
   different sections differ and how they relate to each other when
   Apache decides which directives apply for a particular directory or
  -request URL.
  +request URL.</p>
   <H2>Directives allowed in the sections</H2>
  -Everything that is syntactically allowed in
  +<p>Everything that is syntactically allowed in
   <CODE>&lt;Directory&gt;</CODE> is also allowed in
   <CODE>&lt;Location&gt;</CODE> (except a sub-<CODE>&lt;Files&gt;</CODE>
  -section).  Semantically however some things, and the most
  -notable are <CODE>AllowOverride</CODE> and the two options
  +section).  Semantically, however some things, most
  +notably <CODE>AllowOverride</CODE> and the two options
   <CODE>FollowSymLinks</CODE> and <CODE>SymLinksIfOwnerMatch</CODE>,
   make no sense in <CODE>&lt;Location&gt;</CODE>,
   <CODE>&lt;LocationMatch&gt;</CODE> or <CODE>&lt;DirectoryMatch&gt;</CODE>.
   The same for <CODE>&lt;Files&gt;</CODE> -- syntactically everything
  -is fine, but semantically some things are different.
  +is fine, but semantically some things are different.</p>
   <H2>How the sections are merged</H2>
  -The order of merging is:
  +<p>The order of merging is:</p>
    <CODE>&lt;Directory&gt;</CODE> (except regular expressions) and
  - .htaccess done simultaneously (with .htaccess overriding
  + .htaccess done simultaneously (with .htaccess, if allowed, overriding
  @@ -68,7 +69,7 @@
  -Apart from <CODE>&lt;Directory&gt;</CODE>, each group is processed
  +<p>Apart from <CODE>&lt;Directory&gt;</CODE>, each group is processed
   the order that they appear in the configuration
   files. <CODE>&lt;Directory&gt;</CODE> (group 1 above) is processed
   the order shortest directory component to longest. If multiple
  @@ -77,22 +78,18 @@
   configuration files are read in the order httpd.conf, srm.conf and
   access.conf. Configurations included via the <CODE>Include</CODE>
   directive will be treated as if they were inside the including file
  -at the location of the <CODE>Include</CODE> directive.
  +at the location of the <CODE>Include</CODE> directive.</p>
  -Sections inside <CODE>&lt;VirtualHost&gt;</CODE> sections are applied
  +<p>Sections inside <CODE>&lt;VirtualHost&gt;</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. (Note: this only works correctly from 1.2.2 and 1.3a2
  -onwards. Before those releases sections inside virtual hosts were
  -applied <EM>before</EM> the main server).
  -<H2>Notes about using sections</H2>
  +<p>Later sections override earlier ones.</p>
  -The general guidelines are:
  +<H2>Notes about using sections</H2>
  +<p>The general guidelines are:</p>
  @@ -107,7 +104,7 @@
  -But a notable exception is:
  +<p>But a notable exception is:</p>
  @@ -119,18 +116,16 @@
  -Note about .htaccess parsing:
  +<p>Note about .htaccess parsing:</p>
       Modifying .htaccess parsing during Location doesn't do
       anything because .htaccess parsing has already occurred.
  +<p><CODE>&lt;Location&gt;</CODE> and symbolic links:</p>
  -<CODE>&lt;Location&gt;</CODE> and symbolic links:
       It is not possible to use "<CODE>Options FollowSymLinks</CODE>"
  @@ -141,19 +136,16 @@
       Using the options in question is only possible inside a
       <CODE>&lt;Directory&gt;</CODE> section (or a <CODE>.htaccess</CODE>
  +<p><CODE>&lt;Files&gt;</CODE> and <CODE>Options</CODE>:</p>
  -<CODE>&lt;Files&gt;</CODE> and <CODE>Options</CODE>:
       Apache won't check for it, but using an <CODE>Options</CODE>
       directive inside a <CODE>&lt;Files&gt;</CODE> section has no effect.
  -Another note:
  +<p>Another note:</p>
  @@ -167,4 +159,5 @@
   <!--#include virtual="footer.html" -->

View raw message