You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/09/19 22:50:25 UTC

svn commit: r1524837 - in /tomcat/trunk/res: welcome.bin.html welcome.main.html

Author: markt
Date: Thu Sep 19 20:50:25 2013
New Revision: 1524837

URL: http://svn.apache.org/r1524837
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=55383
Improve markup for Welcome pages
Patch provided by Konstantin Preißer

Modified:
    tomcat/trunk/res/welcome.bin.html
    tomcat/trunk/res/welcome.main.html

Modified: tomcat/trunk/res/welcome.bin.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/welcome.bin.html?rev=1524837&r1=1524836&r2=1524837&view=diff
==============================================================================
--- tomcat/trunk/res/welcome.bin.html (original)
+++ tomcat/trunk/res/welcome.bin.html Thu Sep 19 20:50:25 2013
@@ -14,14 +14,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE>
-<META http-equiv=Content-Type content="text/html;charset=ISO-8859-1">
-</HEAD>
-<BODY>
-<P>
-<H3>Apache Tomcat @VERSION@</H3>
-<P></P>
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="UTF-8" />
+<title>Apache Tomcat @VERSION@</title>
+<style type="text/css">
+body { font-family: Arial, Helvetica, sans-serif; font-size: 11pt; }
+dd { margin-top: 0.2em; margin-bottom: 0.5em; }
+</style>
+</head>
+<body>
+
+<h1 style="font-size: 1.3em;">Apache Tomcat @VERSION@</h1>
 <p>Useful references:</p>
 <ul>
 <li><a href="../RELEASE-NOTES">Release notes</a>, with important information
@@ -31,14 +36,14 @@ about known issues</li>
 
 <p><b>NOTE: The tar files in this distribution use GNU tar extensions,
 and must be untarred with a GNU compatible version of tar. The version
-of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
-these files.</b></P>
+of <code>tar</code> on Solaris and Mac OS X will not work with
+these files.</b></p>
 
-<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later. Read the
+<p style="color: red;">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 7 or later. Read the
 RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-</font></p>
+</p>
 
-<h4>Packaging Details (or "What Should I Download?")</h4>
+<h2 style="font-size: 1.1em;">Packaging Details (or "What Should I Download?")</h2>
 <dl>
 <dt><b>bin/</b></dt>
 <dd><dl>
@@ -46,7 +51,7 @@ RELEASE-NOTES and the RUNNING.txt file i
     <dd>Base distribution. These distributions do not include the Windows
     service wrapper nor the compiled APR/native library for Windows.</dd>
   <dt>apache-tomcat-[version].exe</dt>
-    <dd>32-bit/64-bit Windows installer for Tomcat. &nbsp; Please note that while this
+    <dd>32-bit/64-bit Windows installer for Tomcat. &#xa0; 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
@@ -93,9 +98,8 @@ RELEASE-NOTES and the RUNNING.txt file i
 </dl></dd>
 </dl>
 
-<P>Thank you for using <A href="http://tomcat.apache.org/">Tomcat</A>!.
-</P>
-<P><B>The Apache Tomcat Project</B> <BR><A
-href="http://tomcat.apache.org/">http://tomcat.apache.org/</A> </P>
-<P>
-<P></P></BODY></HTML>
+<p>Thank you for using <a href="http://tomcat.apache.org/">Tomcat</a>!.
+</p>
+<p><b>The Apache Tomcat Project</b> <br /><a
+href="http://tomcat.apache.org/">http://tomcat.apache.org/</a></p>
+</body></html>

Modified: tomcat/trunk/res/welcome.main.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/welcome.main.html?rev=1524837&r1=1524836&r2=1524837&view=diff
==============================================================================
--- tomcat/trunk/res/welcome.main.html (original)
+++ tomcat/trunk/res/welcome.main.html Thu Sep 19 20:50:25 2013
@@ -14,14 +14,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>Apache Tomcat @VERSION@</TITLE>
-<META http-equiv=Content-Type content="text/html;charset=ISO-8859-1">
-</HEAD>
-<BODY>
-<P>
-<H3>Apache Tomcat @VERSION@</H3>
-<P></P>
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="UTF-8" />
+<title>Apache Tomcat @VERSION@</title>
+<style type="text/css">
+body { font-family: Arial, Helvetica, sans-serif; font-size: 11pt; }
+dd { margin-top: 0.2em; margin-bottom: 0.5em; }
+</style>
+</head>
+<body>
+
+<h1 style="font-size: 1.3em;">Apache Tomcat @VERSION@</h1>
 <p>Useful references:</p>
 <ul>
 <li><a href="RELEASE-NOTES">Release notes</a>, with important information
@@ -31,14 +36,14 @@ about known issues</li>
 
 <p><b>NOTE: The tar files in this distribution use GNU tar extensions,
 and must be untarred with a GNU compatible version of tar. The version
-of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
-these files.</b></P>
+of <code>tar</code> on Solaris and Mac OS X will not work with
+these files.</b></p>
 
-<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later. Read the
+<p style="color: red;">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 7 or later. Read the
 RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
-</font></p>
+</p>
 
-<h4>Packaging Details (or "What Should I Download?")</h4>
+<h2 style="font-size: 1.1em;">Packaging Details (or "What Should I Download?")</h2>
 <dl>
 <dt><b>bin/</b></dt>
 <dd><dl>
@@ -46,7 +51,7 @@ RELEASE-NOTES and the RUNNING.txt file i
     <dd>Base distribution. These distributions do not include the Windows
     service wrapper nor the compiled APR/native library for Windows.</dd>
   <dt>apache-tomcat-[version].exe</dt>
-    <dd>32-bit/64-bit Windows installer for Tomcat. &nbsp; Please note that while this
+    <dd>32-bit/64-bit Windows installer for Tomcat. &#xa0; 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
@@ -93,9 +98,8 @@ RELEASE-NOTES and the RUNNING.txt file i
 </dl></dd>
 </dl>
 
-<P>Thank you for using <A href="http://tomcat.apache.org/">Tomcat</A>!.
-</P>
-<P><B>The Apache Tomcat Project</B> <BR><A
-href="http://tomcat.apache.org/">http://tomcat.apache.org/</A> </P>
-<P>
-<P></P></BODY></HTML>
+<p>Thank you for using <a href="http://tomcat.apache.org/">Tomcat</a>!.
+</p>
+<p><b>The Apache Tomcat Project</b> <br /><a
+href="http://tomcat.apache.org/">http://tomcat.apache.org/</a></p>
+</body></html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org