- Small tweaks.

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

diff --git a/res/deployer/build.xml b/res/deployer/build.xml
index 8425651..1249b27 100644 (file)
--- a/res/deployer/build.xml
+++ b/res/deployer/build.xml
@@ -38,7 +38,7 @@
       <fileset dir="${webapp}" />
     </copy>
 
-    <jasper2 validateXml="false" 
+    <jasper validateXml="false" 
              uriroot="${webapp.path}" 
              webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
              addWebXmlMappings="true"

diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 22c5fe8..e8f48a1 100644 (file)
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -8,7 +8,7 @@
 <P></P>
 <p>Useful references:
 <ul>
-<li><a href="RELEASE-NOTES">Release notes</a>, with important information 
+<li><a href="../RELEASE-NOTES">Release notes</a>, with important information 
 about known issues</li>
 <li><a href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html">Changelog</a></li>
 <li><a href="http://tomcat.apache.org/tomcat-6.0-doc/status.html">Status</a></li>
@@ -26,10 +26,11 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
 
 <p>Packaging Details (or "What Should I Download?")
   <ul>
-    <li>apache-tomcat-[version].zip or .tar.gz: base distro, all non-embedded users download this.</li>
+    <li>apache-tomcat-[version].zip or .tar.gz: base distribution.</li>
     <li>apache-tomcat-[version].exe: Windows installer for Tomcat.  Please note that while this distribution includes the vast majority of the base distribution, some of the command-line scripts for launching Tomcat are not included.  This distribution is intended for those users planning to launch Tomcat through the Windows shortcuts or services.</li>
-    <li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat Administration webapp only.</li>
+    <!--<li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat Administration webapp only.</li>-->
     <li>apache-tomcat-[version]-deployer.zip or .tar.gz: the standalone Tomcat Web Application Deployer.</li>
+    <li>apache-tomcat-[version]-fulldocs.tar.gz: the Tomcat documentation bundle, including complete javadocs.</li>
   </ul>
 </p>
 

diff --git a/res/welcome.main.html b/res/welcome.main.html
index ab31acc..178dea6 100644 (file)
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -26,10 +26,11 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
 
 <p>Packaging Details (or "What Should I Download?")
   <ul>
-    <li>apache-tomcat-[version].zip or .tar.gz: base distro, all non-embedded users download this.</li>
-    <li>apache-tomcat-[version].exe: Windows installer with base distro contents + Windows installation.</li>
-    <li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat Administration webapp only.</li>
+    <li>apache-tomcat-[version].zip or .tar.gz: base distribution.</li>
+    <li>apache-tomcat-[version].exe: Windows installer for Tomcat.  Please note that while this distribution includes the vast majority of the base distribution, some of the command-line scripts for launching Tomcat are not included.  This distribution is intended for those users planning to launch Tomcat through the Windows shortcuts or services.</li>
+    <!--<li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat Administration webapp only.</li>-->
     <li>apache-tomcat-[version]-deployer.zip or .tar.gz: the standalone Tomcat Web Application Deployer.</li>
+    <li>apache-tomcat-[version]-fulldocs.tar.gz: the Tomcat documentation bundle, including complete javadocs.</li>
   </ul>
 </p>