From: dgaudet <dgaudet@unknown>
Date: Sat, 28 Mar 1998 20:57:04 +0000 (+0000)
Subject: "Options +Includes" wasn't corrently merged if "+IncludesNoExec"
X-Git-Tag: APACHE_BIG_SYMBOL_RENAME_POST~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7481dab0ef4f86d66aac9b9fdfe745010ec163a2;p=thirdparty%2Fapache%2Fhttpd.git

"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 d505904e50a..d54ce29323b 100644
--- 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>