Return-Path: 
 <cvs-return-19965-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 19716 invoked from network); 5 Sep 2004 03:30:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 5 Sep 2004 03:30:55 -0000
Received: (qmail 42120 invoked by uid 500); 5 Sep 2004 03:30:53 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 42101 invoked by uid 500); 5 Sep 2004 03:30:53 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 42086 invoked by uid 500); 5 Sep 2004 03:30:52 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Received: (qmail 42083 invoked by uid 99); 5 Sep 2004 03:30:52 -0000
X-ASF-Spam-Status: No, hits=-2.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sat, 04 Sep 2004 20:30:52 -0700
Received: (qmail 19696 invoked by uid 1228); 5 Sep 2004 03:30:51 -0000
Date: 5 Sep 2004 03:30:51 -0000
Message-ID: <20040905033051.19695.qmail@minotaur.apache.org>
From: yoshiki@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/docs/manual/mod mod_include.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

yoshiki     2004/09/04 20:30:51

  Modified:    docs/manual/mod Tag: APACHE_2_0_BRANCH mod_include.xml
  Log:
  Backport relevant changes from 2.1.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.18.2.9  +7 -2      httpd-2.0/docs/manual/mod/mod_include.xml
  
  Index: mod_include.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_include.xml,v
  retrieving revision 1.18.2.8
  retrieving revision 1.18.2.9
  diff -u -r1.18.2.8 -r1.18.2.9
  --- mod_include.xml	9 Jun 2004 23:50:54 -0000	1.18.2.8
  +++ mod_include.xml	5 Sep 2004 03:30:51 -0000	1.18.2.9
  @@ -145,7 +145,8 @@
         <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
  @@ -554,6 +555,10 @@
         &lt;!--#if expr="$a = test1 &amp;&amp; $b = test2" --&gt;<br />
         &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: