From 7b16011cdbfffa0d5f1a921a9d6083699bb8ae38 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 11 Jan 2011 18:56:07 +0000
Subject: [PATCH] Bring up to date

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0cc788604..6d5d590d3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -41,6 +41,38 @@
 <!--
   General, Catalina, Coyote, Jasper, Cluster, Web applications, Extras, Other
 -->
+<section name="Tomcat 7.0.7 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <update>
+        Improve fix for <bug>50205</bug> to trigger an error earlier if invalid
+        configuration is used. (markt)
+      </update>
+    </changelog>
+  </subsection>
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        Improve special case handling of
+        <code>javax.servlet.jsp.el.ScopedAttributeELResolver</code> in
+        <code>javax.el.CompositeELResolver </code> to handle sub-classes.
+        (markt)
+      </fix>
+    </changelog>
+  </subsection>
+  <subsection name="Other">
+    <changelog>
+      <add>
+        Extend the Checkstyle tests to check for license headers. (markt)
+      </add>
+      <fix>
+        Modify the build script so a release build always rebuilds the
+        dependencies to ensure that the correct Tomcat version appears in the
+        manifest. (markt) 
+      </fix>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 7.0.6 (markt)">
   <subsection name="General">
     <changelog>
-- 
2.11.0