From 31b58e54762ba6110b30e066fcc9bf1cd6ec9914 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 9 Feb 2011 06:39:25 +0000
Subject: [PATCH] Add release date. Move recent changes into the new version.

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ce3ba63e6..dbe38f58c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -42,6 +42,23 @@
   General, Catalina, Coyote, Jasper, Cluster, Web applications, Extras, Other
 -->
 <section name="Tomcat 7.0.9 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <add>
+        Enhance the RemoteIpFilter and RemoteIpValve so that the modified remote
+        address, remote host, protocol and server port may be used in an access
+        log if desired. (markt)
+      </add>
+      <fix>
+        Restore access to Environments, Resources and ResourceLinks via JMX
+        which was lost in early 7.0.x re-factoring. (markt)
+      </fix>
+      <update>
+        Remove ServerLifecycleListener. This was already removed from server.xml
+        and with the Lifecycle re-factoring is no longer required. (markt)
+      </update>
+    </changelog>
+  </subsection>
   <subsection name="Tribes">
     <changelog>
       <fix>
@@ -50,7 +67,7 @@
     </changelog>
   </subsection>
 </section>
-<section name="Tomcat 7.0.8 (markt)">
+<section name="Tomcat 7.0.8 (markt)" rtext="released 2011-02-05">
   <subsection name="Catalina">
     <changelog>
       <fix>
@@ -64,19 +81,6 @@
         When running under a security manager, user requests may fail with a
         security exception. (markt)
       </fix>
-      <add>
-        Enhance the RemoteIpFilter and RemoteIpValve so that the modified remote
-        address, remote host, protocol and server port may be used in an access
-        log if desired. (markt)
-      </add>
-      <fix>
-        Restore access to Environments, Resources and ResourceLinks via JMX
-        which was lost in early 7.0.x re-factoring. (markt)
-      </fix>
-      <update>
-        Remove ServerLifecycleListener. This was already removed from server.xml
-        and with the Lifecycle re-factoring is no longer required. (markt)
-      </update>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0