Author: markt
Date: Sat Sep 8 19:00:42 2012
New Revision: 1382344
URL: http://svn.apache.org/viewvc?rev=1382344&view=rev
Log:
Clarify difference between tag and version in Manager app.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1382343
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1382344&r1=1382343&r2=1382344&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Sep 8 19:00:42 2012
@@ -93,6 +93,15 @@
</add>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <add>
+ Improve the documentation web application to clarify the difference
+ between the tag and version parameters when using text interface of the
+ Manager web application. (markt)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.30 (markt)" rtext="released 2012-09-06">
<subsection name="Catalina">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml?rev=1382344&r1=1382343&r2=1382344&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Sat Sep 8 19:00:42 2012
@@ -236,6 +236,8 @@ the host and port appropriately for your
application, specify "/". <strong>NOTE</strong> -
It is not possible to perform administrative commands on the
Manager application itself.</li>
+<li><strong>version</strong> - The version of this web application as used by
+ the parallel deployment feature,</li>
<li><strong>war</strong> - URL of a web application archive (WAR) file,
pathname of a directory which contains the web application, or a
Context configuration ".xml" file. You can use URLs in any of the
@@ -298,8 +300,8 @@ including a Context configuration XML fi
<li><code>update</code>: When set to true, any existing update will be
undeployed first. The default value is set to false.</li>
<li><code>tag</code>: Specifying a tag name, this allows associating the
- deployed webapp with a version number. The application version can
- be later redeployed when needed using only the tag.</li>
+ deployed webapp with a tag or label. If the web application is undeployed,
+ it can be later redeployed when needed using only the tag.</li>
</ul>
<p><strong>NOTE</strong> - This command is the logical
@@ -344,9 +346,9 @@ This command is the logical opposite of
<p>There are a number of different ways the deploy command can be used.</p>
-<h3>Deploy a version of a previously deployed webapp</h3>
+<h3>Deploy a previously deployed webapp</h3>
-<p>This can be used to deploy a previous version of a web application, which
+<p>This can be used to deploy a previously deployed web application, which
has been deployed using the <code>tag</code> attribute. Note that the work
directory for the Manager webapp will contain the previously deployed WARs;
removing it would make the deployment fail.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
