Fix bug 42025. Refer to correct regular expression implementation

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@529052 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 507d5cd..d82a4f0 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -22,8 +22,8 @@
          UnavailableException. Patch provided by Kawasima Kazuh. (markt)
       </fix>
     </changelog>
-</section>
-<subsection name="Coyote">
+  </subsection>
+  <subsection name="Coyote">
     <changelog>
       <fix>
         <bug>42119</bug> Fix return value for request.getCharacterEncoding() when
@@ -32,6 +32,15 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Webapps">
+    <changelog>
+      <fix>
+        <bug>42025</bug>: Update valve documentation to refer to correct regular
+        expression implementation. (markt)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 6.0.11 (remm)">
   <subsection name="General">
     <changelog>

diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 0695c3b..6237dc6 100644 (file)
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -205,10 +205,9 @@
     presented to this container for processing before it will be passed on.</p>
 
     <p>The syntax for <em>regular expressions</em> is different than that for
-    'standard' wildcard matching. Tomcat uses the
-    <a href="http://jakarta.apache.org/regexp/">Jakarta Regexp</a> library.
-    Please consult the Regexp documentation for details of the expressions
-    supported.</p>
+    'standard' wildcard matching. Tomcat uses the <code>java.util.regex</code>
+    package. Please consult the Java documentation for details of the
+    expressions supported.</p>
 
   </subsection>
 
@@ -262,10 +261,9 @@
     presented to this container for processing before it will be passed on.</p>
 
     <p>The syntax for <em>regular expressions</em> is different than that for
-    'standard' wildcard matching. Tomcat uses the
-    <a href="http://jakarta.apache.org/regexp/">Jakarta Regexp</a> library.
-    Please consult the Regexp documentation for details of the expressions
-    supported.</p>
+    'standard' wildcard matching. Tomcat uses the <code>java.util.regex</code>
+    package. Please consult the Java documentation for details of the
+    expressions supported.</p>
 
   </subsection>