Clarify some sectional concerns.

Submitted by:	Lars Eilebrecht <Lars.Eilebrecht@unix-ag.org>, Ken Coar

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

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 17e644ac7692451d1a08253129032bf52df7a136..2da61f90c301a5cce2dfa4991a844d76df9a492f 100644 (file)
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -1321,7 +1321,8 @@ require valid-user<BR>
 If an access control directive appears outside a &lt;Limit&gt;
 directive, then it applies to all access methods. The method names
 listed can be one or more of: GET, POST, PUT, DELETE, CONNECT or
-OPTIONS. If GET is used it will also restrict HEAD requests.
+OPTIONS. <STRONG>The method name is case-sensitive.</STRONG>
+If GET is used it will also restrict HEAD requests.
 <STRONG>If you wish to limit all methods, do not include any
 &lt;Limit&gt; directive at all.</STRONG> <P><HR>
 
@@ -1889,7 +1890,7 @@ a particular directory.
 the extra features are enabled, or one or more of the following:
 <DL>
 <DT>All
-<DD>All options except for MultiViews.
+<DD>All options except for MultiViews. This is the default setting.
 <DT>ExecCGI
 <DD>
 <!--%plaintext &lt;?INDEX {\tt ExecCGI} option&gt; -->
@@ -1898,10 +1899,15 @@ Execution of CGI scripts is permitted.
 <DD>
 <!--%plaintext &lt;?INDEX {\tt FollowSymLinks} option&gt; -->
 The server will follow symbolic links in this directory.
+<br>
 <STRONG>Note</STRONG>: even though the server follows the symlink it
 does <EM>not</EM>
 change the pathname used to match against <CODE>&lt;Directory&gt;</CODE>
 sections.
+<br>
+<STRONG>Note</STRONG>: this option gets ignored if set inside a
+&lt;Location&gt; section.
+
 <DT>Includes
 <DD>
 <!--%plaintext &lt;?INDEX {\tt Includes} option&gt; -->
@@ -1927,6 +1933,9 @@ allowed.
 <!--%plaintext &lt;?INDEX {\tt SymLinksIfOwnerMatch} option&gt; -->
 The server will only follow symbolic links for which the target
 file or directory is owned by the same user id as the link.
+<br>
+<STRONG>Note</STRONG>: this option gets ignored if set inside a
+&lt;Location&gt; section.
 </DL>
 
 Normally, if multiple <CODE>Options</CODE> could apply to a directory,

diff --git a/docs/manual/sections.html b/docs/manual/sections.html
index a8e4756d9202f74a900ced8bfd86828bc00789ed..cfa2abe40dc83ac7aa2d9bd6178c65097e6eae23 100644 (file)
--- a/docs/manual/sections.html
+++ b/docs/manual/sections.html
@@ -30,10 +30,10 @@ request URL.
 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, but the code doesn't test for that, Lars has an open bug
-report on that).  Semantically however some things, and the most
-notable is AllowOverride, make no sense in
-<CODE>&lt;Location&gt;</CODE>.  The same for
+section).  Semantically however some things, and the most
+notable are <CODE>AllowOverride</CODE> and the two options
+<CODE>FollowSymLinks</CODE> and <CODE>SymLinksIfOwnerMatch</CODE>,
+make no sense in <CODE>&lt;Location&gt;</CODE>.  The same for
 <CODE>&lt;Files&gt;</CODE> -- syntactically everything is fine, but
 semantically some things are different.
 
@@ -118,13 +118,40 @@ But a notable exception is:
 </LI>
 </UL>
 
-Note also that modifying .htaccess parsing during Location doesn't do
-anything because .htaccess parsing has already occurred.
+<P>
+Note about .htaccess parsing:
+</P>
+<UL>
+<LI>
+    Modifying .htaccess parsing during Location doesn't do
+    anything because .htaccess parsing has already occurred.
+</UL>
+
+<P>
+<CODE>&lt;Location&gt;</CODE> and symbolic links:
+</P>
+<UL>
+<LI>
+    It is not possible to use "<CODE>Options FollowSymLinks</CODE>"
+    or "<CODE>Options SymLinksIfOwnerMatch</CODE>" inside a
+    <CODE>&lt;Location&gt;</CODE>/<CODE>&lt;LocationMatch&gt;</CODE> section
+    (the options are simply ignored).
+    Using the options in question is only possible inside a
+    <CODE>&lt;Directory&gt;</CODE> section (or a <CODE>.htaccess</CODE> file).
+</UL>
 
 <P>
+<CODE>&lt;Files&gt;</CODE> and <CODE>Options</CODE>:
+</P>
+<UL>
+<LI>
+    Apache won't check for it, but using an <CODE>Options</CODE>
+    directive inside a <CODE>&lt;Files&gt;</CODE> section has no effect.
+</UL>
 
-Another note:
 <P>
+Another note:
+</P>
 
 <UL>
 <LI>

diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index a8e4756d9202f74a900ced8bfd86828bc00789ed..cfa2abe40dc83ac7aa2d9bd6178c65097e6eae23 100644 (file)
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -30,10 +30,10 @@ request URL.
 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, but the code doesn't test for that, Lars has an open bug
-report on that).  Semantically however some things, and the most
-notable is AllowOverride, make no sense in
-<CODE>&lt;Location&gt;</CODE>.  The same for
+section).  Semantically however some things, and the most
+notable are <CODE>AllowOverride</CODE> and the two options
+<CODE>FollowSymLinks</CODE> and <CODE>SymLinksIfOwnerMatch</CODE>,
+make no sense in <CODE>&lt;Location&gt;</CODE>.  The same for
 <CODE>&lt;Files&gt;</CODE> -- syntactically everything is fine, but
 semantically some things are different.
 
@@ -118,13 +118,40 @@ But a notable exception is:
 </LI>
 </UL>
 
-Note also that modifying .htaccess parsing during Location doesn't do
-anything because .htaccess parsing has already occurred.
+<P>
+Note about .htaccess parsing:
+</P>
+<UL>
+<LI>
+    Modifying .htaccess parsing during Location doesn't do
+    anything because .htaccess parsing has already occurred.
+</UL>
+
+<P>
+<CODE>&lt;Location&gt;</CODE> and symbolic links:
+</P>
+<UL>
+<LI>
+    It is not possible to use "<CODE>Options FollowSymLinks</CODE>"
+    or "<CODE>Options SymLinksIfOwnerMatch</CODE>" inside a
+    <CODE>&lt;Location&gt;</CODE>/<CODE>&lt;LocationMatch&gt;</CODE> section
+    (the options are simply ignored).
+    Using the options in question is only possible inside a
+    <CODE>&lt;Directory&gt;</CODE> section (or a <CODE>.htaccess</CODE> file).
+</UL>
 
 <P>
+<CODE>&lt;Files&gt;</CODE> and <CODE>Options</CODE>:
+</P>
+<UL>
+<LI>
+    Apache won't check for it, but using an <CODE>Options</CODE>
+    directive inside a <CODE>&lt;Files&gt;</CODE> section has no effect.
+</UL>
 
-Another note:
 <P>
+Another note:
+</P>
 
 <UL>
 <LI>