Backport relevant changes from 2.1.

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

diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml
index f8993d1c0d0e1605339c719307af5e5e8a875ab8..68a7a56b77629cfc288beebad82a70d3dc374e4d 100644 (file)
--- a/docs/manual/mod/mod_include.xml
+++ b/docs/manual/mod/mod_include.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $Revision: 1.18.2.8 $ -->
+<!-- $Revision: 1.18.2.9 $ -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -145,7 +145,8 @@ Server Error Messages</a></seealso>
       <dt><code>errmsg</code></dt>
       <dd>The value is a message that is sent back to the
       client if an error occurs while parsing the
-      document.</dd>
+      document. This overrides any <directive
+      module="mod_include">SSIErrorMsg</directive> directives.</dd>
 
       <dt><code>sizefmt</code></dt>
       <dd>The value sets the format to be used which displaying
@@ -555,6 +556,10 @@ Server Error Messages</a></seealso>
       &lt;!--#if expr="($a = test1) &amp;&amp; ($b = test2)" --&gt;
     </example>
 
+    <p>The boolean operators <code>&amp;&amp;</code> and <code>||</code>
+    share the same priority. So if you want to bind such an operator more
+    tightly, you should use parentheses.</p>
+
     <p>Anything that's not recognized as a variable or an operator
     is treated as a string. Strings can also be quoted:
     <code>'string'</code>. Unquoted strings can't contain whitespace