From e156aa6585728e226dfb75a43a20eb6e15f9c330 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 15 Apr 2009 22:44:49 +0000
Subject: [PATCH] As a result of
 https://issues.apache.org/bugzilla/show_bug.cgi?id=46924 make the
 documentation clearer about what Tomcat will do if a WAR/DIR/context file is
 deleted or updated and auto-deploy is enabled.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@765406 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/config/host.xml | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 211e97e03..e1178b727 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -324,13 +324,34 @@
     auto deployer will also track web applications for the following changes:
     <ul>
         <li>An update to the WEB-INF/web.xml file will trigger a reload of the
-        web application</li>
-        <li>An update to a WAR which has been expanded will trigger 
-        an undeploy (<strong>with a removal of the expanded webapp</strong>), 
-        followed by a deployment</li>
-        <li>An update to a XML configuration file will trigger an undeploy
-        (without the removal of any expanded directory), followed by 
-        a deployment of the associated web application</li>
+          web application</li>
+        <li>Deleting a WAR file will trigger an undeploy of the application with
+          the removal of any associated expanded directory, context file and
+          work directory. Any current user sessions will not be persisted.</li>
+        <li>Deleting a directory will trigger an undeploy of the application
+          with the removal of any associated context file and work directory.
+          Any current user sessions will not be persisted. If there is an
+          associated WAR file, it will not be deleted and the application will
+          be redeployed from the WAR file the next time the auto deployer checks
+          for changes.</li>
+        <li>Deleting a context file will trigger an undeploy of the application
+          with the removal of any associated work directory. Any current user
+          sessions will not be persisted. If there is an associated WAR file
+          and/or directory, they will not be deleted and the application will be
+          redeployed from the WAR file (or from directory if there is no WAR
+          file) the next time the auto deployer checks for changes.</li>
+        <li>Updating a WAR file will trigger an undeploy of the application with
+          the removal of any associated expanded directory, context file and
+          work directory. Any current user sessions will not be persisted.</li>
+        <li>Updating a directory (not the diretcory contents) will trigger an
+          undeploy of the application with the removal of any associated context
+          file and work directory. Any current user sessions will not be
+          persisted. The application will be redeployed the next time the auto
+          deployer checks for changes.</li>
+        <li>Updating a context file will trigger an undeploy of the application
+          with the removal of any associated work directory. Any current user
+          sessions will not be persisted. The application will be redeployed the
+          next time the auto deployer checks for changes.</li>
     </ul>
     </p>
 
-- 
2.11.0