summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorLars Eilebrecht <lars@apache.org>1999-02-21 02:47:10 +0100
committerLars Eilebrecht <lars@apache.org>1999-02-21 02:47:10 +0100
commitedade401317c918c69ee6766158eee8b900eaba7 (patch)
tree6c1cf408d1d256e0d78eacd0735d27152ba1f1c3 /docs
parentSpelling fixes. (diff)
downloadapache2-edade401317c918c69ee6766158eee8b900eaba7.tar.xz
apache2-edade401317c918c69ee6766158eee8b900eaba7.zip
Updated docs; no FollowSymLinks in <DirectoryMatch>
PR: 2657 Obtained from: Brian Thomas <wolfie@mpath.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82834 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/sections.html10
-rw-r--r--docs/manual/sections.html.en10
2 files changed, 12 insertions, 8 deletions
diff --git a/docs/manual/sections.html b/docs/manual/sections.html
index cfa2abe40d..88f3329408 100644
--- a/docs/manual/sections.html
+++ b/docs/manual/sections.html
@@ -33,9 +33,10 @@ Everything that is syntactically allowed in
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.
+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.
<H2>How the sections are merged</H2>
@@ -134,7 +135,8 @@ Note about .htaccess parsing:
<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
+ <CODE>&lt;Location&gt;</CODE>, <CODE>&lt;LocationMatch&gt;</CODE>
+ or <CODE>&lt;DirectoryMatch&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).
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index cfa2abe40d..88f3329408 100644
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -33,9 +33,10 @@ Everything that is syntactically allowed in
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.
+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.
<H2>How the sections are merged</H2>
@@ -134,7 +135,8 @@ Note about .htaccess parsing:
<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
+ <CODE>&lt;Location&gt;</CODE>, <CODE>&lt;LocationMatch&gt;</CODE>
+ or <CODE>&lt;DirectoryMatch&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).