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/18 10:01:28 UTC

svn commit: r1524323 [2/2] - in /tomcat/site/trunk: docs/ xdocs/

Modified: tomcat/site/trunk/xdocs/download-80.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-80.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-80.xml (original)
+++ tomcat/site/trunk/xdocs/download-80.xml Wed Sep 18 08:01:27 2013
@@ -41,7 +41,7 @@
        encounter a problem with this mirror, please select another
        mirror.  If all mirrors are failing, there are <i>backup</i>
        mirrors (at the end of the mirrors list) that should be
-       available.<br/>[if-any logo]<a href="[link]" rel="nofollow"><img align="right" src="[logo]" border="0"/></a>[end]</p><p><form action="[location]" method="get" id="SelectMirror">
+       available.<br/>[if-any logo]<a href="[link]" rel="nofollow"><img alt="Logo" src="[logo]"/></a>[end]</p><form action="[location]" method="get" id="SelectMirror"><p>
        Other mirrors: <select name="Preferred">
          [if-any http]
            [for http]<option value="[http]">[http]</option>[end]
@@ -52,7 +52,7 @@
          [if-any backup]
            [for backup]<option value="[backup]">[backup] (backup)</option>[end]
            [end]
-         </select><input type="submit" value="Change"/></form></p>
+         </select><input type="submit" value="Change"/></p></form>
       <!-- End mirror list -->
    
   </section>
@@ -61,7 +61,7 @@
       <!-- Begin 8.0.0-RC1 section -->
       <section name="8.0.0-RC1">
       <p>
-      <a name="8.0.0-RC1">Please</a> see the 
+      Please see the 
       <a href="[preferred]tomcat/tomcat-8/v8.0.0-RC1/README.html" rel="nofollow">README</a>
       file for packaging information.  It explains what every distribution contains.
       </p>

Modified: tomcat/site/trunk/xdocs/download-connectors.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-connectors.xml (original)
+++ tomcat/site/trunk/xdocs/download-connectors.xml Wed Sep 18 08:01:27 2013
@@ -5,7 +5,7 @@
     <section name="Tomcat Connectors (mod_jk) Downloads">
 
       <p>Use the links below to download Tomcat Connectors from one of
-      our mirrors.  You <strong>must</strong> <a href="#Verify%20the%20Integrity%20of%20the%20Files">verify the
+      our mirrors.  You <strong>must</strong> <a href="#Verify_the_Integrity_of_the_Files">verify the
       integrity</a> of the downloaded files using signatures downloaded from
       our main distribution directory.</p>
 
@@ -24,9 +24,9 @@
         mirrors (at the end of the mirrors list) that should be
         available.<br/>
         [if-any logo]
-          <a href="[link]" rel="nofollow"><img align="right" src="[logo]" border="0"/></a>
+          <a href="[link]" rel="nofollow"><img alt="Logo" src="[logo]"/></a>
         [end]
-        </p><p><form action="[location]" method="get" id="SelectMirror">
+        </p><form action="[location]" method="get" id="SelectMirror"><p>
         Other mirrors: <select name="Preferred">
         [if-any http]
           [for http]<option value="[http]">[http]</option>[end]
@@ -37,7 +37,7 @@
         [if-any backup]
           [for backup]<option value="[backup]">[backup] (backup)</option>[end]
         [end]
-        </select><input type="submit" value="Change"/></form></p>
+        </select><input type="submit" value="Change"/></p></form>
         <p>You may also consult the <a href="http://www.apache.org/mirrors/">complete
         list of mirrors</a>.</p>
       </subsection>

Modified: tomcat/site/trunk/xdocs/download-native.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-native.xml (original)
+++ tomcat/site/trunk/xdocs/download-native.xml Wed Sep 18 08:01:27 2013
@@ -5,7 +5,7 @@
     <section name="Tomcat Native Downloads">
 
       <p>Use the links below to download Tomcat Native from one of
-      our mirrors.  You <strong>must</strong> <a href="#Verify%20the%20Integrity%20of%20the%20Files">verify the
+      our mirrors.  You <strong>must</strong> <a href="#Verify_the_Integrity_of_the_Files">verify the
       integrity</a> of the downloaded files using signatures downloaded from
       our main distribution directory.</p>
 
@@ -23,9 +23,9 @@
         mirrors (at the end of the mirrors list) that should be
         available.<br/>
         [if-any logo]
-          <a href="[link]" rel="nofollow"><img align="right" src="[logo]" border="0"/></a>
+          <a href="[link]" rel="nofollow"><img alt="Logo" src="[logo]"/></a>
         [end]
-        </p><p><form action="[location]" method="get" id="SelectMirror">
+        </p><form action="[location]" method="get" id="SelectMirror"><p>
         Other mirrors: <select name="Preferred">
         [if-any http]
           [for http]<option value="[http]">[http]</option>[end]
@@ -36,7 +36,7 @@
         [if-any backup]
           [for backup]<option value="[backup]">[backup] (backup)</option>[end]
         [end]
-        </select><input type="submit" value="Change"/></form></p>
+        </select><input type="submit" value="Change"/></p></form>
         <p>You may also consult the <a href="http://www.apache.org/mirrors/">complete
         list of mirrors</a>.</p>
       </subsection>

Modified: tomcat/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Wed Sep 18 08:01:27 2013
@@ -43,7 +43,7 @@ The Apache Tomcat Project is proud to an
 Apache Tomcat 8  - 8.0.0-RC1 (alpha). Tomcat 8 is aligned with Java EE 7. In
 addition to supporting updated versions of the Java EE specifications, Tomcat 8
 includes a number of improvements compared to Tomcat 7. The notable changes
-include:
+include:</p>
 <ul>
   <li>Support for Java Servlet 3.1, JavaServer Pages 2.3, Java Unified
       Expression Language 3.0 and Java WebSocket 1.0.</li>
@@ -56,6 +56,7 @@ include:
       (using a master WAR as the basis for multiple web applications that each
       have their own customizations).</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-8.0-doc/changelog.html">Tomcat 8 changelog</a>.
 </p>
@@ -67,7 +68,7 @@ usage. The implementations of the 4 Java
 but there is some internal refactoring to be completed before the alpha label
 is removed.</p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-80.cgi">Download</a>
 </p>
 </section>
@@ -77,6 +78,7 @@ is removed.</p>
 The Apache Tomcat Project is proud to announce the release of version 7.0.42 of
 Apache Tomcat. This release contains a number of bug fixes
 and improvements compared to version 7.0.41. The notable changes include:
+</p>
 <ul>
   <li>Add support for time to first byte in the AccessLogValve. Patch provided
       by Jeremy Boynes.</li>
@@ -86,11 +88,12 @@ and improvements compared to version 7.0
   <li>Ensure that the build process produces Javadoc that is not vulnerable to
       CVE-2013-1571. Based on a patch by Uwe Schindler.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.42</a>
 </p>
@@ -103,7 +106,7 @@ Apache Tomcat. This release includes sec
 6.0.36.
 
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-60.cgi">Download</a> |
 <a href="tomcat-6.0-doc/changelog.html">ChangeLog for 6.0.37</a>
 </p>
@@ -123,21 +126,17 @@ to manipulate WAR projects within the Ap
 The binaries are available from Maven repositories. You should specify the
 version in your project's plugin configuration:
 </p>
-<source><![CDATA[
-  <plugin>
-    <groupId>org.apache.tomcat.maven</groupId>
-    <artifactId>tomcat7-maven-plugin</artifactId>
-    <version>2.1</version>
-  </plugin>
-]]></source>
-or
-<source><![CDATA[
-  <plugin>
-    <groupId>org.apache.tomcat.maven</groupId>
-    <artifactId>tomcat6-maven-plugin</artifactId>
-    <version>2.1</version>
-  </plugin>
-]]></source>
+<source><![CDATA[<plugin>
+  <groupId>org.apache.tomcat.maven</groupId>
+  <artifactId>tomcat7-maven-plugin</artifactId>
+  <version>2.1</version>
+</plugin>]]></source>
+<p>or</p>
+<source><![CDATA[<plugin>
+  <groupId>org.apache.tomcat.maven</groupId>
+  <artifactId>tomcat6-maven-plugin</artifactId>
+  <version>2.1</version>
+</plugin>]]></source>
 </section>
 
 <section name="Tomcat Native 1.1.27 Released" rtext="2013-02-12">
@@ -145,7 +144,7 @@ or
 The Apache Tomcat Project is proud to announce the release of version 1.1.27 of
 Tomcat Native.
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-native.cgi">Download</a> |
 <a href="native-doc/miscellaneous/changelog.html">ChangeLog for 1.1.27</a>
 </p>
@@ -157,7 +156,7 @@ The Apache Tomcat Project is proud to an
 Apache Tomcat Connectors.
 This version fixes few bugs and regressions found in 1.2.36 release.
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-connectors.cgi">Download</a> |
 <a href="connectors-doc/miscellaneous/changelog.html">ChangeLog for 1.2.37</a>
 </p>

Modified: tomcat/site/trunk/xdocs/legal.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Wed Sep 18 08:01:27 2013
@@ -41,10 +41,10 @@ Version 2.0 (current)</a>.
     <p>"Apache Tomcat" and "Tomcat" are trademarks of the Apache Software
     Foundation. Use of these trademarks is subject to the terms of section
     6 of <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
-    Version 2.0 (current)</a>.
-</p>
+    Version 2.0 (current)</a>.</p>
+
     <p>If you create a product that uses Apache Tomcat software or provides
-    additional functionality to that software then:
+    additional functionality to that software then:</p>
       <ul>
         <li>When referring to Apache Tomcat software, please use the full name
             of "Apache Tomcat" for at least the first reference on any web page,
@@ -59,7 +59,7 @@ Version 2.0 (current)</a>.
             form of product name that includes "Tomcat" or "Apache" is
             permitted.</li>
       </ul>
-    </p>   </section>
+  </section>
 </body>
 </document>
 

Modified: tomcat/site/trunk/xdocs/lists.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/lists.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/lists.xml (original)
+++ tomcat/site/trunk/xdocs/lists.xml Wed Sep 18 08:01:27 2013
@@ -16,12 +16,11 @@ to that list. If you try to send a messa
 is not subscribed to the list, it will be rejected.</p>
 
 <p>All messages to the Tomcat lists are filtered for spam. To avoid your valid
-message being marked as spam:
-  <ul>
-    <li>send your message in plain text, not HTML;</li>
-    <li>include a subject.</li>
-  </ul> 
-</p>
+message being marked as spam:</p>
+<ul>
+  <li>send your message in plain text, not HTML;</li>
+  <li>include a subject.</li>
+</ul>
 
 <p>The following lists are available:</p>
 
@@ -106,7 +105,7 @@ Tomcat questions to Eric or Rick themsel
   server.</li>
 </ol>
 
-<table>
+<table class="defaultTable">
  <tr>
   <td>Volume:</td>
   <td>High</td>
@@ -179,7 +178,7 @@ Tomcat questions to Eric or Rick themsel
 <p>The list is used to announce Tomcat releases, security vulnerabilities and
 other project announcements.</p>
 
-<table>
+<table class="defaultTable">
  <tr>
   <td>Volume:</td>
   <td>Low</td>
@@ -234,7 +233,7 @@ other project announcements.</p>
 <section name="tomcat-dev">
 
 <p>
-<a name="tomcat-dev">The</a> <code>dev@tomcat.apache.org</code> mailing list
+The <code>dev@tomcat.apache.org</code> mailing list
 is used for discussions about the actual development of the server. It is not
 the place to ask about problems writing JSPs, servlets or web applications.
 </p>
@@ -244,7 +243,7 @@ the place to ask about problems writing 
 for discussion of changes to the Apache Tomcat source code and related
 issues. Other questions will be ignored.</p>
 
-<table>
+<table class="defaultTable">
  <tr>
   <td>Volume:</td>
   <td>High</td>
@@ -318,14 +317,14 @@ issues. Other questions will be ignored.
 <section name="taglibs-user">
 
 <p>
-<a name="taglibs-user">The</a> <code>taglibs-user@tomcat.apache.org</code>
+The <code>taglibs-user@tomcat.apache.org</code>
 mailing list is for users of the custom tag libraries found in
 <a href="http://tomcat.apache.org/taglibs/">Apache Taglibs</a>. It is also
 a good forum for asking questions about how custom tag libraries operate,
 and how they can be used.
 </p>
 
-<table>
+<table class="defaultTable">
  <tr>
   <td>Volume:</td>
   <td>Low</td>

Modified: tomcat/site/trunk/xdocs/migration-6.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-6.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-6.xml (original)
+++ tomcat/site/trunk/xdocs/migration-6.xml Wed Sep 18 08:01:27 2013
@@ -180,8 +180,12 @@ of Apache Tomcat.</p>
     below and then click &quot;View differences&quot; to see the differences.
     The differences will be shown in a new tab/window.</p>
 
-    <script type="text/javascript" language="JavaScript">
-      function updateTc6ActionUrl() {
+    <script type="text/javascript"><![CDATA[
+    "use strict"; // Enable strict mode
+
+    document.addEventListener("DOMContentLoaded", function() {
+    var formSubmit = document.getElementById("tc6Submit");
+      formSubmit.addEventListener("submit", function() {
         var revisions = {
           "HEAD":"HEAD",
           "6.0.0":"466306",
@@ -209,19 +213,19 @@ of Apache Tomcat.</p>
           "6.0.36":"1398690",
           "6.0.37":"1476938"
         };
-        var formSubmit= document.getElementById('tc6Submit');
-        var elementsSelect= document.getElementById('tc6Select').elements;
+
         formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/" +
-          elementsSelect['filename'].value;
-        formSubmit.elements['r1'].value = revisions[elementsSelect['r1'].value]; 
-        formSubmit.elements['r2'].value = revisions[elementsSelect['r2'].value]; 
+          document.getElementById('select-filename').value;
+        formSubmit.elements['r1'].value = revisions[document.getElementById('select-r1').value]; 
+        formSubmit.elements['r2'].value = revisions[document.getElementById('select-r2').value]; 
         return true;
-      }
-    </script>
+      }, false);
+    }, false);
+    ]]></script>
 
-    <form id="tc6Select" action="not-used">
-    <p>Configuration file:
-    <select name="filename">
+    
+    <p><label>Configuration file:
+    <select id="select-filename">
     <option value="conf/catalina.policy">catalina.policy</option>
     <option value="conf/catalina.properties">catalina.properties</option>
     <option value="conf/context.xml">context.xml</option>
@@ -229,10 +233,10 @@ of Apache Tomcat.</p>
     <option value="conf/server.xml">server.xml</option>
     <option value="conf/tomcat-users.xml">tomcat-users.xml</option>
     <option value="conf/web.xml">web.xml</option>
-    </select>
+    </select></label>
     </p>
-    <p>Old version:
-    <select name="r1">
+    <p><label>Old version:
+    <select id="select-r1">
     <option value="6.0.0">6.0.0</option>
     <option value="6.0.1">6.0.1</option>
     <option value="6.0.2">6.0.2</option>
@@ -257,8 +261,8 @@ of Apache Tomcat.</p>
     <option value="6.0.35">6.0.35</option>
     <option value="6.0.36" selected="selected">6.0.36</option>
     <option value="6.0.37">6.0.37</option>
-    </select>, new version:
-    <select name="r2">
+    </select>,</label> <label>new version:
+    <select id="select-r2">
     <option value="6.0.0">6.0.0</option>
     <option value="6.0.1">6.0.1</option>
     <option value="6.0.2">6.0.2</option>
@@ -284,23 +288,21 @@ of Apache Tomcat.</p>
     <option value="6.0.36">6.0.36</option>
     <option value="6.0.37" selected="selected">6.0.37</option>
     <option value="HEAD">trunk (unreleased)</option>
-    </select>
+    </select></label>
     </p>
-    </form>
+
     <form id="tc6Submit" action="to-be-replaced" method="get"
           target="_blank">
     <p>
     <input type="hidden" name="diff_format" value="h"/>
     <input type="hidden" name="r1"/><input type="hidden" name="r2"/>
-    <input type="submit" value="View Differences"
-           onClick="return updateTc6ActionUrl();"/>
+    <button>View Differences</button>
     </p>
     </form>
     <p>You can also use Subversion command similar to the following (all on one line):</p>
-    <pre>  svn diff
-    --old=http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_36/conf/
-    --new=http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_37/conf/
-    </pre>
+    <source>svn diff
+  --old=http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_36/conf/
+  --new=http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_37/conf/</source>
   </subsection>
   
 </section>

Modified: tomcat/site/trunk/xdocs/migration-7.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-7.xml (original)
+++ tomcat/site/trunk/xdocs/migration-7.xml Wed Sep 18 08:01:27 2013
@@ -46,9 +46,8 @@ of Apache Tomcat.</p>
     For example, if package <code>"a"</code> contains class <code>Part</code>,
     the following JSP page will cease to compile in Tomcat 7:</p>
 
-    <source>
-&lt;%@page import="a.*"%&gt;
-&lt;% Part page = new Part(); %&gt;</source>
+    <source><![CDATA[<%@page import="a.*"%>
+<% Part page = new Part(); %>]]></source>
 
     <p>That happens because implicit import of <code>javax.servlet.http.*</code>
     and explicit import of <code>a.*</code> will provide conflicting
@@ -139,10 +138,10 @@ of Apache Tomcat.</p>
     interfaces are not. To maintain the CSRF protection:</p>
     
     <ul>
-      <li>users with the <tt>manager-gui</tt> role should not be granted
-          either the <tt>manager-script</tt> or <tt>manager-jmx</tt> roles.</li>
+      <li>users with the <code>manager-gui</code> role should not be granted
+          either the <code>manager-script</code> or <code>manager-jmx</code> roles.</li>
       <li>if the Manager application is accessed through a browser by a user
-          who has <tt>manager-script</tt> or <tt>manager-jmx</tt> roles
+          who has <code>manager-script</code> or <code>manager-jmx</code> roles
           (e.g. for testing the text or jmx interfaces since these interfaces
           are intended for tools not humans) then all browser windows
           must be closed afterwards to terminate the session.</li>
@@ -183,10 +182,10 @@ of Apache Tomcat.</p>
     not. To maintain the CSRF protection:</p>
     
     <ul>
-      <li>users with the <tt>admin-gui</tt> role should not be granted the
-          <tt>admin-script</tt> role.</li>
+      <li>users with the <code>admin-gui</code> role should not be granted the
+          <code>admin-script</code> role.</li>
       <li>if the Host Manager application is accessed through a browser
-          by a user who has <tt>admin-script</tt> role (e.g. for testing
+          by a user who has <code>admin-script</code> role (e.g. for testing
           the text interface since this inteface is intended for tools
           not humans) then all browser windows
           must be closed afterwards to terminate the session.</li>
@@ -466,8 +465,12 @@ of Apache Tomcat.</p>
     below and then click &quot;View differences&quot; to see the differences.
     The differences will be shown in a new tab/window.</p>
 
-    <script type="text/javascript" language="JavaScript">
-      function updateTc7ActionUrl() {
+    <script type="text/javascript"><![CDATA[
+    "use strict"; // Enable strict mode
+
+    document.addEventListener("DOMContentLoaded", function() {
+    var formSubmit = document.getElementById("tc7Submit");
+      formSubmit.addEventListener("submit", function() {
         var revisions = {
           "HEAD":"HEAD",
           "7.0.0":"954232",
@@ -502,19 +505,19 @@ of Apache Tomcat.</p>
           "7.0.41":"1490220",
           "7.0.42":"1498817"
         };
-        var formSubmit= document.getElementById('tc7Submit');
-        var elementsSelect= document.getElementById('tc7Select').elements;
+
         formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/" +
-          elementsSelect['filename'].value;
-        formSubmit.elements['r1'].value = revisions[elementsSelect['r1'].value]; 
-        formSubmit.elements['r2'].value = revisions[elementsSelect['r2'].value]; 
+          document.getElementById('select-filename').value;
+        formSubmit.elements['r1'].value = revisions[document.getElementById('select-r1').value]; 
+        formSubmit.elements['r2'].value = revisions[document.getElementById('select-r2').value]; 
         return true;
-      }
-    </script>
+      }, false);
+    }, false);
+    ]]></script>
+
 
-    <form id="tc7Select" action="not-used">
-    <p>Configuration file:
-    <select name="filename">
+    <p><label>Configuration file:
+    <select id="select-filename">
     <option value="conf/catalina.policy">catalina.policy</option>
     <option value="conf/catalina.properties">catalina.properties</option>
     <option value="conf/context.xml">context.xml</option>
@@ -522,10 +525,10 @@ of Apache Tomcat.</p>
     <option value="conf/server.xml">server.xml</option>
     <option value="conf/tomcat-users.xml">tomcat-users.xml</option>
     <option value="conf/web.xml">web.xml</option>
-    </select>
+    </select></label>
     </p>
-    <p>Old version:
-    <select name="r1">
+    <p><label>Old version:
+    <select id="select-r1">
     <option value="7.0.0">7.0.0</option>
     <option value="7.0.2">7.0.2</option>
     <option value="7.0.4">7.0.4</option>
@@ -549,7 +552,7 @@ of Apache Tomcat.</p>
     <option value="7.0.29">7.0.29</option>
     <option value="7.0.30">7.0.30</option>
     <option value="7.0.32">7.0.32</option>
-    <option value="7.0.33"></option>
+    <option value="7.0.33">7.0.33</option>
     <option value="7.0.34">7.0.34</option>
     <option value="7.0.35">7.0.35</option>
     <option value="7.0.37">7.0.37</option>
@@ -557,8 +560,8 @@ of Apache Tomcat.</p>
     <option value="7.0.40">7.0.40</option>
     <option value="7.0.41" selected="selected">7.0.41</option>
     <option value="7.0.42">7.0.42</option>
-    </select>, new version:
-    <select name="r2">
+    </select>,</label> <label>new version:
+    <select id="select-r2">
     <option value="7.0.0">7.0.0</option>
     <option value="7.0.2">7.0.2</option>
     <option value="7.0.4">7.0.4</option>
@@ -591,23 +594,21 @@ of Apache Tomcat.</p>
     <option value="7.0.41">7.0.41</option>
     <option value="7.0.42" selected="selected">7.0.42</option>
     <option value="HEAD">trunk (unreleased)</option>
-    </select>
+    </select></label>
     </p>
-    </form>
+
     <form id="tc7Submit" action="to-be-replaced" method="get"
           target="_blank">
     <p>
     <input type="hidden" name="diff_format" value="h"/>
-    <input type="hidden" name="r1" /><input type="hidden" name="r2" />
-    <input type="submit" value="View Differences"
-           onClick="return updateTc7ActionUrl();"/>
+    <input type="hidden" name="r1"/><input type="hidden" name="r2"/>
+    <button>View Differences</button>
     </p>
     </form>
     <p>You can also use Subversion command similar to the following (all on one line):</p>
-    <pre>  svn diff
-    --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_27/conf/
-    --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_28/conf/
-    </pre>
+    <source>svn diff
+  --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_27/conf/
+  --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_28/conf/</source>
   </subsection>
   
 </section>

Modified: tomcat/site/trunk/xdocs/migration-8.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-8.xml (original)
+++ tomcat/site/trunk/xdocs/migration-8.xml Wed Sep 18 08:01:27 2013
@@ -51,9 +51,8 @@ of Apache Tomcat.</p>
     <code>ReadListener</code>, the following JSP page will cease to compile in
     Tomcat 8:</p>
 
-    <source>
-&lt;%@page import="a.*"%&gt;
-&lt;% ReadListener listener = new ReadListener(); %&gt;</source>
+    <source><![CDATA[<%@page import="a.*"%>
+<% ReadListener listener = new ReadListener(); %>]]></source>
 
     <p>This happens because implicit import of <code>javax.servlet.*</code>
     and explicit import of <code>a.*</code> will provide conflicting
@@ -132,25 +131,29 @@ of Apache Tomcat.</p>
     below and then click &quot;View differences&quot; to see the differences.
     The differences will be shown in a new tab/window.</p>
 
-    <script type="text/javascript" language="JavaScript">
-      function updateTc8ActionUrl() {
+    <script type="text/javascript"><![CDATA[
+    "use strict"; // Enable strict mode
+
+    document.addEventListener("DOMContentLoaded", function() {
+    var formSubmit = document.getElementById("tc8Submit");
+      formSubmit.addEventListener("submit", function() {
         var revisions = {
           "HEAD":"HEAD",
           "8.0.0-RC1":"1509411",
         };
-        var formSubmit= document.getElementById('tc8Submit');
-        var elementsSelect= document.getElementById('tc8Select').elements;
+
         formSubmit.action = "http://svn.apache.org/viewvc/tomcat/trunk/" +
-          elementsSelect['filename'].value;
-        formSubmit.elements['r1'].value = revisions[elementsSelect['r1'].value]; 
-        formSubmit.elements['r2'].value = revisions[elementsSelect['r2'].value]; 
+          document.getElementById('select-filename').value;
+        formSubmit.elements['r1'].value = revisions[document.getElementById('select-r1').value]; 
+        formSubmit.elements['r2'].value = revisions[document.getElementById('select-r2').value]; 
         return true;
-      }
-    </script>
+      }, false);
+    }, false);
+    ]]></script>
+
 
-    <form id="tc8Select" action="not-used">
-    <p>Configuration file:
-    <select name="filename">
+    <p><label>Configuration file:
+    <select id="select-filename">
     <option value="conf/catalina.policy">catalina.policy</option>
     <option value="conf/catalina.properties">catalina.properties</option>
     <option value="conf/context.xml">context.xml</option>
@@ -158,31 +161,29 @@ of Apache Tomcat.</p>
     <option value="conf/server.xml">server.xml</option>
     <option value="conf/tomcat-users.xml">tomcat-users.xml</option>
     <option value="conf/web.xml">web.xml</option>
-    </select>
+    </select></label>
     </p>
-    <p>Old version:
-    <select name="r1">
+    <p><label>Old version:
+    <select id="select-r1">
     <option value="8.0.0-RC1" selected="selected">8.0.0-RC1</option>
-    </select>, new version:
-    <select name="r2">
+    </select>,</label> <label>new version:
+    <select id="select-r2">
     <option value="HEAD" selected="selected">trunk (unreleased)</option>
-    </select>
+    </select></label>
     </p>
-    </form>
+
     <form id="tc8Submit" action="to-be-replaced" method="get"
           target="_blank">
     <p>
     <input type="hidden" name="diff_format" value="h"/>
-    <input type="hidden" name="r1" /><input type="hidden" name="r2" />
-    <input type="submit" value="View Differences"
-           onClick="return updateTc8ActionUrl();"/>
+    <input type="hidden" name="r1"/><input type="hidden" name="r2"/>
+    <button>View Differences</button>
     </p>
     </form>
     <p>You can also use Subversion command similar to the following (all on one line):</p>
-    <pre>  svn diff
-    --old=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0/conf/
-    --new=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_1/conf/
-    </pre>
+    <source>svn diff
+  --old=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_0/conf/
+  --new=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_8_0_1/conf/</source>
   </subsection>
   
 </section>

Modified: tomcat/site/trunk/xdocs/oldnews-2010.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2010.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/oldnews-2010.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2010.xml Wed Sep 18 08:01:27 2013
@@ -87,10 +87,12 @@ content directly in a web application (a
 </section>
 
 <section name="Apache Tomcat Track at ApacheCon North America 2010" rtext="2010-05-27">
-<p><a href="http://archive.apachecon.com/c/acna2010/"><img
-src="images/ACNA2010_120x240_basic.gif" width="120" height="240"
-align="right" hspace="10" vspace="10" alt="[ApacheCon North America 2010
-Banner]" /></a> <a href="http://archive.apachecon.com/c/acna2010/">ApacheCon
+<p/><div style="float: right;"><a href="http://archive.apachecon.com/c/acna2010/"><img
+src="images/ACNA2010_120x240_basic.gif" style="width: 120px; height: 240px;"
+alt="[ApacheCon North America 2010
+Banner]" /></a></div>
+<p>
+<a href="http://archive.apachecon.com/c/acna2010/">ApacheCon
 North America 2010</a> will be held 1-5 November 2010, at the Westin
 Peachtree in Atlanta, Georgia, USA.</p>
 <p>
@@ -107,6 +109,7 @@ Additionally we have a meetup on Thursda
 </p>
 <p>See also:
 <a href="http://archive.apachecon.com/c/">Apache Conferences Archive</a></p>
+<div style="clear: right;"/>
 </section>
 
 <section name="Tomcat 5.5.29 Released" rtext="2010-04-20">
@@ -130,8 +133,8 @@ The Apache Tomcat Project is proud to an
 Apache Tomcat Connectors.
 This release includes mainly bug fixes and some small improvements over Apache Tomcat Connectors 1.2.28.
 </p>
-<p><br/>
-<b>Notice</b> Apache Tomcat Connectors version 1.2.29 was withdrawn from the release due to
+<p>
+<b>Notice:</b> Apache Tomcat Connectors version 1.2.29 was withdrawn from the release due to
 regression with Microsoft IIS connector.
 </p>
 </section>

Modified: tomcat/site/trunk/xdocs/oldnews-2011.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2011.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/oldnews-2011.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2011.xml Wed Sep 18 08:01:27 2013
@@ -22,7 +22,7 @@ The Apache Tomcat Project is proud to an
 Apache Tomcat. This release includes security and bug fixes over Apache Tomcat 6.0.33.
 
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-60.cgi">Download</a> |
 <a href="tomcat-6.0-doc/changelog.html#Tomcat_6.0.35_(jfclere)">ChangeLog for 6.0.35</a>
 </p>
@@ -33,6 +33,7 @@ Apache Tomcat. This release includes sec
 The Apache Tomcat Project is proud to announce the release of version 7.0.23 of
 Apache Tomcat. This release includes numerous bug fixes and several new features
 compared to version 7.0.22. The notable new features include:
+</p>
 <ul>
 <li>The ability to start and stop child containers (primarily Contexts - i.e.
     web applications) in parallel which can significantly improve start times.
@@ -45,11 +46,12 @@ compared to version 7.0.22. The notable 
     can be fixed (e.g. via JMX) and another attempt made to start it rather than
     it having to be removed.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.23_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.23_(markt)">ChangeLog for 7.0.23</a>
 </p>
@@ -60,6 +62,7 @@ Full details of these changes, and all t
 The Apache Tomcat Project is proud to announce the release of version 7.0.22 of
 Apache Tomcat. This release includes bug fixes and new features compared to
 version 7.0.21 including:
+</p>
 <ul>
 <li>Further improvements to the memory leak detection and prevention
     features.</li>
@@ -68,11 +71,12 @@ version 7.0.21 including:
 <li>Add support for controlling which session attributes are replicated when
     using session replication (a.k.a clustering).</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.22_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.22_(markt)">ChangeLog for 7.0.22</a>
 </p>
@@ -87,7 +91,7 @@ fixes over Apache Tomcat 5.5.33.
 <p><strong>Note:</strong> End of life date for Apache Tomcat 5.5.x is announced.
 <a href="tomcat-55-eol.html">Read more...</a>
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-55.cgi">Download</a> |
 <a href="tomcat-5.5-doc/changelog.html#Tomcat_5.5.34_(jim)">ChangeLog for 5.5.34</a>
 </p>
@@ -98,6 +102,7 @@ fixes over Apache Tomcat 5.5.33.
 The Apache Tomcat Project is proud to announce the release of version 7.0.21 of
 Apache Tomcat. This release includes security fixes, bug fixes and new features
 compared to version 7.0.20 including:
+</p>
 <ul>
 <li>A fix for CVE-2011-3190 that allowed an attacker to inject requests when
     Tomcat was configured behind a reverse proxy using the AJP protocol.</li>
@@ -105,12 +110,13 @@ compared to version 7.0.20 including:
     detection/prevention features.</li>
 <li>Improved validation of received AJP messages.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.21_(markt)">Tomcat 7
 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.21_(markt)">ChangeLog for
 7.0.21</a>
@@ -122,7 +128,7 @@ changelog</a>.
 The Apache Tomcat Project is proud to announce the release of version 6.0.33 of
 Apache Tomcat. This release includes security and bug fixes over Apache Tomcat 6.0.32.
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-60.cgi">Download</a> |
 <a href="tomcat-6.0-doc/changelog.html#Tomcat_6.0.33_(jfclere)">ChangeLog for 6.0.33</a>
 </p>
@@ -133,6 +139,7 @@ Apache Tomcat. This release includes sec
 The Apache Tomcat Project is proud to announce the release of version 7.0.20 of
 Apache Tomcat. This release includes bug fixes and the following new features
 compared to version 7.0.19 including:
+</p>
 <ul>
 <li>JSP files with dependencies in JARs are no longer recompiled on every access
     thereby improving performance.</li>
@@ -141,12 +148,13 @@ compared to version 7.0.19 including:
 <li>Update to Commons Daemon 1.0.7.</li>
 <li>Converted unit tests to JUnit 4.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.20_(markt)">Tomcat 7
 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.20_(markt)">ChangeLog for
 7.0.20</a>
@@ -171,6 +179,7 @@ This version is principally a bugfix rel
 The Apache Tomcat Project is proud to announce the release of version 7.0.19 of
 Apache Tomcat. This release includes security fixes, bug fixes and the following
 new features compared to version 7.0.16:
+</p>
 <ul>
 <li>JSP recompilation is now triggered by any change (backwards as well as
     forwards) in the last modified time of the JSP or any of its
@@ -178,12 +187,13 @@ new features compared to version 7.0.16:
 <li>Support for installing multiple instances with the Windows Installer</li>
 <li>Include jdbc-pool (an alternative database connection pool)</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.19_(markt)">Tomcat 7
 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.19_(markt)">ChangeLog for
 7.0.19</a>
@@ -203,17 +213,19 @@ compared to version 1.2.31.
 The Apache Tomcat Project is proud to announce the release of version 7.0.16 of
 Apache Tomcat. This release includes bug fixes and the following new features
 compared to version 7.0.14:
+</p>
 <ul>
 <li>NIO implementation of the AJP connector.</li>
 <li>Enable Servlet 3 asynchronous processing support when using clustering.</li>
 <li>Add parallel deployment support to the Manager&apos;s Ant tasks.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.16_(markt)">Tomcat 7
 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.16_(markt)">ChangeLog for
 7.0.16</a>
@@ -225,11 +237,13 @@ changelog</a>.
 The Apache Tomcat Project is proud to announce the release of version 7.0.14 of
 Apache Tomcat. This release includes bug fixes and the following new features
 compared to version 7.0.12:
+</p>
 <ul>
 <li>The StuckThreadDetectionValve to identify long running requests.</li>
 <li>JAAS authentication support to the JMXRemoteLifecycleListener.</li>
 <li>Updated MIME type mappings to align with those of Apache httpd.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.14_(markt)">Tomcat 7
 changelog</a>.
@@ -240,7 +254,7 @@ changelog</a>.
 <p>
 The Apache Tomcat Project is proud to announce the release of version 7.0.12 of
 Apache Tomcat. This release includes bug fixes, security fixes and the following
-new features compared to version 7.0.11:
+new features compared to version 7.0.11:</p>
 <ul>
 <li>initial support for SPNEGO/Kerberos authentication (also referred to as
     Windows authentication);</li>
@@ -248,6 +262,7 @@ new features compared to version 7.0.11:
     JNDI resource when it is no longer required;</li>
 <li>optional support for pre-emptive authentication.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.12_(markt)">Tomcat 7
 changelog</a>.

Modified: tomcat/site/trunk/xdocs/oldnews-2012.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2012.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/oldnews-2012.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2012.xml Wed Sep 18 08:01:27 2013
@@ -13,6 +13,7 @@
 The Apache Tomcat Project is proud to announce the release of version 7.0.34 of
 Apache Tomcat. This release contains a small number of bug fixes and
 improvements compared to version 7.0.33. The notable changes include:
+</p>
 <ul>
 <li>Improvements to the AccessLogValve to better handle non-standard DST changes
     and to provide option for the current access log to have a standard name.
@@ -20,11 +21,12 @@ improvements compared to version 7.0.33.
 <li>Fix various JMX registration and deregistration issues.</li>
 <li>Update the Eclipse JDT compiler to 4.2.1</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.34_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.34_(markt)">ChangeLog for 7.0.34</a>
 </p>
@@ -35,17 +37,19 @@ Full details of these changes, and all t
 The Apache Tomcat Project is proud to announce the release of version 7.0.33 of
 Apache Tomcat. This release contains a small number of bug fixes and
 improvements compared to version 7.0.32. The notable changes include:
+</p>
 <ul>
 <li>A fix to the AccessLogValve to address a bug that caused some entries to be
     made with incorrect time stamps.</li>
 <li>A re-written, smaller, faster HTTP header parser.</li>
 <li>Further performance improvements for Jasper, Tomcat&apos;s JSP engine.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.33_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.33_(markt)">ChangeLog for 7.0.33</a>
 </p>
@@ -58,7 +62,7 @@ Apache Tomcat. This release includes sec
 6.0.35.
 
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-60.cgi">Download</a> |
 <a href="tomcat-6.0-doc/changelog.html#Tomcat_6.0.36_(jfclere)">ChangeLog for 6.0.36</a>
 </p>
@@ -69,12 +73,12 @@ Apache Tomcat. This release includes sec
 The Apache Tomcat Project is proud to announce the release of version 5.5.36 of
 Apache Tomcat. This release is primarily a bug fix release.
 </p>
-<p><strong>Note:</strong> As per the previous<a href="tomcat-55-eol.html">
+<p><strong>Note:</strong> As per the previous <a href="tomcat-55-eol.html">
 end of life announcement</a> this will almost certainly be the final Apache
 Tomcat 5.5.x release. Users of the 5.5.x series are strongly encouraged to
 upgrade to at least 6.0.x and ideally 7.0.x.
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-55.cgi">Download</a> |
 <a href="tomcat-5.5-doc/changelog.html">ChangeLog for 5.5.36</a>
 </p>
@@ -85,6 +89,7 @@ upgrade to at least 6.0.x and ideally 7.
 The Apache Tomcat Project is proud to announce the release of version 7.0.32 of
 Apache Tomcat. This release contains a small number of bug fixes and
 improvements compared to version 7.0.30. The notable changes include:
+</p>
 <ul>
 <li>A new option to automatically remove old, unused versions (ones where there
     are no longer any active sessions) of applications deployed using parallel
@@ -93,11 +98,12 @@ improvements compared to version 7.0.30.
 <li>Make the members and deployer associated with a cluster visible via JMX.
     </li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.32_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.32_(markt)">ChangeLog for 7.0.32</a>
 </p>
@@ -117,21 +123,17 @@ to manipulate WAR projects within the Ap
 The binaries are available from Maven repositories. You should specify the
 version in your project's plugin configuration:
 </p>
-<source><![CDATA[
-  <plugin>
-    <groupId>org.apache.tomcat.maven</groupId>
-    <artifactId>tomcat6-maven-plugin</artifactId>
-    <version>2.0</version>
-  </plugin>
-]]></source>
-or
-<source><![CDATA[
-  <plugin>
-    <groupId>org.apache.tomcat.maven</groupId>
-    <artifactId>tomcat7-maven-plugin</artifactId>
-    <version>2.0</version>
-  </plugin>
-]]></source>
+<source><![CDATA[<plugin>
+  <groupId>org.apache.tomcat.maven</groupId>
+  <artifactId>tomcat6-maven-plugin</artifactId>
+  <version>2.0</version>
+</plugin>]]></source>
+<p>or</p>
+<source><![CDATA[<plugin>
+  <groupId>org.apache.tomcat.maven</groupId>
+  <artifactId>tomcat7-maven-plugin</artifactId>
+  <version>2.0</version>
+</plugin>]]></source>
 </section>
 
 <section name="Tomcat 7.0.30 Released" rtext="2012-09-06">
@@ -139,6 +141,7 @@ or
 The Apache Tomcat Project is proud to announce the release of version 7.0.30 of
 Apache Tomcat. This release contains numerous bug fixes and improvements
 compared to version 7.0.29. The notable changes include:
+</p>
 <ul>
 <li>Significantly reduced memory footprint during web application start while
     Servlet 3.0 annotation and SCI scanning is in progress.</li>
@@ -146,11 +149,12 @@ compared to version 7.0.29. The notable 
     Servlet 3.0 annotation and SCI scanning.</li>
 <li>Improvements to DIGEST and FORM authentication.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.30_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.30_(markt)">ChangeLog for 7.0.30</a>
 </p>
@@ -163,6 +167,7 @@ Apache Tomcat. This release corrects a s
 the 7.0.28 release and takes account of several recent clarifications from the
 Servlet Expert Group as well as containing a handful of bug fixes and small
 improvements compared to version 7.0.28. The notable changes include:
+</p>
 <ul>
 <li>Add support for a default error page</li>
 <li>The servlet version defined in web.xml no longer determines if Tomcat scans
@@ -172,11 +177,12 @@ improvements compared to version 7.0.28.
     ServletContainerInitializers regardless of the setting of
     metadata-complete</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.29_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.29_(markt)">ChangeLog for 7.0.29</a>
 </p>
@@ -187,6 +193,7 @@ Full details of these changes, and all t
 The Apache Tomcat Project is proud to announce the release of version 7.0.28 of
 Apache Tomcat. This release is includes may improvements as well as a number of
 bug fixes compared to version 7.0.27. The notable changes include:
+</p>
 <ul>
 <li>The minimum required APR/native library version required if the APR/native
     connector is used is now 1.1.24.</li>
@@ -194,11 +201,12 @@ bug fixes compared to version 7.0.27. Th
     infinite timeouts by default for WebSocket connections.</li>
 <li>Various fixes and improvements to annotation scanning.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.28_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.28_(markt)">ChangeLog for 7.0.28</a>
 </p>
@@ -209,7 +217,7 @@ Full details of these changes, and all t
 The Apache Tomcat Project is proud to announce the release of version 1.1.24 of
 Tomcat Native.
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-native.cgi">Download</a> |
 <a href="native-doc/miscellaneous/changelog.html">ChangeLog for 1.1.24</a>
 </p>
@@ -221,7 +229,7 @@ The Apache Tomcat Project is proud to an
 Apache Tomcat Connectors.
 This version fixes few bugs found in 1.2.35 release.
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-connectors.cgi">Download</a> |
 <a href="connectors-doc/miscellaneous/changelog.html">ChangeLog for 1.2.36</a>
 </p>
@@ -232,6 +240,7 @@ This version fixes few bugs found in 1.2
 The Apache Tomcat Project is proud to announce the release of version 7.0.27 of
 Apache Tomcat. This release is includes significant new features as well as a
 number of bug fixes compared to version 7.0.26. The notable changes include:
+</p>
 <ul>
 <li>Support for the WebSocket protocol (RFC6455). Both streaming and message
     based APIs are provided and the implementation currently fully passes the
@@ -241,11 +250,12 @@ number of bug fixes compared to version 
 <li>Improve the memory leak prevention and detection code so that is works well
     with JVMs from IBM.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.27_(markt)">ChangeLog for 7.0.27</a>
 </p>
@@ -260,7 +270,7 @@ This version fixes few bugs found in 1.2
 <p><strong>Notice:</strong> Users of discontinued Apache HTTPD 1.3.x version will need to apply the
 <a href="http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?r1=1302445&amp;r2=1305020">r1305020 patch</a>
 to be able to compile this version of mod_jk.</p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-connectors.cgi">Download</a> |
 <a href="connectors-doc/miscellaneous/changelog.html">ChangeLog for 1.2.35</a>
 </p>
@@ -286,7 +296,7 @@ mod_jk 1.2.32 until mod_jk 1.2.35 is ava
 The Apache Tomcat Project is proud to announce the release of version 1.1.23 of Tomcat Native.
 This version is principally a bugfix release.
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-native.cgi">Download</a> |
 <a href="native-doc/miscellaneous/changelog.html">ChangeLog for 1.1.23</a>
 </p>
@@ -297,6 +307,7 @@ This version is principally a bugfix rel
 The Apache Tomcat Project is proud to announce the release of version 7.0.26 of
 Apache Tomcat. This release is primarily a bug fix release and includes numerous
 bug fixes compared to version 7.0.25. The notable bug fixes include:
+</p>
 <ul>
 <li>Improved <code>@HandlesTypes</code> processing which no longer loads all
     classes on web application start.</li>
@@ -306,11 +317,12 @@ bug fixes compared to version 7.0.25. Th
     including web applications packaged as WARs and many embedded scenarios.
     </li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.25_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.26_(markt)">ChangeLog for 7.0.26</a>
 </p>
@@ -329,21 +341,17 @@ to manipulate WAR projects within the Ap
 The binaries are available from Maven repositories. You should specify the
 version in your project's plugin configuration:
 </p>
-<source><![CDATA[
-  <plugin>
-    <groupId>org.apache.tomcat.maven</groupId>
-    <artifactId>tomcat6-maven-plugin</artifactId>
-    <version>2.0-beta-1</version>
-  </plugin>
-]]></source>
-or
-<source><![CDATA[
-  <plugin>
-    <groupId>org.apache.tomcat.maven</groupId>
-    <artifactId>tomcat7-maven-plugin</artifactId>
-    <version>2.0-beta-1</version>
-  </plugin>
-]]></source>
+<source><![CDATA[<plugin>
+  <groupId>org.apache.tomcat.maven</groupId>
+  <artifactId>tomcat6-maven-plugin</artifactId>
+  <version>2.0-beta-1</version>
+</plugin>]]></source>
+<p>or</p>
+<source><![CDATA[<plugin>
+  <groupId>org.apache.tomcat.maven</groupId>
+  <artifactId>tomcat7-maven-plugin</artifactId>
+  <version>2.0-beta-1</version>
+</plugin>]]></source>
 </section>
 
 <section name="Tomcat 7.0.25 Released" rtext="2012-01-21">
@@ -351,6 +359,7 @@ or
 The Apache Tomcat Project is proud to announce the release of version 7.0.25 of
 Apache Tomcat. This release includes numerous bug fixes and several new features
 compared to version 7.0.23. The notable new features include:
+</p>
 <ul>
 <li>Align the Servlet 3.0 implementation with the changes defined in the first
     maintenance release (also known as Rev. A.). See the
@@ -361,11 +370,12 @@ compared to version 7.0.23. The notable 
 <li>Update to Commons Pool 1.5.7, Commons Daemon 1.0.8 and Eclipse JDT compiler
     3.7.1.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.25_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.25_(markt)">ChangeLog for 7.0.25</a>
 </p>
@@ -380,7 +390,7 @@ fixes over Apache Tomcat 5.5.34.
 <p><strong>Note:</strong> End of life date for Apache Tomcat 5.5.x is announced.
 <a href="tomcat-55-eol.html">Read more...</a>
 </p>
-<p align="center">
+<p style="text-align: center;">
 <a href="download-55.cgi">Download</a> |
 <a href="tomcat-5.5-doc/changelog.html">ChangeLog for 5.5.35</a>
 </p>

Modified: tomcat/site/trunk/xdocs/oldnews.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/oldnews.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews.xml Wed Sep 18 08:01:27 2013
@@ -13,6 +13,7 @@
 The Apache Tomcat Project is proud to announce the release of version 7.0.41 of
 Apache Tomcat. This release contains a number of bug fixes
 and improvements compared to version 7.0.40. The notable changes include:
+</p>
 <ul>
   <li>Add a Servlet Filter that implements
       <a href="http://www.w3.org/TR/cors/" rel="nofollow">CORS</a>. Patch
@@ -24,11 +25,12 @@ and improvements compared to version 7.0
       tasks for interfacing with the text based Manager application. Patch
       provided by Sergey Tcherednichenko.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.41_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.41_(markt)">ChangeLog for 7.0.41</a>
 </p>
@@ -40,6 +42,7 @@ Full details of these changes, and all t
 The Apache Tomcat Project is proud to announce the release of version 7.0.40 of
 Apache Tomcat. This release contains a security fix and a number of bug fixes
 and improvements compared to version 7.0.39. The notable changes include:
+</p>
 <ul>
 <li>A fix for CVE-2013-2071 (bug <bug>54178</bug>) an information disclosure
     issue.</li>
@@ -50,11 +53,12 @@ and improvements compared to version 7.0
     while checking for memory leaks when a web application is being stopped.
     </li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.40_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.40_(markt)">ChangeLog for 7.0.40</a>
 </p>
@@ -65,6 +69,7 @@ Full details of these changes, and all t
 The Apache Tomcat Project is proud to announce the release of version 7.0.39 of
 Apache Tomcat. This release contains a number of bug fixes and improvements
 compared to version 7.0.37. The notable changes include:
+</p>
 <ul>
 <li>There have been multiple improvements in the bytes to/from characters
     conversion process. The core conversion process has been refactored to use
@@ -88,11 +93,12 @@ compared to version 7.0.37. The notable 
     dependency on Commons Codec was added to replace Tomcat's internal Base64
     encoder/decoder.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.39_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.39_(markt)">ChangeLog for 7.0.39</a>
 </p>
@@ -103,6 +109,7 @@ Full details of these changes, and all t
 The Apache Tomcat Project is proud to announce the release of version 7.0.37 of
 Apache Tomcat. This release contains a small number of bug fixes and
 improvements compared to version 7.0.35. The notable changes include:
+</p>
 <ul>
 <li>Fix the regression in the JspC tool that is used to pre-compile JSP pages
     introduced in 7.0.35. See
@@ -116,11 +123,12 @@ improvements compared to version 7.0.35.
     an empty set of options (which essentially disables HTTPS support).</li>
 <li>Update to Commons Daemon 1.0.13.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.37_(markt)">Tomcat 7 changelog</a>.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.37_(markt)">ChangeLog for 7.0.37</a>
 </p>
@@ -132,6 +140,7 @@ Full details of these changes, and all t
 The Apache Tomcat Project is proud to announce the release of version 7.0.35 of
 Apache Tomcat. This release contains a small number of bug fixes and
 improvements compared to version 7.0.34. The notable changes include:
+</p>
 <ul>
 <li>Integrate documentation of Tomcat 7 with Apache Comments System. People can
     leave their comments when reading the <a
@@ -143,6 +152,7 @@ improvements compared to version 7.0.34.
     that provide tag plug-in implementations. Based on a patch by Sheldon
     Shao.</li>
 </ul>
+<p>
 Full details of these changes, and all the other changes, are available in the
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.35_(markt)">Tomcat 7 changelog</a>.
 </p>
@@ -153,7 +163,7 @@ is broken in this release. See
 for details.
 </p>
 
-<p align="center">
+<p style="text-align: center;">
 <a href="download-70.cgi">Download</a> |
 <a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.35_(markt)">ChangeLog for 7.0.35</a>
 </p>

Modified: tomcat/site/trunk/xdocs/security-4.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-4.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-4.xml (original)
+++ tomcat/site/trunk/xdocs/security-4.xml Wed Sep 18 08:01:27 2013
@@ -297,7 +297,7 @@
 
     <p>The following Java system properties have been added to Tomcat to provide 
        additional control of the handling of path delimiters in URLs (both
-       options default to false):
+       options default to false):</p>
        <ul>
          <li>
            <code>org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH</code>:
@@ -308,7 +308,6 @@
            <code>true|false</code>
          </li>
        </ul>
-    </p>
 
     <p>Due to the impossibility to guarantee that all URLs are handled by Tomcat
        as they are in proxy servers, Tomcat should always be secured as if no

Modified: tomcat/site/trunk/xdocs/security-5.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-5.xml (original)
+++ tomcat/site/trunk/xdocs/security-5.xml Wed Sep 18 08:01:27 2013
@@ -138,7 +138,7 @@
        rel="nofollow">CVE-2011-1184</a>.</p>
 
     <p>The implementation of HTTP DIGEST authentication was discovered to have
-       several weaknesses:
+       several weaknesses:</p>
        <ul>
          <li>replay attacks were permitted</li>
          <li>server nonces were not checked</li>
@@ -147,6 +147,7 @@
          <li>realm values were not checked</li>
          <li>the server secret was hard-coded to a known string</li>
        </ul>
+    <p>
        The result of these weaknesses is that DIGEST authentication was only as
        secure as BASIC authentication.
     </p>
@@ -187,13 +188,14 @@
        When running under a security manager, this lack of validation allowed a
        malicious web application to do one or more of the following that would
        normally be prevented by a security manager:
+    </p>
        <ul>
          <li>return files to users that the security manager should make
              inaccessible</li>
          <li>terminate (via a crash) the JVM</li>
        </ul>
-       Additionally, these vulnerabilities only occur when all of the following
-       are true:
+       <p>Additionally, these vulnerabilities only occur when all of the following
+       are true:</p>
        <ul>
          <li>untrusted web applications are being used</li>
          <li>the SecurityManager is used to limit the untrusted web applications
@@ -201,7 +203,6 @@
          <li>the HTTP APR connector is used</li>
          <li>sendfile is enabled for the connector (this is the default)</li>
        </ul>
-    </p>
 
     <p>This was fixed in <revlink rev="1158244">revision 1158244</revlink>.</p>
 
@@ -218,11 +219,13 @@
        capabilities allowing the application to access files and directories
        owned by superuser. This vulnerability only occurs when all of the
        following are true:
+    </p>
        <ul>
          <li>Tomcat is running on a Linux operating system</li>
          <li>jsvc was compiled with libcap</li>
          <li>-user parameter is used</li>
        </ul>
+    <p>
        Affected Tomcat versions shipped with source files for jsvc that included
        this vulnerability.
     </p>
@@ -248,13 +251,13 @@
        full control over the AJP message permitting authentication bypass and
        information disclosure. This vulnerability only occurs when all of the
        following are true:
+    </p>
        <ul>
          <li>The org.apache.jk.server.JkCoyoteHandler AJP connector is not used
          </li>
          <li>POST requests are accepted</li>
          <li>The request body is not processed</li>
        </ul>
-    </p>
 
     <p>This was fixed in <revlink rev="1162960">revision 1162960</revlink>.</p>
 
@@ -723,6 +726,7 @@
     <p>The following Java system properties have been added to Tomcat to provide 
        additional control of the handling of path delimiters in URLs (both options 
        default to false):
+    </p>
        <ul>
          <li>
            <code>org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH</code>: <code>true|false</code>
@@ -731,7 +735,6 @@
            <code>org.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH</code>: <code>true|false</code>
          </li>
        </ul>
-    </p>
 
     <p>Due to the impossibility to guarantee that all URLs are handled by Tomcat as 
        they are in proxy servers, Tomcat should always be secured as if no proxy 

Modified: tomcat/site/trunk/xdocs/security-6.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-6.xml (original)
+++ tomcat/site/trunk/xdocs/security-6.xml Wed Sep 18 08:01:27 2013
@@ -230,13 +230,13 @@
        full control over the AJP message permitting authentication bypass and
        information disclosure. This vulnerability only occurs when all of the
        following are true:
+    </p>
        <ul>
          <li>The org.apache.jk.server.JkCoyoteHandler AJP connector is not used
          </li>
          <li>POST requests are accepted</li>
          <li>The request body is not processed</li>
        </ul>
-    </p>
 
     <p>This was fixed in <revlink rev="1162959">revision 1162959</revlink>.</p>
 
@@ -310,6 +310,7 @@
 
     <p>The implementation of HTTP DIGEST authentication was discovered to have
        several weaknesses:
+    </p>
        <ul>
          <li>replay attacks were permitted</li>
          <li>server nonces were not checked</li>
@@ -318,6 +319,7 @@
          <li>realm values were not checked</li>
          <li>the server secret was hard-coded to a known string</li>
        </ul>
+    <p>
        The result of these weaknesses is that DIGEST authentication was only as
        secure as BASIC authentication.
     </p>
@@ -358,13 +360,14 @@
        When running under a security manager, this lack of validation allowed a
        malicious web application to do one or more of the following that would
        normally be prevented by a security manager:
+    </p>
        <ul>
          <li>return files to users that the security manager should make
              inaccessible</li>
          <li>terminate (via a crash) the JVM</li>
        </ul>
-       Additionally, these vulnerabilities only occur when all of the following
-       are true:
+       <p>Additionally, these vulnerabilities only occur when all of the following
+       are true:</p>
        <ul>
          <li>untrusted web applications are being used</li>
          <li>the SecurityManager is used to limit the untrusted web applications
@@ -372,7 +375,6 @@
          <li>the HTTP NIO or HTTP APR connector is used</li>
          <li>sendfile is enabled for the connector (this is the default)</li>
        </ul>
-    </p>
 
     <p>This was fixed in <revlink rev="1146703">revision 1146703</revlink>.</p>
 
@@ -389,11 +391,13 @@
        capabilities allowing the application to access files and directories
        owned by superuser. This vulnerability only occurs when all of the
        following are true:
+    </p>
        <ul>
          <li>Tomcat is running on a Linux operating system</li>
          <li>jsvc was compiled with libcap</li>
          <li>-user parameter is used</li>
        </ul>
+    <p>
        Affected Tomcat versions shipped with source files for jsvc that included
        this vulnerability.
     </p>
@@ -902,6 +906,7 @@
     <p>The following Java system properties have been added to Tomcat to provide 
        additional control of the handling of path delimiters in URLs (both options 
        default to false):
+    </p>
        <ul>
          <li>
            <code>org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH</code>: <code>true|false</code>
@@ -910,7 +915,6 @@
            <code>org.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH</code>: <code>true|false</code>
          </li>
        </ul>
-    </p>
 
     <p>Due to the impossibility to guarantee that all URLs are handled by Tomcat as 
        they are in proxy servers, Tomcat should always be secured as if no proxy 

Modified: tomcat/site/trunk/xdocs/security-7.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Wed Sep 18 08:01:27 2013
@@ -305,13 +305,13 @@
        full control over the AJP message permitting authentication bypass and
        information disclosure. This vulnerability only occurs when all of the
        following are true:
+    </p>
        <ul>
          <li>The org.apache.jk.server.JkCoyoteHandler AJP connector is not used
          </li>
          <li>POST requests are accepted</li>
          <li>The request body is not processed</li>
        </ul>
-    </p>
 
     <p>This was fixed in <revlink rev="1162958">revision 1162958</revlink>.</p>
 
@@ -346,11 +346,13 @@
        capabilities allowing the application to access files and directories
        owned by superuser. This vulnerability only occurs when all of the
        following are true:
+    </p>
        <ul>
          <li>Tomcat is running on a Linux operating system</li>
          <li>jsvc was compiled with libcap</li>
          <li>-user parameter is used</li>
        </ul>
+    <p>
        Affected Tomcat versions shipped with source files for jsvc that included
        this vulnerability.
     </p>
@@ -376,13 +378,14 @@
        When running under a security manager, this lack of validation allowed a
        malicious web application to do one or more of the following that would
        normally be prevented by a security manager:
+    </p>
        <ul>
          <li>return files to users that the security manager should make
              inaccessible</li>
          <li>terminate (via a crash) the JVM</li>
        </ul>
-       Additionally, these vulnerabilities only occur when all of the following
-       are true:
+       <p>Additionally, these vulnerabilities only occur when all of the following
+       are true:</p>
        <ul>
          <li>untrusted web applications are being used</li>
          <li>the SecurityManager is used to limit the untrusted web applications
@@ -390,7 +393,6 @@
          <li>the HTTP NIO or HTTP APR connector is used</li>
          <li>sendfile is enabled for the connector (this is the default)</li>
        </ul>
-    </p>
 
     <p>This was fixed in revisions
        <revlink rev="1145383">1145383</revlink>,
@@ -513,6 +515,7 @@
 
     <p>The implementation of HTTP DIGEST authentication was discovered to have
        several weaknesses:
+    </p>
        <ul>
          <li>replay attacks were permitted</li>
          <li>server nonces were not checked</li>
@@ -521,6 +524,7 @@
          <li>realm values were not checked</li>
          <li>the server secret was hard-coded to a known string</li>
        </ul>
+     <p>
        The result of these weaknesses is that DIGEST authentication was only as
        secure as BASIC authentication.
     </p>

Modified: tomcat/site/trunk/xdocs/svn.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/svn.xml (original)
+++ tomcat/site/trunk/xdocs/svn.xml Wed Sep 18 08:01:27 2013
@@ -34,7 +34,7 @@ http://svn.apache.org/repos/asf/tomcat</
 <a href="http://svn.apache.org/viewvc/tomcat/">web view of the repository</a>.</p>
 
 <p>The directories below this level are:</p>
-<table>
+<table class="defaultTable">
   <tr>
     <th>Directory</th><th>Contents</th>
   </tr>
@@ -52,8 +52,8 @@ http://svn.apache.org/repos/asf/tomcat</
         <code>/jk/trunk/</code></a>.</td>
   </tr>
   <tr>
-    <td><a href="http://svn.apache.org/repos/asf/tomcat/maven-plugin">
-        <nobr><code>/maven-plugin/</code></nobr></a></td>
+    <td style="white-space: nowrap;"><a href="http://svn.apache.org/repos/asf/tomcat/maven-plugin">
+        <code>/maven-plugin/</code></a></td>
     <td>The Apache Tomcat Maven Plugin source code and website.</td>
   </tr>
   <tr>

Modified: tomcat/site/trunk/xdocs/tools.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tools.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/tools.xml (original)
+++ tomcat/site/trunk/xdocs/tools.xml Wed Sep 18 08:01:27 2013
@@ -22,10 +22,10 @@ and a committer should be able to fix it
 </section>
 
 <section name="Apache Tools">
-<table>
+<table class="defaultTable">
 <tr>
   <td><a href="http://ant.apache.org/">
-      <img src="http://ant.apache.org/images/ant_logo_medium.gif"/></a></td>
+      <img src="http://ant.apache.org/images/ant_logo_medium.gif" alt="Apache Ant"/></a></td>
   <td><p>Apache Tomcat is built using Apache Ant.</p>
   </td>
 </tr>
@@ -33,38 +33,38 @@ and a committer should be able to fix it
 </section>
 
 <section name="Open Source Tools">
-<table>
+<table class="defaultTable">
 <tr>
   <td><a href="http://www.eclipse.org/" rel="nofollow">
-      <img src="images/eclipse.gif"/></a></td>
+      <img src="images/eclipse.gif" alt="Eclipse"/></a></td>
   <td><p>A variety of IDEs are used by the Tomcat developers. One of them is
       the Eclipse IDE.</p>
   </td>
 </tr>
 <tr>
   <td><a href="http://www.ucdetector.org/" rel="nofollow">
-      <img src="http://www.ucdetector.org/ucdetector32.png"/></a></td>
+      <img src="http://www.ucdetector.org/ucdetector32.png" alt="UCDetector"/></a></td>
   <td><p>The Unnecessary Code Detector is used by the Tomcat developers to
       identify code to be removed from future versions of Tomcat.</p>
   </td>
 </tr>
 <tr>
   <td><a href="http://findbugs.sourceforge.net/" rel="nofollow">
-      <img src="http://findbugs.sourceforge.net/buggy-sm.png"/></a></td>
+      <img src="http://findbugs.sourceforge.net/buggy-sm.png" alt="FindBugs"/></a></td>
   <td><p>FindBugs is used by the Tomcat developers to identify potential coding
       errors.</p>
   </td>
 </tr>
 <tr>
   <td><a href="http://checkstyle.sourceforge.net/" rel="nofollow">
-      <img src="http://checkstyle.sourceforge.net/images/logo.png"/></a></td>
+      <img src="http://checkstyle.sourceforge.net/images/logo.png" alt="Checkstyle"/></a></td>
   <td><p>Checkstyle is used by the Tomcat developers to maintain the Tomcat
       coding standard.</p>
   </td>
 </tr>
 <tr>
   <td><a href="http://www.farmanager.com/index.php?l=en" rel="nofollow">
-      <img src="images/far-icon.png"/></a></td>
+      <img src="images/far-icon.png" alt="Far Manager"/></a></td>
   <td><p>Far Manager is a two-panel file manager application for
       Microsoft Windows. It works in console mode and is very useful
       to run command-line tools and make small edits that do not require
@@ -76,10 +76,10 @@ and a committer should be able to fix it
 </section>
 
 <section name="Commercial Tools">
-<table>
+<table class="defaultTable">
 <tr>
   <td><a href="http://www.yourkit.com/" rel="nofollow">
-      <img src="images/yjp.gif"/></a></td>
+      <img src="images/yjp.gif" alt="YourKit"/></a></td>
   <td><p>YourKit, LLC kindly provide free licenses for the YourKit Java Profiler
       to open source projects. YourKit Java Profiler is primarily used to
       investigate performance and memory leak issues reported in Apache Tomcat.
@@ -89,7 +89,7 @@ and a committer should be able to fix it
 </tr>
 <tr>
   <td><a href="http://msdn.microsoft.com/" rel="nofollow">
-      <img src="images/msdn.png"/></a></td>
+      <img src="images/msdn.png" alt="MSDN"/></a></td>
   <td><p>Microsoft kindly provide free MSDN licenses to Apache committers that
       have a requirement for them. MSDN is primarily used to provide build and
       test environments for the ISAPI redirector and the Windows APR/native
@@ -99,7 +99,7 @@ and a committer should be able to fix it
 </tr>
 <tr>
   <td><a href="http://www.structure101.com/" rel="nofollow">
-      <img src="images/s101.png"/></a></td>
+      <img src="images/s101.png" alt="Structure 101"/></a></td>
   <td><p>Headway software kindly provide free licenses for Structure 101 to open
       source projects. Structure 101 is primarily being used in Tomcat trunk to
       analyze the current package dependencies and identify areas where they may

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1524323&r1=1524322&r2=1524323&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Wed Sep 18 08:01:27 2013
@@ -143,11 +143,11 @@ builds upon the improvements made in Tom
 <strong>Servlet 3.1</strong>, <strong>JSP 2.3</strong>, <strong>EL 3.0</strong>
 and <strong>Web Socket 1.0</strong> specifications. In addition
 to that, it includes the following improvements:
+</p>
 <ul>
 <li>A single, common resources implementation to replace the multiple resource
     extension features provided in earlier versions.</li>
 </ul>
-</p>
 
 <p>Tomcat 8 is currently in an alpha state. Regular (at least monthly) release
 candidates are being made available for testing. All the specifications are
@@ -168,6 +168,7 @@ feature complete as of 8.0.0-RC1. The re
 Tomcat 6.0.x and implements the <strong>Servlet 3.0</strong>,
 <strong>JSP 2.2</strong> and <strong>EL 2.2</strong> specifications. In addition
 to that, it includes the following improvements:
+</p>
 <ul>
 <li>Web application memory leak detection and prevention</li>
 <li>Improved security for the Manager and Host Manager applications</li>
@@ -175,7 +176,6 @@ to that, it includes the following impro
 <li>Support for including external content directly in a web application</li>
 <li>Refactoring (connectors, lifecycle) and lots of internal code clean-up</li>
 </ul>
-</p>
 
 </section>
 
@@ -186,12 +186,12 @@ to that, it includes the following impro
 Tomcat 5.5.x and implements the <strong>Servlet 2.5</strong> and
 <strong>JSP 2.1</strong> specifications. In addition to that, it includes the
 following improvements:
+</p>
 <ul>
 <li>Memory usage optimizations</li>
 <li>Advanced IO capabilities</li>
 <li>Refactored clustering</li>
 </ul>
-</p>
 
 </section>
 
@@ -209,7 +209,7 @@ for details.
 </p>
 
 <p><strong>Apache Tomcat 5.0.x</strong> improves on Apache Tomcat 4.1 in many
-ways, including:
+ways, including:</p>
 <ul>
 <li>Performance optimizations and reduced garbage collection</li>
 <li>Refactored application deployer, with an optional standalone deployer
@@ -224,7 +224,6 @@ it in production</li>
 <li>Integrated session clustering</li>
 <li>Expanded documentation</li>
 </ul>
-</p>
 
 </section>
 
@@ -239,7 +238,7 @@ implement the <strong>Servlet 2.3</stron
 specifications.</p>
 
 <p><strong>Apache Tomcat 4.1.x</strong> is a refactoring
-of Apache Tomcat 4.0.x, and contains significant enhancements, including:
+of Apache Tomcat 4.0.x, and contains significant enhancements, including:</p>
 <ul>
 <li>JMX based administration features</li>
 <li>JSP and Struts based administration web application</li>
@@ -251,7 +250,6 @@ tools</li>
 <li>Custom Ant tasks to interact with the manager application directly
 from build.xml scripts</li>
 </ul>
-</p>
 
 <p><strong>Apache Tomcat 4.0.x</strong>.  Apache Tomcat 4.0.6 is the old production
 quality release.  The 4.0 servlet



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