From: Vincent Bray <noodl@apache.org>
Date: Thu, 26 Jul 2007 13:34:01 +0000 (+0000)
Subject: Copy Options warning present in trunk and 2.0 docs to 2.2
X-Git-Tag: 2.2.5~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3c8bbe8853c7172a25f09765f0645b08c739401;p=thirdparty%2Fapache%2Fhttpd.git

Copy Options warning present in trunk and 2.0 docs to 2.2

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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 3753c882ca6..2e243ca0cc0 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2331,6 +2331,12 @@ directory</description>
     <code>-</code> are removed from the options currently in
     force. </p>
 
+    <note type="warning"><title>Warning</title>
+    <p>Mixing <directive>Options</directive> with a <code>+</code> or
+    <code>-</code> with those without is not valid syntax, and is likely
+    to cause unexpected results.</p>
+    </note>
+
     <p>For example, without any <code>+</code> and <code>-</code> symbols:</p>
 
     <example>