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 2019/04/13 21:15:38 UTC

svn commit: r1857496 [1/4] - in /tomcat/site/trunk: ./ docs/ xdocs/

Author: markt
Date: Sat Apr 13 21:15:37 2019
New Revision: 1857496

URL: http://svn.apache.org/viewvc?rev=1857496&view=rev
Log:
Update site for 8.5.40 release

Modified:
    tomcat/site/trunk/build.properties.default
    tomcat/site/trunk/docs/doap_Tomcat.rdf
    tomcat/site/trunk/docs/download-80.html
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/migration-85.html
    tomcat/site/trunk/docs/oldnews.html
    tomcat/site/trunk/docs/security-8.html
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/xdocs/doap_Tomcat.rdf
    tomcat/site/trunk/xdocs/download-80.xml
    tomcat/site/trunk/xdocs/index.xml
    tomcat/site/trunk/xdocs/migration-85.xml
    tomcat/site/trunk/xdocs/oldnews.xml
    tomcat/site/trunk/xdocs/security-8.xml
    tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1857496&r1=1857495&r2=1857496&view=diff
==============================================================================
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Sat Apr 13 21:15:37 2019
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # ----- Tomcat versions -----
 tomcat70=7.0.94
-tomcat85=8.5.39
+tomcat85=8.5.40
 tomcat90=9.0.17
 
 # ----- Download destination -----

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1857496&r1=1857495&r2=1857496&view=diff
==============================================================================
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Sat Apr 13 21:15:37 2019
@@ -68,14 +68,14 @@
       <Version>
         <name>Latest Stable 8.5.x Release</name>
         <created>2019-03-19</created>
-        <revision>8.5.39</revision>
+        <revision>8.5.40</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Latest Stable 7.0.x Release</name>
-        <created>2019-02-21</created>
-        <revision>7.0.93</revision>
+        <created>2019-04-12</created>
+        <revision>7.0.94</revision>
       </Version>
     </release>
     <repository>

Modified: tomcat/site/trunk/docs/download-80.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1857496&r1=1857495&r2=1857496&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Sat Apr 13 21:15:37 2019
@@ -1,237 +1,242 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en">
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
-<link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
-<title>Apache Tomcat&reg; - Apache Tomcat 8 Software Downloads</title>
-</head>
-<body>
-<div id="wrapper">
-<header id="header">
-<div class="clearfix">
-<div class="menu-toggler pull-left" tabindex="1">
-<div class="hamburger"></div>
-</div>
-<a href="http://tomcat.apache.org/"><img class="tomcat-logo pull-left noPrint" alt="Tomcat Home" src="res/images/tomcat.png"></a>
-<h1 class="pull-left">Apache Tomcat<sup>&reg;</sup>
-</h1>
-<div class="asf-logos pull-right">
-<a href="https://www.apache.org/foundation/contributing.html" target="_blank" class="pull-left"><img src="https://www.apache.org/images/SupportApache-small.png" class="support-asf" alt="Support Apache"></a><a href="http://www.apache.org/" target="_blank" class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software Foundation"></a>
-</div>
-</div>
-</header>
-<main id="middle">
-<div>
-<div id="mainLeft">
-<div id="nav-wrapper">
-<form action="https://www.google.com/search" method="get">
-<div class="searchbox">
-<input value="tomcat.apache.org" name="sitesearch" type="hidden"><input placeholder="Search&hellip;" required="required" name="q" id="query" type="search"><button>GO</button>
-</div>
-</form>
-<nav>
-<div>
-<h2>Apache Tomcat</h2>
-<ul>
-<li>
-<a href="./index.html">Home</a>
-</li>
-<li>
-<a href="./taglibs.html">Taglibs</a>
-</li>
-<li>
-<a href="./maven-plugin.html">Maven Plugin</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Download</h2>
-<ul>
-<li>
-<a href="./whichversion.html">Which version?</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-90.cgi">Tomcat 9</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-80.cgi">Tomcat 8</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-70.cgi">Tomcat 7</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-connectors.cgi">Tomcat Connectors</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-native.cgi">Tomcat Native</a>
-</li>
-<li>
-<a href="https://tomcat.apache.org/download-taglibs.cgi">Taglibs</a>
-</li>
-<li>
-<a href="https://archive.apache.org/dist/tomcat/">Archives</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Documentation</h2>
-<ul>
-<li>
-<a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a>
-</li>
-<li>
-<a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a>
-</li>
-<li>
-<a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
-</li>
-<li>
-<a href="./connectors-doc/">Tomcat Connectors</a>
-</li>
-<li>
-<a href="./native-doc/">Tomcat Native</a>
-</li>
-<li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
-</li>
-<li>
-<a href="./migration.html">Migration Guide</a>
-</li>
-<li>
-<a href="./presentations.html">Presentations</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Problems?</h2>
-<ul>
-<li>
-<a href="./security.html">Security Reports</a>
-</li>
-<li>
-<a href="./findhelp.html">Find help</a>
-</li>
-<li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
-</li>
-<li>
-<a href="./lists.html">Mailing Lists</a>
-</li>
-<li>
-<a href="./bugreport.html">Bug Database</a>
-</li>
-<li>
-<a href="./irc.html">IRC</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Get Involved</h2>
-<ul>
-<li>
-<a href="./getinvolved.html">Overview</a>
-</li>
-<li>
-<a href="./source.html">Source code</a>
-</li>
-<li>
-<a href="./ci.html">Buildbot</a>
-</li>
-<li>
-<a href="./tools.html">Tools</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Media</h2>
-<ul>
-<li>
-<a href="https://twitter.com/theapachetomcat">Twitter</a>
-</li>
-<li>
-<a href="https://www.youtube.com/c/ApacheTomcatOfficial">YouTube</a>
-</li>
-<li>
-<a href="https://blogs.apache.org/tomcat/">Blog</a>
-</li>
-</ul>
-</div>
-<div>
-<h2>Misc</h2>
-<ul>
-<li>
-<a href="./whoweare.html">Who We Are</a>
-</li>
-<li>
-<a href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat">Swag</a>
-</li>
-<li>
-<a href="./heritage.html">Heritage</a>
-</li>
-<li>
-<a href="http://www.apache.org">Apache Home</a>
-</li>
-<li>
-<a href="./resources.html">Resources</a>
-</li>
-<li>
-<a href="./contact.html">Contact</a>
-</li>
-<li>
-<a href="./legal.html">Legal</a>
-</li>
-<li>
-<a href="https://www.apache.org/foundation/contributing.html">Support Apache</a>
-</li>
-<li>
-<a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-</li>
-<li>
-<a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
-</li>
-<li>
-<a href="http://www.apache.org/licenses/">License</a>
-</li>
-</ul>
-</div>
-</nav>
-</div>
-</div>
-<div id="mainRight">
-<div id="content">
-<h2 style="display: none;">Content</h2>
-<h3 id="Tomcat_8_Software_Downloads">Tomcat 8 Software Downloads</h3>
-<div class="text">
-    
-<p>Welcome to the Apache Tomcat<sup>&reg;</sup> 8.x software download page.
+    <head>
+        <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="res/css/tomcat.css" rel="stylesheet" type="text/css">
+        <link href="res/css/fonts/fonts.css" rel="stylesheet" type="text/css">
+        <title>Apache Tomcat&reg; - Apache Tomcat 8 Software Downloads</title>
+    </head>
+    <body>
+        <div id="wrapper">
+            <header id="header">
+                <div class="clearfix">
+                    <div class="menu-toggler pull-left" tabindex="1">
+                        <div class="hamburger"></div>
+                    </div>
+                    <a href="http://tomcat.apache.org/"><img class="tomcat-logo pull-left noPrint" alt="Tomcat Home" src="res/images/tomcat.png"></a>
+                    <h1 class="pull-left">
+                        Apache Tomcat<sup>&reg;</sup>
+                    </h1>
+                    <div class="asf-logos pull-right">
+                        <a href="https://www.apache.org/foundation/contributing.html" target="_blank" class="pull-left"><img src="https://www.apache.org/images/SupportApache-small.png" class="support-asf" alt="Support Apache"></a><a href="http://www.apache.org/" target="_blank" class="pull-left"><img src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software Foundation"></a>
+                    </div>
+                </div>
+            </header>
+            <main id="middle">
+                <div>
+                    <div id="mainLeft">
+                        <div id="nav-wrapper">
+                            <form action="https://www.google.com/search" method="get">
+                                <div class="searchbox">
+                                    <input value="tomcat.apache.org" name="sitesearch" type="hidden"><input placeholder="Search&hellip;" required="required" name="q" id="query" type="search"><button>GO</button>
+                                </div>
+                            </form>
+                            <nav>
+                                <div>
+                                    <h2>Apache Tomcat</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./index.html">Home</a>
+                                        </li>
+                                        <li>
+                                            <a href="./taglibs.html">Taglibs</a>
+                                        </li>
+                                        <li>
+                                            <a href="./maven-plugin.html">Maven Plugin</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Download</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./whichversion.html">Which version?</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://tomcat.apache.org/download-90.cgi">Tomcat 9</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://tomcat.apache.org/download-80.cgi">Tomcat 8</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://tomcat.apache.org/download-70.cgi">Tomcat 7</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://tomcat.apache.org/download-connectors.cgi">Tomcat Connectors</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://tomcat.apache.org/download-native.cgi">Tomcat Native</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://tomcat.apache.org/download-taglibs.cgi">Taglibs</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://archive.apache.org/dist/tomcat/">Archives</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Documentation</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a>
+                                        </li>
+                                        <li>
+                                            <a href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a>
+                                        </li>
+                                        <li>
+                                            <a href="./tomcat-7.0-doc/index.html">Tomcat 7.0</a>
+                                        </li>
+                                        <li>
+                                            <a href="./connectors-doc/">Tomcat Connectors</a>
+                                        </li>
+                                        <li>
+                                            <a href="./native-doc/">Tomcat Native</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+                                        </li>
+                                        <li>
+                                            <a href="./migration.html">Migration Guide</a>
+                                        </li>
+                                        <li>
+                                            <a href="./presentations.html">Presentations</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Problems?</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./security.html">Security Reports</a>
+                                        </li>
+                                        <li>
+                                            <a href="./findhelp.html">Find help</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+                                        </li>
+                                        <li>
+                                            <a href="./lists.html">Mailing Lists</a>
+                                        </li>
+                                        <li>
+                                            <a href="./bugreport.html">Bug Database</a>
+                                        </li>
+                                        <li>
+                                            <a href="./irc.html">IRC</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Get Involved</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./getinvolved.html">Overview</a>
+                                        </li>
+                                        <li>
+                                            <a href="./source.html">Source code</a>
+                                        </li>
+                                        <li>
+                                            <a href="./ci.html">Buildbot</a>
+                                        </li>
+                                        <li>
+                                            <a href="./tools.html">Tools</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Media</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="https://twitter.com/theapachetomcat">Twitter</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://www.youtube.com/c/ApacheTomcatOfficial">YouTube</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://blogs.apache.org/tomcat/">Blog</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div>
+                                    <h2>Misc</h2>
+                                    <ul>
+                                        <li>
+                                            <a href="./whoweare.html">Who We Are</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat">Swag</a>
+                                        </li>
+                                        <li>
+                                            <a href="./heritage.html">Heritage</a>
+                                        </li>
+                                        <li>
+                                            <a href="http://www.apache.org">Apache Home</a>
+                                        </li>
+                                        <li>
+                                            <a href="./resources.html">Resources</a>
+                                        </li>
+                                        <li>
+                                            <a href="./contact.html">Contact</a>
+                                        </li>
+                                        <li>
+                                            <a href="./legal.html">Legal</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://www.apache.org/foundation/contributing.html">Support Apache</a>
+                                        </li>
+                                        <li>
+                                            <a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+                                        </li>
+                                        <li>
+                                            <a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
+                                        </li>
+                                        <li>
+                                            <a href="http://www.apache.org/licenses/">License</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </nav>
+                        </div>
+                    </div>
+                    <div id="mainRight">
+                        <div id="content">
+                            <h2 style="display: none;">Content</h2>
+                            <h3 id="Tomcat_8_Software_Downloads">Tomcat 8 Software Downloads</h3>
+                            <div class="text">
+                                    
+                                <p>
+                                    Welcome to the Apache Tomcat<sup>&reg;</sup> 8.x software download page.
     This page provides download links for obtaining the latest versions of
     Tomcat 8.x software, as well as links to the archives of older releases.
-    </p>
     
-<p>Users of Tomcat 8.0.x should be aware that it has reached
+                                </p>
+                                    
+                                <p>
+                                    Users of Tomcat 8.0.x should be aware that it has reached
     <a href="tomcat-80-eol.html">end of life</a>. Users of Tomcat 8.0.x should
-    upgrade to 8.5.x or later.</p>
-    
-<p>Note: End of life has been announced for 8.0.x only. 8.5.x is not
+    upgrade to 8.5.x or later.
+                                </p>
+                                    
+                                <p>Note: End of life has been announced for 8.0.x only. 8.5.x is not
     affected by this announcement.</p>
-  
-</div>
-<h3 id="Quick_Navigation">Quick Navigation</h3>
-<div class="text">
-
-[define v]8.5.39[end]
+                                  
+                            </div>
+                            <h3 id="Quick_Navigation">Quick Navigation</h3>
+                            <div class="text">
+                                [define v]8.5.40[end]
         <a href="https://www.apache.org/dist/tomcat/tomcat-8/KEYS">KEYS</a> |
         <a href="#[v]">[v]</a> |
         <a href="[preferred]tomcat/tomcat-8" rel="nofollow">Browse</a> |
         <a href="https://archive.apache.org/dist/tomcat/tomcat-8">Archives</a>
       
-</div>
-<h3 id="Release_Integrity">Release Integrity</h3>
-<div class="text">
-    
-<p>You <strong>must</strong>
+                            </div>
+                            <h3 id="Release_Integrity">Release Integrity</h3>
+                            <div class="text">
+                                    
+                                <p>
+                                    You <strong>must</strong>
     <a href="https://www.apache.org/info/verification.html">verify</a> the
     integrity of the downloaded files. We provide OpenPGP signatures for every
     release file.  This signature should be matched against the
@@ -240,21 +245,26 @@
     provide <code>SHA-512</code> checksums for every release file. After you
     download the file, you should calculate a checksum for your download, and
     make sure it is the same as ours.
-    </p>
-  
-</div>
-<h3 id="Mirrors">Mirrors</h3>
-<div class="text">
-       
     
-<p>You are currently using <b>[preferred]</b>.  If you
+                                </p>
+                                  
+                            </div>
+                            <h3 id="Mirrors">Mirrors</h3>
+                            <div class="text">
+                                       
+    
+                                <p>
+                                    You are currently using <b>[preferred]</b>.  If you
        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 alt="Logo" src="[logo]"></a>[end]</p>
-<form action="[location]" method="get" id="SelectMirror">
-<p>
-       Other mirrors: <select name="Preferred">
+       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]
          [end]
@@ -265,195 +275,207 @@
            [for backup]<option value="[backup]">[backup] (backup)</option>[end]
            [end]
          </select><input type="submit" value="Change">
-</p>
-</form>
-      
+                                    </p>
+                                </form>
+                                      
    
   
-</div>
-<h3 id="[v]">[v]</h3>
-<div class="text">
-    
-<p>
-    Please see the 
+                            </div>
+                            <h3 id="[v]">[v]</h3>
+                            <div class="text">
+                                    
+                                <p>
+                                        Please see the 
     <a href="[preferred]tomcat/tomcat-8/v[v]/README.html" rel="nofollow">README</a>
     file for packaging information.  It explains what every distribution contains.
-    </p>
-
-      
-<div class="subsection">
-<h4 id="Binary_Distributions">Binary Distributions</h4>
-<div class="text">
-      
-<ul>
-        
-<li>Core:
-          <ul>
-          
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].zip" rel="nofollow">zip</a> 
+    
+                                </p>
+                                      
+                                <div class="subsection">
+                                    <h4 id="Binary_Distributions">Binary Distributions</h4>
+                                    <div class="text">
+                                              
+                                        <ul>
+                                                    
+                                            <li>
+                                                Core:
+          
+                                                <ul>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].zip" rel="nofollow">zip</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].zip.asc">pgp</a>,
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].zip.sha512">sha512</a>)
-          </li>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].tar.gz" rel="nofollow">tar.gz</a> 
+                                                    </li>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].tar.gz" rel="nofollow">tar.gz</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].tar.gz.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].tar.gz.sha512">sha512</a>)
-          </li>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-windows-x86.zip" rel="nofollow">32-bit Windows zip</a> 
+                                                    </li>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-windows-x86.zip" rel="nofollow">32-bit Windows zip</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-windows-x86.zip.sha512">sha512</a>)
-          </li>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-windows-x64.zip" rel="nofollow">64-bit Windows zip</a> 
+                                                    </li>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-windows-x64.zip" rel="nofollow">64-bit Windows zip</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-windows-x64.zip.sha512">sha512</a>)
-          </li>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].exe" rel="nofollow">32-bit/64-bit Windows Service Installer</a> 
+                                                    </li>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].exe" rel="nofollow">32-bit/64-bit Windows Service Installer</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].exe.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v].exe.sha512">sha512</a>)
-          </li>
-          
-</ul>
-        
-</li>
-        
-<li>Full documentation:
-          <ul>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz" rel="nofollow">tar.gz</a> 
+                                                    </li>
+                                                              
+                                                </ul>
+                                                        
+                                            </li>
+                                                    
+                                            <li>
+                                                Full documentation:
+          
+                                                <ul>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz" rel="nofollow">tar.gz</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.sha512">sha512</a>)
-          </li>
-          
-</ul>
-        
-</li>
-        
-<li>Deployer:
-          <ul>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-deployer.zip" rel="nofollow">zip</a> 
+                                                    </li>
+                                                              
+                                                </ul>
+                                                        
+                                            </li>
+                                                    
+                                            <li>
+                                                Deployer:
+          
+                                                <ul>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-deployer.zip" rel="nofollow">zip</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-deployer.zip.asc">pgp</a>,  
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-deployer.zip.sha512">sha512</a>)
-          </li>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz" rel="nofollow">tar.gz</a> 
+                                                    </li>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz" rel="nofollow">tar.gz</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/apache-tomcat-[v]-deployer.tar.gz.sha512">sha512</a>)
-          </li>
           
-</ul>
-        
-</li>
-        
-<li>Extras:
-          <ul>
-          
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/extras/catalina-jmx-remote.jar" rel="nofollow">JMX Remote jar</a> 
+                                                    </li>
+                                                              
+                                                </ul>
+                                                        
+                                            </li>
+                                                    
+                                            <li>
+                                                Extras:
+          
+                                                <ul>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/extras/catalina-jmx-remote.jar" rel="nofollow">JMX Remote jar</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/extras/catalina-jmx-remote.jar.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/extras/catalina-jmx-remote.jar.sha512">sha512</a>)
-          </li>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/extras/catalina-ws.jar" rel="nofollow">Web services jar</a> 
+                                                    </li>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/extras/catalina-ws.jar" rel="nofollow">Web services jar</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/extras/catalina-ws.jar.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/extras/catalina-ws.jar.sha512">sha512</a>)
-          </li>
-          
-</ul>
-        
-</li>
-        
-<li>Embedded:
-          <ul>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/embed/apache-tomcat-[v]-embed.tar.gz" rel="nofollow">tar.gz</a> 
+                                                    </li>
+                                                              
+                                                </ul>
+                                                        
+                                            </li>
+                                                    
+                                            <li>
+                                                Embedded:
+          
+                                                <ul>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/embed/apache-tomcat-[v]-embed.tar.gz" rel="nofollow">tar.gz</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/embed/apache-tomcat-[v]-embed.tar.gz.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/embed/apache-tomcat-[v]-embed.tar.gz.sha512">sha512</a>)
-          </li>
           
-<li>
-            
-<a href="[preferred]tomcat/tomcat-8/v[v]/bin/embed/apache-tomcat-[v]-embed.zip" rel="nofollow">zip</a> 
+                                                    </li>
+                                                              
+                                                    <li>
+                                                                    <a href="[preferred]tomcat/tomcat-8/v[v]/bin/embed/apache-tomcat-[v]-embed.zip" rel="nofollow">zip</a> 
             (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/embed/apache-tomcat-[v]-embed.zip.asc">pgp</a>, 
             <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/bin/embed/apache-tomcat-[v]-embed.zip.sha512">sha512</a>)
-          </li>
           
-</ul>
-        
-</li>
-      
-</ul>
-      
-</div>
-</div>
-      
+                                                    </li>
+                                                              
+                                                </ul>
+                                                        
+                                            </li>
+                                                  
+                                        </ul>
+                                              
+                                    </div>
+                                </div>
+                                      
  
       
       
-<div class="subsection">
-<h4 id="Source_Code_Distributions">Source Code Distributions</h4>
-<div class="text">
-      
-<ul>
-        
-<li>
-          
-<a href="[preferred]tomcat/tomcat-8/v[v]/src/apache-tomcat-[v]-src.tar.gz" rel="nofollow">tar.gz</a> 
+                                <div class="subsection">
+                                    <h4 id="Source_Code_Distributions">Source Code Distributions</h4>
+                                    <div class="text">
+                                              
+                                        <ul>
+                                                    
+                                            <li>
+                                                          <a href="[preferred]tomcat/tomcat-8/v[v]/src/apache-tomcat-[v]-src.tar.gz" rel="nofollow">tar.gz</a> 
           (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/src/apache-tomcat-[v]-src.tar.gz.asc">pgp</a>,
           <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/src/apache-tomcat-[v]-src.tar.gz.sha512">sha512</a>)
-        </li>
         
-<li>
-          
-<a href="[preferred]tomcat/tomcat-8/v[v]/src/apache-tomcat-[v]-src.zip" rel="nofollow">zip</a> 
+                                            </li>
+                                                    
+                                            <li>
+                                                          <a href="[preferred]tomcat/tomcat-8/v[v]/src/apache-tomcat-[v]-src.zip" rel="nofollow">zip</a> 
           (<a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/src/apache-tomcat-[v]-src.zip.asc">pgp</a>,
           <a href="https://www.apache.org/dist/tomcat/tomcat-8/v[v]/src/apache-tomcat-[v]-src.zip.sha512">sha512</a>)
-        </li>
-      
-</ul>
-      
-</div>
-</div>
-      
+        
+                                            </li>
+                                                  
+                                        </ul>
+                                              
+                                    </div>
+                                </div>
+                                      
 
     
-</div>
-</div>
-</div>
-</div>
-</main>
-<footer id="footer">
-    Copyright &copy; 1999-2019, The Apache Software Foundation
-    <br>
-    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </main>
+            <footer id="footer">
+                    Copyright &copy; 1999-2019, The Apache Software Foundation
+    
+                <br>
+                    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
     project logo are either registered trademarks or trademarks of the Apache
     Software Foundation.
-  </footer>
-</div>
-<script src="res/js/tomcat.js"></script>
-</body>
+  
+            </footer>
+        </div>
+        <script src="res/js/tomcat.js"></script>
+    </body>
 </html>

Modified: tomcat/site/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1857496&r1=1857495&r2=1857496&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Sat Apr 13 21:15:37 2019
@@ -239,80 +239,77 @@ these users and their stories are listed
 project logo are trademarks of the Apache Software Foundation.</p>
                                 
                             </div>
-                            <h3 id="Tomcat_7.0.94_Released">
-                                <span class="pull-right">2019-04-12</span> Tomcat 7.0.94 Released
+                            <h3 id="Tomcat_8.5.40_Released">
+                                <span class="pull-right">2019-04-12</span> Tomcat 8.5.40 Released
                             </h3>
                             <div class="text">
                                 
                                 <p>
-The Apache Tomcat Project is proud to announce the release of version 7.0.94 of
-Apache Tomcat. This release contains a number of bug fixes and improvements
-compared to version 7.0.93.</p>
+The Apache Tomcat Project is proud to announce the release of version 8.5.40
+of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features
+pulled forward from Tomcat 9.0.x. The minimum Java version and implemented
+specification versions remain unchanged. The notable changes compared
+to 8.5.39 include:</p>
                                 
                                 <ul>
                                     
-                                    <li>Fix for CVE-2019-0232, a RCE vulnerability on Windows</li>
+                                    <li>Fix for CVE-2019-0232, an RCE vulnerability on Windows</li>
                                     
                                     <li>Add support for Java 11 to the JSP compiler. Java 12 and 13 are also
     now supported if used with a ECJ version with support for those  Java
     versions</li>
                                     
-                                    <li>Update Tomcat's packaged-renamed copy of Apache Commons DBCP to the
-    latest DBCP 1.4.x and Pool 1.6.x source (as of 2019-03-15) to pick up
-    various bug fixes</li>
+                                    <li>Various NIO2 stability improvements</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.94_(markt)">Tomcat 7 changelog</a>.
+<a href="tomcat-8.5-doc/changelog.html#Tomcat_8.5.40_(markt)">Tomcat 8.5
+changelog</a>.
 
                                 </p>
                                 
                                 <p style="text-align: center;">
                                     
-                                    <a href="https://tomcat.apache.org/download-70.cgi">Download</a>
+                                    <a href="https://tomcat.apache.org/download-80.cgi">Download</a>
 
                                 </p>
                                 
                             </div>
-                            <h3 id="Tomcat_8.5.39_Released">
-                                <span class="pull-right">2019-03-19</span> Tomcat 8.5.39 Released
+                            <h3 id="Tomcat_7.0.94_Released">
+                                <span class="pull-right">2019-04-12</span> Tomcat 7.0.94 Released
                             </h3>
                             <div class="text">
                                 
                                 <p>
-The Apache Tomcat Project is proud to announce the release of version 8.5.39
-of Apache Tomcat. Apache Tomcat 8.5.x replaces 8.0.x and includes new features
-pulled forward from Tomcat 9.0.x. The minimum Java version and implemented
-specification versions remain unchanged. The notable changes compared
-to 8.5.38 include:</p>
+The Apache Tomcat Project is proud to announce the release of version 7.0.94 of
+Apache Tomcat. This release contains a number of bug fixes and improvements
+compared to version 7.0.93.</p>
                                 
                                 <ul>
                                     
-                                    <li>The APR/Native connector now supports both OpenSSL and JSSE TLS
-    configuration syntax (NIO and NIO2 already support this)</li>
-                                    
-                                    <li>Various improvements to NIO2</li>
+                                    <li>Fix for CVE-2019-0232, an RCE vulnerability on Windows</li>
                                     
-                                    <li>Various fixes for HTTP/2 push requests</li>
+                                    <li>Add support for Java 11 to the JSP compiler. Java 12 and 13 are also
+    now supported if used with a ECJ version with support for those  Java
+    versions</li>
                                     
-                                    <li>Refactor error handling so that errors that occur early in request
-    processing are handled by the application's error handling where the
-    application can be identified</li>
+                                    <li>Update Tomcat's packaged-renamed copy of Apache Commons DBCP to the
+    latest DBCP 1.4.x and Pool 1.6.x source (as of 2019-03-15) to pick up
+    various bug fixes</li>
                                     
                                 </ul>
                                 
                                 <p>
                                     Full details of these changes, and all the other changes, are available in the
-<a href="tomcat-8.5-doc/changelog.html#Tomcat_8.5.39_(markt)">Tomcat 8.5
-changelog</a>.
+<a href="tomcat-7.0-doc/changelog.html#Tomcat_7.0.94_(markt)">Tomcat 7 changelog</a>.
 
                                 </p>
                                 
                                 <p style="text-align: center;">
                                     
-                                    <a href="https://tomcat.apache.org/download-80.cgi">Download</a>
+                                    <a href="https://tomcat.apache.org/download-70.cgi">Download</a>
 
                                 </p>
                                 



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