From: Eric Covener <covener@apache.org>
Date: Mon, 8 Aug 2011 12:16:58 +0000 (+0000)
Subject: Merge r1154940 from trunk:
X-Git-Tag: 2.2.20~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbce5979e09d46f6a8fccc635a61402b7c50afa4;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1154940 from trunk:

document implicit limitation in AllowOverride Option=Foo -- this doesn't let you
"lock in" any value since the non +/- syntax can zap whatever it wants.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1154942 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index c53c110cec9..75f49943f16 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -459,7 +459,17 @@ NoDecode option available in 2.2.18 and later.</compatibility>
       <directive module="mod_include">XBitHack</directive>).
       An equal sign may be given followed by a comma (but no spaces)
       separated lists of options that may be set using the <directive
-      module="core">Options</directive> command.</dd>
+      module="core">Options</directive> command.
+
+      <note><title>Implicit disabling of Options</title>
+      <p>Even though the list of options that may be used in .htaccess files 
+         can be limited with this directive, as long as any <directive 
+         module="core">Options</directive> directive is allowed any
+         other inherited option can be disabled by using the non-relative
+         syntax.  In other words, this mechanism cannot force a specific option
+         to remain <em>set</em> while allowing any others to be set.
+      </p></note>
+      </dd>
     </dl>
 
     <p>Example:</p>