Return-Path: 
 <cvs-return-29191-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 70968 invoked from network); 8 Feb 2008 02:08:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Feb 2008 02:08:19 -0000
Received: (qmail 27776 invoked by uid 500); 8 Feb 2008 02:08:11 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 27727 invoked by uid 500); 8 Feb 2008 02:08:11 -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>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 27716 invoked by uid 99); 8 Feb 2008 02:08:11 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 18:08:11 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2008 02:08:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9C3ED1A9832; Thu,  7 Feb 2008 18:07:55 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r619738 - in /httpd/httpd/branches/2.0.x/docs/manual/mod:
 mod_include.html.en mod_include.xml
Date: Fri, 08 Feb 2008 02:07:54 -0000
To: cvs@httpd.apache.org
From: pctony@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080208020755.9C3ED1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pctony
Date: Thu Feb  7 18:07:49 2008
New Revision: 619738

URL: http://svn.apache.org/viewvc?rev=619738&view=rev
Log:
As per PR 33892 backporting to 2.0


Modified:
    httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.html.en
    httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.xml

Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.html.en?rev=619738&r1=619737&r2=619738&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.html.en (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.html.en Thu Feb  7 18:07:49 2008
@@ -586,6 +586,13 @@
       and<br />
       <br />
       <code>'<var>string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var>'</code> results in <code><var>string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var></code>.</p></div>
+
+    <div class="note"><h3>Escaping slashes in regex strings</h3>
+     <p>All slashes which are not intended to act as delimiters in your regex must
+     be escaped.  This is regardless of their meaning to the regex engine.</p>
+    </div>
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="SSIEndTag" id="SSIEndTag">SSIEndTag</a> <a name="ssiendtag" id="ssiendtag">Directive</a></h2>

Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.xml?rev=619738&r1=619737&r2=619738&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_include.xml Thu Feb  7 18:07:49 2008
@@ -579,6 +579,13 @@
       >string2</var>'</code> results in <code><var
       >string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var></code>.</p>
     </example>
+
+    <note><title>Escaping slashes in regex strings</title>
+     <p>All slashes which are not intended to act as delimiters in your regex must
+     be escaped.  This is regardless of their meaning to the regex engine.</p>
+    </note>
+
+
 </section>
 
 <directivesynopsis>