From: Tony Stevenson <pctony@apache.org>
Date: Fri, 8 Feb 2008 02:07:49 +0000 (+0000)
Subject: As per PR 33892 backporting to 2.0
X-Git-Tag: 2.0.64~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56b3b2788ab8e68d1c52f679087d11d735e36e81;p=thirdparty%2Fapache%2Fhttpd.git

As per PR 33892 backporting to 2.0



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

diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en
index 347d03f53b1..6cb44fc85e2 100644
--- a/docs/manual/mod/mod_include.html.en
+++ b/docs/manual/mod/mod_include.html.en
@@ -586,6 +586,13 @@ Server Error Messages</a></li>
       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>
diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml
index 60ccf47130c..f03dc2ac8d9 100644
--- a/docs/manual/mod/mod_include.xml
+++ b/docs/manual/mod/mod_include.xml
@@ -579,6 +579,13 @@ Server Error Messages</a></seealso>
       >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>