"Options +Includes" wasn't corrently merged if "+IncludesNoExec"

was defined in a parent directory.

Submitted by:	Lars Eilebrecht

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

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index d505904e50a21df036625d3f9999de9ff96ba386..d54ce29323b8d0061728090dc7536e31e434a8a4 100644 (file)
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -1818,6 +1818,9 @@ Options +Includes -Indexes<BR>
 then the options <CODE>FollowSymLinks</CODE> and <CODE>Includes</CODE>
 are set for the /web/docs/spec directory.<P>
 
+<STRONG>Note:</STRONG> Using <CODE>-IncludesNOEXEC</CODE> or <CODE>-Includes</CODE>
+disables server-side includes completely regardless of the previous setting.<P>
+
 The default in the absence of any other settings is <CODE>All</CODE>.<P>
 <HR>