From 98abec8eb9edb4ae220e8baf79c9cc9337bb95c9 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 Jan 2011 10:11:55 +0000
Subject: [PATCH] Additional docs on version ordering Add 7.0.6 release date

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059280 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml      | 6 +++++-
 webapps/docs/config/context.xml | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61acb73a9..fa92fc9c9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -90,6 +90,10 @@
       <fix>
         Correct a handful of Javadoc warnings. (markt)
       </fix>
+      <add>
+        Provide additional detail about how web application version order it
+        determined when using parallel deployment. (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Other">
@@ -105,7 +109,7 @@
     </changelog>
   </subsection>
 </section>
-<section name="Tomcat 7.0.6 (markt)">
+<section name="Tomcat 7.0.6 (markt)" rtext="released 2011-01-14">
   <subsection name="General">
     <changelog>
       <update>
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index e9dd89521..5b34748db 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -107,6 +107,15 @@
     <tr><td><i>Empty String</i></td><td>42</td><td>##42</td><td>ROOT##42</td></tr>
   </table>
   
+  <p>The version component is treated as a <code>String</code> both for
+  performance reasons and to allow flexability in versioning schemes. String
+  comparissions are used to determine version order. Therefore
+  <code>foo##11.war</code> will be treated as an earlier version than
+  <code>foo##2.war</code>. If using a purely numerical versioning scheme it is
+  recommended that zero padding is used so that <code>foo##002.war</code> is
+  treated as an earlier version than <code>foo##011.war</code>.
+  </p>
+
   <p><b>It is NOT recommended to place &lt;Context&gt; elements directly in the
   server.xml file.</b> This is because it makes modifying the
   <strong>Context</strong> configuration more invasive since the main
-- 
2.11.0