Index: build.xml
===================================================================
--- build.xml	(revision 1514529)
+++ build.xml	(working copy)
@@ -210,6 +210,7 @@
   <tstamp>
     <format property="year" pattern="yyyy" locale="en"/>
     <format property="today" pattern="MMM d yyyy" locale="en"/>
+	<format property="today-iso-8601" pattern="yyyy-MM-dd" locale="en"/>
     <format property="tstamp" pattern="hh:mm:ss"/>
   </tstamp>
   <filterset id="version.filters">
@@ -845,6 +846,7 @@
       <param name="relative-path" expression="."/>
       <param name="version" expression="${version}"/>
       <param name="build-date" expression="${today}"/>
+	  <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
       <param name="year" expression="${year}"/>
     </xslt>
     <xslt basedir="webapps/docs/appdev"
@@ -859,6 +861,7 @@
       <param name="relative-path" expression=".."/>
       <param name="version" expression="${version}"/>
       <param name="build-date" expression="${today}"/>
+	  <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
       <param name="year" expression="${year}"/>
     </xslt>
     <xslt basedir="webapps/docs/funcspecs"
@@ -873,6 +876,7 @@
       <param name="relative-path" expression=".."/>
       <param name="version" expression="${version}"/>
       <param name="build-date" expression="${today}"/>
+	  <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
       <param name="year" expression="${year}"/>
     </xslt>
     <xslt basedir="webapps/docs/config"
@@ -887,6 +891,7 @@
       <param name="relative-path" expression=".."/>
       <param name="version" expression="${version}"/>
       <param name="build-date" expression="${today}"/>
+	  <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
       <param name="year" expression="${year}"/>
     </xslt>
     <xslt basedir="webapps/docs/architecture"
@@ -901,6 +906,7 @@
       <param name="relative-path" expression=".."/>
       <param name="version" expression="${version}"/>
       <param name="build-date" expression="${today}"/>
+	  <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
       <param name="year" expression="${year}"/>
     </xslt>
 
@@ -916,6 +922,7 @@
       <param name="relative-path" expression=".."/>
       <param name="version" expression="${version}"/>
       <param name="build-date" expression="${today}"/>
+	  <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
       <param name="year" expression="${year}"/>
     </xslt>
   </target>
Index: webapps/docs/images/docs-stylesheet.css
===================================================================
--- webapps/docs/images/docs-stylesheet.css	(revision 0)
+++ webapps/docs/images/docs-stylesheet.css	(working copy)
@@ -0,0 +1,243 @@
+@charset "utf-8";
+/* General style */
+
+body, input {
+	margin: 0;
+	font-family: 'Lucida Sans Unicode', Arial, Helvetica, sans-serif;
+	font-size: 10.5pt;
+}
+
+img {
+	border: 0;
+}
+
+table {
+	border-collapse: collapse;
+}
+
+main {
+	/* Remove this once all IEs support <main> element */
+	display: block;
+}
+
+
+/* Layout */
+
+#wrapper {
+	min-width: 400px;
+}
+
+#header {
+	box-shadow: 0 0 7px #aaa;
+	border-bottom: 1px solid #bbb;
+}
+
+#header > div {
+	padding-left: 15px;
+	padding-right: 15px;
+	/* background-color: #f0f0ea; */
+	
+	background: linear-gradient(to bottom, #ffffff -10%, #F8F3E4 100%);
+	position: relative;
+}
+
+#header .logo {
+	min-height: 102px;
+	background-image: 
+	url('data:image/png;base64,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');
+	background-position: 0px 10px;
+	background-repeat: no-repeat;
+	padding-left: 190px;
+}
+
+#header .asfLogo {
+	float: right;
+	position: relative;
+	top: 8px;
+}
+
+#header h1 {
+	margin-top: 0.6em;
+	margin-bottom: 0;
+}
+
+#header .versionInfo {
+	font-size: 13pt;
+}
+
+#middle {
+
+	display: table;
+	table-layout: fixed;
+	margin: 0;
+	
+	width: 100%;
+	
+	
+}
+#middle > div { display: table-row; }
+#middle > div > div { display: table-cell; vertical-align: top; }
+
+
+
+#mainLeft {
+	width: 190px;
+}
+
+#mainLeft > div {
+	margin-top: -1px; /* for border */
+	padding-left: 16px;
+	padding-right: 14px;
+	padding-top: 6px;
+	padding-bottom: 15px;
+	/* background-color: #FFF6DD; */
+	background-color: #F8F3E4;
+	border-right: 1px solid #bbb;
+	border-bottom: 1px solid #bbb;
+	font-size: 10pt;
+	border-bottom-right-radius: 10% 5%;
+	box-shadow: 0 0 5px #aaa;
+}
+
+#mainLeft h2 {
+	margin-bottom: 0.2em;
+	font-size: 1.2em;
+}
+
+#mainLeft ul {
+	padding: 0;
+	margin: 0;
+	list-style-type: none;
+}
+
+#mainLeft ul a {
+	text-indent: -0.6em;
+	padding-left: 1.4em;
+	display: block;
+	text-decoration: none;
+	color: #444;
+}
+#mainLeft ul a:hover {
+	color: #000;
+	background-color: #D1c9b9;
+}
+
+#mainRight {
+	padding-left: 14px;
+	padding-right: 20px;
+	
+}
+
+#footer {
+	margin-top: 30px;
+	padding-top: 20px;
+	padding-bottom: 20px;
+	padding-left: 20px;
+	padding-right: 20px;
+	border-top: 1px solid #ccc;
+	color: #444;
+	text-align: center;
+	/* font-style: italic; */
+	font-size: 9pt;
+}
+
+
+/* Content */
+
+#content div.text {
+	padding-left: 1em;
+	padding-left: 1em;
+}
+
+#content h3, #content h4, #content h5, #content h6 {
+	padding-left: 5px;
+	padding-right: 5px;
+	background-color: #eaeaea;
+	border: 1px solid #ccc;
+	border-radius: 2px;
+}
+
+#content h4, #content h5, #content h6 {
+	background-color: #f6f6f6;
+}
+
+code, pre {
+	font-family: Consolas, monospace;
+}
+
+code {
+	background-color: rgb(224,255,255);
+	padding: 0 0.1em;
+}
+
+div.codeBox pre code, code.attributeName, code.propertyName {
+	background-color: transparent;
+}
+div.codeBox {
+	overflow: auto;
+}
+div.codeBox pre {
+	margin: 0;
+	padding: 4px;
+	border: 1px solid #999;
+	border-radius: 5px;
+	background-color: #eff8ff;
+	display: table; /* To prevent <pre>s from taking the complete available width. */
+	/*
+	When it is officially supported, use the following CSS instead of display: table
+	to prevent big <pre>s from exceeding the browser window:
+	max-width: available;
+	width: min-content;
+	*/
+}
+
+div.codeBox pre.wrap {
+	white-space: pre-wrap;
+}
+
+
+table.defaultTable th {
+	background-color: #88b;
+	color: #fff;
+}
+
+table.detail-table th {
+	background-color: #039acc;
+	color: #fff;
+}
+table.detail-table td {
+	/* background-color: #a0ddf0; */
+	background-color: #D6EEF8;
+}
+
+table.defaultTable th, table.defaultTable td, table.detail-table th, table.detail-table td {
+	border: 1px solid #777;
+	padding: 5px;
+	text-align: left;
+}
+
+
+p.notice {
+	border: 1px solid rgb(255, 0, 0);
+	background-color: rgb(238, 238, 238);
+	color: rgb(0, 51, 102);
+	padding: 0.5em;
+	margin: 1em 2em 1em 1em;
+}
+
+
+/* Changelog-Styles */
+
+ul.changelog {
+	padding-left: 1em;
+	list-style-type: none;
+}
+
+ul.changelog  li{
+	padding-top: 5px;
+	padding-bottom: 5px;
+}
+
+ul.changelog img {
+	vertical-align: middle
+}
\ No newline at end of file
Index: webapps/docs/tomcat-docs.xsl
===================================================================
--- webapps/docs/tomcat-docs.xsl	(revision 1514529)
+++ webapps/docs/tomcat-docs.xsl	(working copy)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -20,47 +20,39 @@
 <!-- $Id$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="1.0">
+  version="3.0">
 
 
   <!-- Output method -->
   <xsl:output method="html"
-            encoding="iso-8859-1"
-              indent="no"/>
+              encoding="UTF-8"
+              indent="no"
+              doctype-system="about:legacy-compat"/>
 
 
   <!-- Defined parameters (overrideable) -->
-  <xsl:param    name="home-name"        select="'The Tomcat Project'"/>
-  <xsl:param    name="home-href"        select="'http://tomcat.apache.org/'"/>
-  <xsl:param    name="home-logo"        select="'/images/tomcat.gif'"/>
-  <xsl:param    name="printer-logo"     select="'/images/printer.gif'"/>
-  <xsl:param    name="apache-logo"      select="'/images/asf-logo.gif'"/>
-  <xsl:param    name="subdir"           select="''"/>
-  <xsl:param    name="relative-path"    select="'.'"/>
-  <xsl:param    name="version"          select="'8.0.x'"/>
-  <xsl:param    name="majorversion"     select="'8.0'"/>
-  <xsl:param    name="build-date"       select="'MMM d yyyy'"/>
-  <xsl:param    name="year"             select="'yyyy'"/>
-  <xsl:param    name="void-image"       select="'/images/void.gif'"/>
-  <xsl:param    name="project-menu"     select="'menu'"/>
-  <xsl:param    name="standalone"       select="''"/>
-  <xsl:param    name="buglink"          select="'http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
-  <xsl:param    name="revlink"          select="'http://svn.apache.org/viewvc?view=rev&amp;rev='"/>
-  <xsl:param    name="sitedir"          select="''"/>
-  <xsl:param    name="filename"         select="'-'"/>
+  <xsl:param    name="home-name"           select="'The Tomcat Project'"/>
+  <xsl:param    name="home-href"           select="'http://tomcat.apache.org/'"/>
+  <xsl:param    name="home-logo"           select="'/images/tomcat-new.png'"/>
+  <xsl:param    name="home-stylesheet"     select="'/images/docs-stylesheet.css'"/>
+  <xsl:param    name="printer-logo"        select="'/images/printer.gif'"/>
+  <xsl:param    name="apache-logo"         select="'/images/asf-logo.gif'"/>
+  <xsl:param    name="subdir"              select="''"/>
+  <xsl:param    name="relative-path"       select="'.'"/>
+  <xsl:param    name="version"             select="'8.0.x'"/>
+  <xsl:param    name="majorversion"        select="'8.0'"/>
+  <xsl:param    name="build-date"          select="'MMM d yyyy'"/>
+  <xsl:param    name="build-date-iso-8601" select="'yyyy-dd-MM'"/>
+  <xsl:param    name="year"                select="'yyyy'"/>
+  <xsl:param    name="void-image"          select="'/images/void.gif'"/>
+  <xsl:param    name="project-menu"        select="'menu'"/>
+  <xsl:param    name="standalone"          select="''"/>
+  <xsl:param    name="buglink"             select="'http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
+  <xsl:param    name="revlink"             select="'http://svn.apache.org/viewvc?view=rev&amp;rev='"/>
+  <xsl:param    name="sitedir"             select="''"/>
+  <xsl:param    name="filename"            select="'-'"/>
 
   <!-- Defined variables (non-overrideable) -->
-  <xsl:variable name="body-bg"          select="'#ffffff'"/>
-  <xsl:variable name="body-fg"          select="'#000000'"/>
-  <xsl:variable name="body-link"        select="'#525D76'"/>
-  <xsl:variable name="banner-bg"        select="'#525D76'"/>
-  <xsl:variable name="banner-fg"        select="'#ffffff'"/>
-  <xsl:variable name="sub-banner-bg"    select="'#828DA6'"/>
-  <xsl:variable name="sub-banner-fg"    select="'#ffffff'"/>
-  <xsl:variable name="source-color"     select="'#023264'"/>
-  <xsl:variable name="attributes-color" select="'#023264'"/>
-  <xsl:variable name="table-th-bg"      select="'#039acc'"/>
-  <xsl:variable name="table-td-bg"      select="'#a0ddf0'"/>
   <xsl:variable name="commentslink">/<xsl:value-of select="$sitedir"/>comments.html</xsl:variable>
 
   <!-- Process an entire document into an HTML page -->
@@ -67,190 +59,160 @@
   <xsl:template match="document">
   <xsl:variable name="project"
               select="document('project.xml')/project"/>
-    <html>
-    <head>
-    <title><xsl:value-of select="project/title"/> (<xsl:value-of select="$version"/>) - <xsl:value-of select="properties/title"/></title>
-    <xsl:for-each select="properties/author">
-      <xsl:variable name="name">
-        <xsl:value-of select="."/>
-      </xsl:variable>
-      <!--
+<html lang="en">
+<head>
+  <!-- Note: XLST seems to always output a 
+       <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+       when method="html",
+       therefore we can't use
+       <meta charset="UTF-8" />.
+
+       In XHTML, this is not needed as the encoding will be
+	   specified in the XML declaration.
+  -->
+  
+  <xsl:variable name="css-src">
+    <xsl:value-of select="$relative-path"/><xsl:value-of select="$home-stylesheet"/>
+  </xsl:variable>
+  <link href="{$css-src}" rel="stylesheet" type="text/css"/>
+  <style type="text/css" media="print"><![CDATA[
+    .noPrint {display: none;}
+    #middle > div > div#mainLeft { display: none; }
+  ]]></style>
+
+  <title><xsl:value-of select="project/title"/> (<xsl:value-of select="$version"/>) - <xsl:value-of select="properties/title"/></title>
+  <xsl:for-each select="properties/author">
+    <xsl:variable name="name">
+      <xsl:value-of select="."/>
+    </xsl:variable>
+    <!--
       <xsl:variable name="email">
         <xsl:value-of select="@email"/>
       </xsl:variable>
-       -->
-      <meta name="author" content="{$name}"/>
-      <!-- Don't publish e-mail addresses
-      <meta name="email" content="{$email}"/>
-       -->
-    </xsl:for-each>
-        <style type="text/css" media="print">
-            .noPrint {display: none;}
-            td#mainBody {width: 100%;}
-        </style>
-        <style type="text/css">
-            code {background-color:rgb(224,255,255);padding:0 0.1em;}
-            code.attributeName, code.propertyName {background-color:transparent;}
-        </style>
-        <style type="text/css">
-            .wrapped-source code { display: block; background-color: transparent; }
-            .wrapped-source div { margin: 0 0 0 1.25em; }
-            .wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
-        </style>
-        <style type="text/css">
-            p.notice {
-                border: 1px solid rgb(255, 0, 0);
-                background-color: rgb(238, 238, 238);
-                color: rgb(0, 51, 102);
-                padding: 0.5em;
-                margin: 1em 2em 1em 1em;
-            }
-        </style>
-    </head>
+    -->
+    <meta name="author" content="{$name}"/>
+    <!-- Don't publish e-mail addresses
+    <meta name="email" content="{$email}"/>
+    -->
+  </xsl:for-each>
 
-    <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
-          alink="{$body-link}" vlink="{$body-link}">
+  </head>
 
-    <table border="0" width="100%" cellspacing="0">
-
-      <xsl:comment>PAGE HEADER</xsl:comment>
-      <tr>
-        <td>
+  <body>
+  <div id="wrapper">
+  <!-- Header -->
+  <header id="header">
+    <div>
+      <div class="logo">
         <xsl:if test="project/logo">
-          <xsl:variable name="alt">
-            <xsl:value-of select="project/logo"/>
-          </xsl:variable>
-          <xsl:variable name="home">
-            <xsl:value-of select="project/@href"/>
-          </xsl:variable>
-          <xsl:variable name="src">
-            <xsl:value-of select="$relative-path"/><xsl:value-of select="project/logo/@href"/>
-          </xsl:variable>
-
-          <xsl:comment>PROJECT LOGO</xsl:comment>
-          <a href="{$home}">
-            <img src="{$src}" align="right" alt="{$alt}" border="0"/>
-          </a>
+          <!-- TODO! -->
         </xsl:if>
-        </td>
-        <td>
-          <h1><font face="arial,helvetica,sanserif"><xsl:value-of select="$project/title"/></font></h1>
-          <font face="arial,helvetica,sanserif">Version <xsl:value-of select="$version"/>, <xsl:value-of select="$build-date"/></font>
-        </td>
-        <td>
-          <xsl:comment>APACHE LOGO</xsl:comment>
-          <xsl:variable name="src">
-            <xsl:value-of select="$relative-path"/><xsl:value-of select="$apache-logo"/>
-          </xsl:variable>
-          <a href="http://www.apache.org/">
-            <img src="{$src}" align="right" alt="Apache Logo" border="0"/>
-          </a>
-        </td>
-      </tr>
-    </table>
+        <div style="height: 1px;" />
+          <div class="asfLogo"><a href="http://www.apache.org/" target="_blank"><img src="http://www.apache.org/images/feather.png" alt="The Apache Software Foundation" style="width: 266px; height: 83px;" /></a></div>
+          <h1><xsl:value-of select="$project/title"/></h1>
+          <div class="versionInfo">
+            Version <xsl:value-of select="$version"/>,
+            <xsl:variable name="datetime">
+              <xsl:value-of select="$build-date-iso-8601"/>
+            </xsl:variable>
+            <time datetime="{$datetime}"><xsl:value-of select="$build-date"/></time>
+          </div>
+        <div style="height: 1px;" />
+      </div>
+    </div>
+  </header>
 
-    <table border="0" width="100%" cellspacing="4">
+  <div id="middle">
+    <div>
+      <div id="mainLeft" class="noprint">
+        <div>
+		  <!-- Navigation -->
+          <nav>
+            <xsl:apply-templates select="project/body/menu"/>
+          </nav>
+        </div>
+      </div>
+      <div id="mainRight">
+        <div id="content">
+		  <!-- Main Part -->
+          <main>
+            <h2><xsl:value-of select="properties/title"/></h2>
+            <xsl:apply-templates select="body/section"/>
 
-      <xsl:comment>HEADER SEPARATOR</xsl:comment>
-      <tr>
-        <td colspan="2">
-          <hr noshade="noshade" size="1"/>
-        </td>
-      </tr>
+            <!-- Comments Section -->
+            <xsl:if test="not(properties/no-comments)">
+              <div class="noprint">
+                <h3>
+                  <a id="comments_section">Comments</a>
+                </h3>
 
-      <tr>
+                <div class="text">
+                  <p class="notice">
+                    <strong>Notice: </strong>This comments section collects your suggestions
+                    on improving documentation for Apache Tomcat.<br/><br/>
+                    If you have trouble and need help, read
+                    <a href="http://tomcat.apache.org/findhelp.html">Find Help</a> page
+                    and ask your question on the tomcat-users
+                    <a href="http://tomcat.apache.org/lists.html">mailing list</a>.
+                    Do not ask such questions here. This is not a Q&amp;A section.<br/><br/>
+                    The Apache Comments System is explained <a href="{$commentslink}">here</a>.
+                    Comments may be removed by our moderators if they are either
+                    implemented or considered invalid/off-topic.
+                  </p>
+                  <div id="comments_thread" />
+                  <script type="application/javascript"><![CDATA[
+                  (function() {
+                    var commentsDiv = document.getElementById("comments_thread");
+                    var comments_shortname = 'tomcat';
+                    var comments_identifier = 'http://tomcat.apache.org/]]><xsl:value-of select="$sitedir"/><xsl:value-of select="$subdir"/><xsl:value-of select="substring($filename,1,string-length($filename)-4)"/><![CDATA[.html';
+                    (function(w, d) {
+                      if (w.location.hostname.toLowerCase() == "tomcat.apache.org") {
+                        var s = d.createElement('script');
+                        s.type = 'text/javascript';
+                        s.async = true;
+                        s.src = 'https://comments.apache.org/show_comments.lua?site=' + encodeURIComponent(comments_shortname) + '&page=' + encodeURIComponent(comments_identifier);
+                        (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
+                      }
+                      else {
+                        commentsDiv.appendChild(d.createTextNode("Comments are disabled for this page at the moment."));
+                      }
+                    })(window, document);
+                  })();
+                  ]]></script>
+                </div>
+              </div>
+            </xsl:if>
 
-        <xsl:comment>LEFT SIDE NAVIGATION</xsl:comment>
-        <td width="20%" valign="top" nowrap="nowrap" class="noPrint">
-          <xsl:apply-templates select="project/body/menu"/>
-        </td>
+          </main>
+        </div>
+      </div>
+    </div>
+  </div>
+  
+  <!-- Footer -->
+  <footer id="footer">
+    Copyright © 1999-<xsl:value-of select="$year"/>, The Apache Software Foundation
+    <br />
+    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+    project logo are trademarks of the Apache Software Foundation.
+  </footer>
+</div>
+</body>
+</html>
 
-        <xsl:comment>RIGHT SIDE MAIN BODY</xsl:comment>
-        <td width="80%" valign="top" align="left" id="mainBody">
-          <h1><xsl:value-of select="properties/title"/></h1>
-          <xsl:apply-templates select="body/section"/>
-        </td>
 
-      </tr>
 
-      <xsl:if test="not(properties/no-comments)">
-      <tr class="noPrint">
-
-        <td width="20%" valign="top" nowrap="nowrap" class="noPrint">
-        </td>
-        <td width="80%" valign="top" align="left">
-          <table border="0" cellspacing="0" cellpadding="2">
-            <!-- Comment heading -->
-            <tr><td bgcolor="{$banner-bg}">
-                <font color="{$banner-fg}" face="arial,helvetica.sanserif">
-                <a name="comments_section" id="comments_section"><strong>Comments</strong></a></font>
-              </td>
-            </tr>
-            <!-- Comment body -->
-            <tr><td>
-            <blockquote>
-            <p class="notice">
-              <strong>Notice: </strong>This comments section collects your suggestions
-              on improving documentation for Apache Tomcat.<br/><br/>
-              If you have trouble and need help, read
-              <a href="http://tomcat.apache.org/findhelp.html">Find Help</a> page
-              and ask your question on the tomcat-users
-              <a href="http://tomcat.apache.org/lists.html">mailing list</a>.
-              Do not ask such questions here. This is not a Q&amp;A section.<br/><br/>
-              The Apache Comments System is explained <a href="{$commentslink}">here</a>.
-              Comments may be removed by our moderators if they are either
-              implemented or considered invalid/off-topic.</p>
-              <script type="text/javascript">
-              <xsl:text disable-output-escaping="yes"><![CDATA[<!--//--><![CDATA[//><!--
-              var comments_shortname = 'tomcat';
-              var comments_identifier = 'http://tomcat.apache.org/]]></xsl:text><xsl:value-of select="$sitedir"/><xsl:value-of select="$subdir"/><xsl:value-of select="substring($filename,1,string-length($filename)-4)"/><xsl:text disable-output-escaping="yes"><![CDATA[.html';
-              (function(w, d) {
-                  if (w.location.hostname.toLowerCase() == "tomcat.apache.org") {
-                      d.write('<div id="comments_thread"><\/div>');
-                      var s = d.createElement('script');
-                      s.type = 'text/javascript';
-                      s.async = true;
-                      s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
-                      (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
-                  }
-                  else {
-                      d.write('<div id="comments_thread"><strong>Comments are disabled for this page at the moment.<\/strong><\/div>');
-                  }
-              })(window, document);
-              //--><!]]]]>></xsl:text></script>
-            </blockquote></td></tr>
-          </table>
-        </td>
-      </tr>
-      </xsl:if>
-
-      <xsl:comment>FOOTER SEPARATOR</xsl:comment>
-      <tr>
-        <td colspan="2">
-          <hr noshade="noshade" size="1"/>
-        </td>
-      </tr>
-
-      <xsl:comment>PAGE FOOTER</xsl:comment>
-      <tr><td colspan="2">
-        <div align="center"><font color="{$body-link}" size="-1"><em>
-        Copyright &#169; 1999-<xsl:value-of select="$year"/>, Apache Software Foundation
-        </em></font></div>
-      </td></tr>
-
-    </table>
-    </body>
-    </html>
-
   </xsl:template>
 
 
   <!-- Process a menu for the navigation bar -->
   <xsl:template match="menu">
-    <p><strong><xsl:value-of select="@name"/></strong></p>
+  <div>
+    <h2><strong><xsl:value-of select="@name"/></strong></h2>
     <ul>
       <xsl:apply-templates select="item"/>
     </ul>
+  </div>
   </xsl:template>
 
 
@@ -278,31 +240,23 @@
     <xsl:variable name="name2">
       <xsl:value-of select="translate($name, ' #', '__')"/>
     </xsl:variable>
-    <table border="0" cellspacing="0" cellpadding="2">
-      <!-- Section heading -->
-      <tr><td bgcolor="{$banner-bg}">
-          <font color="{$banner-fg}" face="arial,helvetica.sanserif">
-          <xsl:if test="$name != $name2"><a name="{$name}"><xsl:comment>()</xsl:comment></a></xsl:if>
-          <a name="{$name2}">
-          <strong><xsl:value-of select="@name"/></strong></a></font>
-        </td>
-      <xsl:if test="@rtext">
-        <!-- Additional right-aligned text cell in section heading. It is used by changelog.xml -->
-        <td align="right" bgcolor="{$banner-bg}">
-          <font color="{$banner-fg}" face="arial,helvetica.sanserif">
-          <strong><xsl:value-of select="@rtext"/></strong></font>
-        </td>
-      </xsl:if>
-      </tr>
-      <!-- Section body -->
-      <tr><td>
-      <xsl:if test="@rtext">
-          <xsl:attribute name="colspan">2</xsl:attribute>
-      </xsl:if>
-      <blockquote>
-        <xsl:apply-templates/>
-      </blockquote></td></tr>
-    </table>
+  
+  
+  <!-- Section heading -->
+  <h3>
+    <xsl:if test="@rtext">
+      <!-- Additional right-aligned text cell in section heading. It is used by changelog.xml -->
+      <span style="float: right;">
+        <xsl:value-of select="@rtext"/>
+      </span>&#x20; <!-- Ensure a space follows -->
+    </xsl:if>
+    <a id="{$name2}"><xsl:value-of select="@name"/></a>
+  </h3>
+  <!-- Section body -->
+  <div class="text">
+    <xsl:apply-templates/>
+  </div>
+  
   </xsl:template>
 
 
@@ -326,19 +280,18 @@
     <xsl:variable name="name2">
       <xsl:value-of select="translate($name, ' #', '__')"/>
     </xsl:variable>
-    <table border="0" cellspacing="0" cellpadding="2">
-      <!-- Subsection heading -->
-      <tr><td bgcolor="{$sub-banner-bg}">
-          <font color="{$sub-banner-fg}" face="arial,helvetica.sanserif">
-          <xsl:if test="$name != $name2"><a name="{$name}"><xsl:comment>()</xsl:comment></a></xsl:if>
-          <a name="{$name2}">
-          <strong><xsl:value-of select="@name"/></strong></a></font>
-      </td></tr>
-      <!-- Subsection body -->
-      <tr><td><blockquote>
-        <xsl:apply-templates/>
-      </blockquote></td></tr>
-    </table>
+  
+  <div class="subsection">
+    <!-- Subsection heading -->
+    <h4>
+      <a id="{$name2}"><xsl:value-of select="@name"/></a>
+    </h4>
+    <!-- Subsection body -->
+    <div class="text">
+      <xsl:apply-templates/>
+    </div>
+  </div>
+  
   </xsl:template>
 
 
@@ -376,59 +329,15 @@
 
   <!-- Process a source code example -->
   <xsl:template match="source">
-    <xsl:variable name="void">
-      <xsl:value-of select="$relative-path"/><xsl:value-of select="$void-image"/>
-    </xsl:variable>
-    <div align="left">
-      <table cellspacing="4" cellpadding="0" border="0">
-        <tr>
-          <td bgcolor="{$source-color}" width="1" height="1">
-            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="{$source-color}" height="1">
-            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="{$source-color}" width="1" height="1">
-            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-        </tr>
-        <tr>
-          <td bgcolor="{$source-color}" width="1">
-            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
+    <xsl:variable name="pre-class">
     <xsl:choose>
-      <xsl:when test="@wrapped='true'">
-          <td bgcolor="#ffffff" height="1">
-            <div class="wrapped-source">
-            <code>
-              <xsl:apply-templates />
-            </code>
-            </div>
-          </td>
-      </xsl:when>
-      <xsl:otherwise>
-          <td bgcolor="#ffffff" height="1"><pre>
-            <xsl:value-of select="."/>
-          </pre></td>
-      </xsl:otherwise>
+      <xsl:when test="@wrapped='true'">wrap</xsl:when>
+      <xsl:otherwise></xsl:otherwise>
     </xsl:choose>
-          <td bgcolor="{$source-color}" width="1">
-            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-        </tr>
-        <tr>
-          <td bgcolor="{$source-color}" width="1" height="1">
-            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="{$source-color}" height="1">
-            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="{$source-color}" width="1" height="1">
-            <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-        </tr>
-      </table>
-    </div>
+  </xsl:variable>
+  <div class="codeBox">
+    <pre class="{$pre-class}"><code><xsl:apply-templates /></code></pre>
+  </div>
   </xsl:template>
 
 
@@ -446,18 +355,18 @@
 
   <!-- Process an attributes list with nested attribute elements -->
   <xsl:template match="attributes">
-    <table border="1" cellpadding="5">
+    <table class="defaultTable">
       <tr>
-        <th width="15%" bgcolor="{$attributes-color}">
-          <font color="#ffffff">Attribute</font>
+        <th style="width: 15%;">
+          Attribute
         </th>
-        <th width="85%" bgcolor="{$attributes-color}">
-          <font color="#ffffff">Description</font>
+        <th style="width: 85%;">
+          Description
         </th>
       </tr>
       <xsl:for-each select="attribute">
         <tr>
-          <td align="left" valign="center">
+          <td>
             <xsl:if test="@required = 'true'">
               <strong><code class="attributeName"><xsl:value-of select="@name"/></code></strong>
             </xsl:if>
@@ -465,7 +374,7 @@
               <code class="attributeName"><xsl:value-of select="@name"/></code>
             </xsl:if>
           </td>
-          <td align="left" valign="center">
+          <td>
             <xsl:apply-templates/>
           </td>
         </tr>
@@ -475,21 +384,21 @@
 
   <!-- Process a properties list with nested property elements -->
   <xsl:template match="properties">
-    <table border="1" cellpadding="5">
+    <table class="defaultTable">
       <tr>
-        <th width="15%" bgcolor="{$attributes-color}">
-          <font color="#ffffff">Property</font>
+        <th style="width: 15%;">
+          Property
         </th>
-        <th width="85%" bgcolor="{$attributes-color}">
-          <font color="#ffffff">Description</font>
+        <th style="width: 85%;">
+          Description
         </th>
       </tr>
       <xsl:for-each select="property">
         <tr>
-          <td align="left" valign="center">
+          <td>
             <code class="propertyName"><xsl:value-of select="@name"/></code>
           </td>
-          <td align="left" valign="center">
+          <td>
             <xsl:apply-templates/>
           </td>
         </tr>
@@ -518,7 +427,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:variable name="name" select="@name"/>
-        <a name="{$name}"><xsl:apply-templates/></a>
+        <a id="{$name}"><xsl:apply-templates/></a>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -525,81 +434,75 @@
 
   <!-- Changelog related tags -->
   <xsl:template match="changelog">
-    <table border="0" cellpadding="2" cellspacing="2">
+    <ul class="changelog">
       <xsl:apply-templates/>
-    </table>
+    </ul>
   </xsl:template>
 
   <xsl:template match="changelog/add">
-    <tr>
-      <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/add.gif</xsl:variable>
-      <td><img alt="add" class="icon" src="{$src}"/></td>
-      <td><xsl:apply-templates/></td>
-    </tr>
+    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/add.gif</xsl:variable>
+    <li>
+    <img alt="Add:" class="icon" src="{$src}"/> <xsl:apply-templates/>
+  </li>
   </xsl:template>
 
   <xsl:template match="changelog/update">
-    <tr>
-      <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/update.gif</xsl:variable>
-      <td><img alt="update" class="icon" src="{$src}"/></td>
-      <td><xsl:apply-templates/></td>
-    </tr>
+    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/update.gif</xsl:variable>
+    <li>
+    <img alt="Update:" class="icon" src="{$src}"/> <xsl:apply-templates/>
+  </li>
   </xsl:template>
 
   <xsl:template match="changelog/design">
-    <tr>
-      <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/design.gif</xsl:variable>
-      <td><img alt="design" class="icon" src="{$src}"/></td>
-      <td><xsl:apply-templates/></td>
-    </tr>
+    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/design.gif</xsl:variable>
+    <li>
+    <img alt="Design:" class="icon" src="{$src}"/> <xsl:apply-templates/>
+  </li>
   </xsl:template>
 
   <xsl:template match="changelog/docs">
-    <tr>
-      <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/docs.gif</xsl:variable>
-      <td><img alt="docs" class="icon" src="{$src}"/></td>
-      <td><xsl:apply-templates/></td>
-    </tr>
+    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/docs.gif</xsl:variable>
+    <li>
+    <img alt="Docs:" class="icon" src="{$src}"/> <xsl:apply-templates/>
+  </li>
   </xsl:template>
 
   <xsl:template match="changelog/fix">
-    <tr>
-      <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/fix.gif</xsl:variable>
-      <td><img alt="fix" class="icon" src="{$src}"/></td>
-      <td><xsl:apply-templates/></td>
-    </tr>
+    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/fix.gif</xsl:variable>
+    <li>
+    <img alt="Fix:" class="icon" src="{$src}"/> <xsl:apply-templates/>
+  </li>
   </xsl:template>
 
   <xsl:template match="changelog/scode">
-    <tr>
-      <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/code.gif</xsl:variable>
-      <td><img alt="code" class="icon" src="{$src}"/></td>
-      <td><xsl:apply-templates/></td>
-    </tr>
+    <xsl:variable name="src"><xsl:value-of select="$relative-path"/>/images/code.gif</xsl:variable>
+    <li>
+    <img alt="Code:" class="icon" src="{$src}"/> <xsl:apply-templates/>
+  </li>
   </xsl:template>
 
   <!-- Process an attributes list with nested attribute elements -->
   <xsl:template match="status">
-    <table border="1" cellpadding="5">
+    <table class="defaultTable">
       <tr>
-        <th width="15%" bgcolor="{$attributes-color}">
-          <font color="#ffffff">Priority</font>
+        <th style="width: 15%;">
+          Priority
         </th>
-        <th width="50%" bgcolor="{$attributes-color}">
-          <font color="#ffffff">Action Item</font>
+        <th style="width: 50%;">
+          Action Item
         </th>
-        <th width="25%" bgcolor="{$attributes-color}">
-          <font color="#ffffff">Volunteers</font>
+        <th style="width: 25%;">
+          Volunteers
         </th>
         <xsl:for-each select="item">
         <tr>
-          <td align="left" valign="center">
+          <td>
             <xsl:value-of select="@priority"/>
           </td>
-          <td align="left" valign="center">
+          <td>
             <xsl:apply-templates/>
           </td>
-          <td align="left" valign="center">
+          <td>
             <xsl:value-of select="@owner"/>
           </td>
         </tr>
@@ -622,24 +525,20 @@
 
   <!-- specially process td tags ala site.vsl -->
   <xsl:template match="table[@class='detail-table']/tr/td">
-    <td bgcolor="{$table-td-bg}" valign="top" align="left">
+    <td>
         <xsl:if test="@colspan"><xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute></xsl:if>
         <xsl:if test="@rowspan"><xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute></xsl:if>
-        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-            <xsl:apply-templates/>
-        </font>
+        <xsl:apply-templates/>
     </td>
   </xsl:template>
 
   <!-- handle th ala site.vsl -->
   <xsl:template match="table[@class='detail-table']/tr/th">
-    <td bgcolor="{$table-th-bg}" valign="top">
+    <th>
         <xsl:if test="@colspan"><xsl:attribute name="colspan"><xsl:value-of select="@colspan"/></xsl:attribute></xsl:if>
         <xsl:if test="@rowspan"><xsl:attribute name="rowspan"><xsl:value-of select="@rowspan"/></xsl:attribute></xsl:if>
-        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-            <xsl:apply-templates />
-        </font>
-    </td>
+        <xsl:apply-templates/>
+    </th>
   </xsl:template>
 
   <!-- Process everything else by just passing it through -->