From 93e906834f98a62817a78f5581e0a430f654ef0e Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 1 Feb 2010 00:17:55 +0000
Subject: [PATCH] Update info on zip distributions

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@905151 13f79535-47bb-0310-9956-ffa450edef68
---
 res/welcome.bin.html  | 6 ++++--
 res/welcome.main.html | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index c9826a4d2..ed1267f2c 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -41,9 +41,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 distribution.</li>
+    <li>apache-tomcat-[version].zip or .tar.gz: base distribution.  These distributions do not include the Windows service wrapper nor the compiled APR/native for Windows.</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]-windows-x86.zip: 32-bit Windows specific distribution that includes the Windows service wrapper and the compiled APR/native for Windows for use with 32-bit JVMs on both 32 and 64 bit Windows platforms.</li>
+    <li>apache-tomcat-[version]-windows-x64.zip: 64-bit Windows specific distribution that includes the Windows service wrapper and the compiled APR/native for Windows for use with 64-bit JVMs x64 Windows platforms.</li>
+    <li>apache-tomcat-[version]-windows-i64.zip: 64-bit Windows specific distribution that includes the Windows service wrapper and the compiled APR/native for Windows for use with 64-bit JVMs i64 Windows platforms.</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>
diff --git a/res/welcome.main.html b/res/welcome.main.html
index 826ea06f6..90e78cf4f 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -41,9 +41,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 distribution.</li>
+    <li>apache-tomcat-[version].zip or .tar.gz: base distribution.  These distributions do not include the Windows service wrapper nor the compiled APR/native library for Windows.</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]-windows-x86.zip: 32-bit Windows specific distribution that includes the Windows service wrapper and the compiled APR/native library for use with 32-bit JVMs on both 32 and 64 bit Windows platforms.</li>
+    <li>apache-tomcat-[version]-windows-x64.zip: 64-bit Windows specific distribution that includes the Windows service wrapper and the compiled APR/native library for use with 64-bit JVMs on x64 Windows platforms.</li>
+    <li>apache-tomcat-[version]-windows-i64.zip: 64-bit Windows specific distribution that includes the Windows service wrapper and the compiled APR/native library for use with 64-bit JVMs on i64 Windows platforms.</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>
-- 
2.11.0