From 4184a3ef3ad91cd2e2aeb499fe97b6a4f9b54d02 Mon Sep 17 00:00:00 2001
From: kkolinko
Date: Tue, 2 Mar 2010 11:58:28 +0000
Subject: [PATCH] Use definitions list instead of unordered list. Add
information about extras and sources. Add charset information to the
tag.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@917984 13f79535-47bb-0310-9956-ffa450edef68
---
res/welcome.bin.html | 56 ++++++++++++++++++++++++++++++++++++++-------------
res/welcome.main.html | 56 ++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 84 insertions(+), 28 deletions(-)
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 5011851f0..8096de5e5 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -16,19 +16,18 @@
-->
Apache Tomcat @VERSION@
-
+
Apache Tomcat @VERSION@
-Useful references:
+
Useful references:
-
NOTE: The tar files in this distribution use GNU tar extensions,
and must be untarred with a GNU compatible version of tar. The version
@@ -39,17 +38,46 @@ these files.
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-Packaging Details (or "What Should I Download?")
-
- - 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.
- - apache-tomcat-[version].exe: 32-bit/64-bit 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.
- - 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.
- - 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 on x64 Windows platforms.
- - 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 on i64 Windows platforms.
- - apache-tomcat-[version]-deployer.zip or .tar.gz: the standalone Tomcat Web Application Deployer.
- - apache-tomcat-[version]-fulldocs.tar.gz: the Tomcat documentation bundle, including complete javadocs.
-
-
+Packaging Details (or "What Should I Download?")
+
+- bin/
+
+ - 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.
+ - apache-tomcat-[version].exe
+ - 32-bit/64-bit 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.
+ - 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.
+ - 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.
+ - 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
+ Itanium 64-bit Windows platforms.
+ - apache-tomcat-[version]-deployer.zip or .tar.gz
+ - The standalone Tomcat Web Application Deployer.
+ - apache-tomcat-[version]-fulldocs.tar.gz
+ - The Tomcat documentation bundle, including complete javadocs.
+
+- bin/extras/
+- Additional components. See
+ documentation.
+- src/
+
+ - apache-tomcat-[version].zip or .tar.gz
+ - The source code. See
+ building instructions.
+
+
Thank you for using Tomcat!.
diff --git a/res/welcome.main.html b/res/welcome.main.html
index d8dce92a5..271afe564 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -16,19 +16,18 @@
-->
Apache Tomcat @VERSION@
-
+
Apache Tomcat @VERSION@
-Useful references:
+
Useful references:
-
NOTE: The tar files in this distribution use GNU tar extensions,
and must be untarred with a GNU compatible version of tar. The version
@@ -39,17 +38,46 @@ these files.
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-Packaging Details (or "What Should I Download?")
-
- - 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.
- - apache-tomcat-[version].exe: 32-bit/64-bit 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.
- - 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.
- - 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.
- - 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.
- - apache-tomcat-[version]-deployer.zip or .tar.gz: the standalone Tomcat Web Application Deployer.
- - apache-tomcat-[version]-fulldocs.tar.gz: the Tomcat documentation bundle, including complete javadocs.
-
-
+Packaging Details (or "What Should I Download?")
+
+- bin/
+
+ - 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.
+ - apache-tomcat-[version].exe
+ - 32-bit/64-bit 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.
+ - 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.
+ - 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.
+ - 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
+ Itanium 64-bit Windows platforms.
+ - apache-tomcat-[version]-deployer.zip or .tar.gz
+ - The standalone Tomcat Web Application Deployer.
+ - apache-tomcat-[version]-fulldocs.tar.gz
+ - The Tomcat documentation bundle, including complete javadocs.
+
+- bin/extras/
+- Additional components. See
+ documentation.
+- src/
+
+ - apache-tomcat-[version].zip or .tar.gz
+ - The source code. See
+ building instructions.
+
+
Thank you for using Tomcat!.
--
2.11.0