From 14e09dc49767db4e948716a4a0d4e473aceac39d Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 29 Apr 2010 00:36:35 +0000
Subject: [PATCH] It isn't practical to list every single commit that
 implemented Servlet 3.0.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@939143 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 69c28eedb..c43376760 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -36,13 +36,9 @@
 <section name="Tomcat 7.0.0 (markt)">
   <subsection name="Catalina">
     <changelog>
-      <fix>
-        <rev>939114</rev>: Provide web.xml and fragments overwrite annotation parameters
-        (s. Servlet API 3.0 Spec at Nov 2009 Section 8.2.3.3 pages 80-84).
-        Check source at <code>ContextConfig.processAnnotationsFile(File,WebXml)</code>
-        and testcase <code>TestContextConfigAnnotation</code>.
-        --not yet complete-- (pero) 
-      </fix>
+      <update>
+        Update Servlet support to the Servlet 3.0 specification. (all)
+      </update>
       <update>
         Improve and document VirtualWebappLoader. (rjung)
       </update>
@@ -50,10 +46,6 @@
         <bug>43642</bug>: Add prestartminSpareThreads attribute for Executor. (jfclere)
       </add>
       <update>
-        Update Servlet support to the Servlet 3.0 specification. Note
-        asynchronous support is not yet complete. (markt/fhanik)
-      </update>
-      <update>
         Switch from AnnotationProcessor to InstanceManager. Patch provided by
         David Jecks with modifications by Remy. (remm/fhanik)
       </update>
-- 
2.11.0