Port fix for bug 41747. Correct minor error in ant script example for deploy.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@514532 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5d8a2e4..5edc0ef 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -27,6 +27,9 @@
         value of zero. These are now the first servlets to be started. (markt)
       </fix>
       <fix>
+        <bug>41747</bug> Correct example ant script for deploy task. (markt)
+      </fix>
+      <fix>
         <bug>41752</bug> Correct error message on exception in MemoryRealm.
         (markt)
       </fix>

diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index 3f2c938..5987e9c 100644 (file)
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -974,7 +974,7 @@ file might look something like this:</p>
   &lt;target name="deploy" description="Install web application"
           depends="compile"&gt;
     &lt;deploy url="${url}" username="${username}" password="${password}"
-            path="${path}" war="${build}${path}.war"/&gt;
+            path="${path}" war="file:${build}${path}.war"/&gt;
   &lt;/target&gt;
 
   &lt;target name="reload" description="Reload web application"