Author: markt
Date: Thu Feb 4 10:18:56 2016
New Revision: 1728433
URL: http://svn.apache.org/viewvc?rev=1728433&view=rev
Log:
Correct an error in the documentation of the expected behaviour for automatic
deployment. If a WAR is updated and an expanded directory is present, the
directory will always be deleted and recreated by expanding the WAR if
unpackWARs is true.
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/automatic-deployment.xml
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1728433&r1=1728432&r2=1728433&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Feb 4 10:18:56 2016
@@ -62,6 +62,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Correct an error in the documentation of the expected behaviour for
+ automatic deployment. If a WAR is updated and an expanded directory is
+ present, the directory will always be deleted and recreated by
expanding
+ the WAR if <code>unpackWARs</code> is <code>true</code>. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.0.M3" rtext="Voting in progress">
<subsection name="General">
Modified: tomcat/trunk/webapps/docs/config/automatic-deployment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/automatic-deployment.xml?rev=1728433&r1=1728432&r2=1728433&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/automatic-deployment.xml (original)
+++ tomcat/trunk/webapps/docs/config/automatic-deployment.xml Thu Feb 4
10:18:56 2016
@@ -380,8 +380,9 @@
before the change and isn't present after it either. '-' rather than
'N'
is used to focus attention on what changes.</li>
<li>'M' means that the artifact has been modified.</li>
- <li>'R' means that the directory is re-created by expanding the WAR file.
- This will only happen if <em>unpackWARs</em> is <code>true</code>.</li>
+ <li>'R' means that the directory is deleted and re-created by expanding the
+ WAR file. This will only happen if <em>unpackWARs</em> is
+ <code>true</code>.</li>
</ul>
<table class="detail-table">
@@ -447,7 +448,7 @@
<tr>
<td>Y</td><td>Y</td><td>Y</td>
<td>WAR</td>
- <td>Y</td><td>M</td><td>Y</td><td>Reload</td>
+ <td>Y</td><td>M</td><td>R</td><td>Reload</td>
</tr>
<tr>
<td>Y</td><td>Y</td><td>Y</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
