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 2018/04/17 14:04:26 UTC

svn commit: r1829368 [22/22] - in /tomcat/site/trunk: docs/ xdocs/stylesheets/

Modified: tomcat/site/trunk/docs/tools.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tools.html (original)
+++ tomcat/site/trunk/docs/tools.html Tue Apr 17 14:04:25 2018
@@ -1,382 +1,387 @@
 <!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; - Developer Tools</title>
-        <meta name="author" content="Apache Tomcat Project">
-    </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>TomcatCon</h2>
-                                    <ul>
-                                        <li>
-                                            <a href="./conference.html">Training, Manchester</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-8.0-doc/index.html">Tomcat 8.0</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="./svn.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="./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>
-                                    </ul>
-                                </div>
-                            </nav>
-                        </div>
-                    </div>
-                    <div id="mainRight">
-                        <div id="content">
-                            <h2 style="display: none;">Content</h2>
-                            <h3 id="Table_of_Contents">Table of Contents</h3>
-                            <div class="text">
-                                
-                                <ul>
-                                    <li>
-                                        <a href="#Overview">Overview</a>
-                                    </li>
-                                    <li>
-                                        <a href="#Apache_Tools">Apache Tools</a>
-                                    </li>
-                                    <li>
-                                        <a href="#Open_Source_Tools">Open Source Tools</a>
-                                    </li>
-                                    <li>
-                                        <a href="#Commercial_Tools">Commercial Tools</a>
-                                    </li>
-                                </ul>
-                                
-                            </div>
-                            <h3 id="Overview">Overview</h3>
-                            <div class="text">
-                                
-                                <p>
-                                    This page lists the various tools that the Apache Tomcat project uses. Not
+<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; - Developer Tools</title>
+<meta name="author" content="Apache Tomcat Project">
+</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-8.0-doc/index.html">Tomcat 8.0</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="./svn.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="./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>
+</ul>
+</div>
+</nav>
+</div>
+</div>
+<div id="mainRight">
+<div id="content">
+<h2 style="display: none;">Content</h2>
+<h3 id="Table_of_Contents">Table of Contents</h3>
+<div class="text">
+
+<ul>
+<li>
+<a href="#Overview">Overview</a>
+</li>
+<li>
+<a href="#Apache_Tools">Apache Tools</a>
+</li>
+<li>
+<a href="#Open_Source_Tools">Open Source Tools</a>
+</li>
+<li>
+<a href="#Commercial_Tools">Commercial Tools</a>
+</li>
+</ul>
+
+</div>
+<h3 id="Overview">Overview</h3>
+<div class="text">
+
+<p>This page lists the various tools that the Apache Tomcat project uses. Not
 all developers use every tool. There are almost certainly some tools that are
 missing. If you are a committer, you know how to fix this. If you are not a
 committer, send a short note to the <a href="lists.html#tomcat-dev">developer
 mailing list</a> (you'll need to subscribe if you are not already subscribed)
-and a committer should be able to fix it for you.
-                                </p>
-                                
-                            </div>
-                            <h3 id="Apache_Tools">Apache Tools</h3>
-                            <div class="text">
-                                
-                                <table class="defaultTable">
-                                    
-                                    <tr>
-                                          <td><a href="http://ant.apache.org/">
+and a committer should be able to fix it for you.</p>
+
+</div>
+<h3 id="Apache_Tools">Apache Tools</h3>
+<div class="text">
+
+<table class="defaultTable">
+
+<tr>
+  
+<td><a href="http://ant.apache.org/">
       <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>
+<p>Apache Tomcat is built using Apache Ant.</p>
+  
+</td>
+
+</tr>
+
+</table>
 
-                                    </tr>
-                                    
-                                </table>
-                                
-                            </div>
-                            <h3 id="Open_Source_Tools">Open Source Tools</h3>
-                            <div class="text">
-                                
-                                <table class="defaultTable">
-                                    
-                                    <tr>
-                                          <td><a href="http://www.eclipse.org/" rel="nofollow">
+</div>
+<h3 id="Open_Source_Tools">Open Source Tools</h3>
+<div class="text">
+
+<table class="defaultTable">
+
+<tr>
+  
+<td><a href="http://www.eclipse.org/" rel="nofollow">
       <img src="res/images/eclipse.gif" alt="Eclipse"></a></td>
   <td>
-                                            <p>A variety of IDEs are used by the Tomcat developers. One of them is
+<p>A variety of IDEs are used by the Tomcat developers. One of them is
       the Eclipse IDE.</p>
-                                              </td>
+  
+</td>
+
+</tr>
 
-                                    </tr>
-                                    
-                                    <tr>
-                                          <td><a href="http://www.ucdetector.org/" rel="nofollow">
+<tr>
+  
+<td><a href="http://www.ucdetector.org/" rel="nofollow">
       <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
+<p>The Unnecessary Code Detector is used by the Tomcat developers to
       identify code to be removed from future versions of Tomcat.</p>
-                                              </td>
+  
+</td>
+
+</tr>
 
-                                    </tr>
-                                    
-                                    <tr>
-                                          <td><a href="http://findbugs.sourceforge.net/" rel="nofollow">
+<tr>
+  
+<td><a href="http://findbugs.sourceforge.net/" rel="nofollow">
       <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
+<p>FindBugs is used by the Tomcat developers to identify potential coding
       errors.</p>
-                                              </td>
+  
+</td>
 
-                                    </tr>
-                                    
-                                    <tr>
-                                          <td><a href="http://checkstyle.sourceforge.net/" rel="nofollow">
+</tr>
+
+<tr>
+  
+<td><a href="http://checkstyle.sourceforge.net/" rel="nofollow">
       <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
+<p>Checkstyle is used by the Tomcat developers to maintain the Tomcat
       coding standard.</p>
-                                              </td>
+  
+</td>
 
-                                    </tr>
-                                    
-                                    <tr>
-                                          <td><a href="http://www.farmanager.com/index.php?l=en" rel="nofollow">
+</tr>
+
+<tr>
+  
+<td><a href="http://www.farmanager.com/index.php?l=en" rel="nofollow">
       <img src="res/images/far-icon.png" alt="Far Manager"></a></td>
   <td>
-                                            <p>Far Manager is a two-panel file manager application for
+<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
       an IDE. It is free software since version 1.75 build 2629 and
       open source since version 2.0.</p>
-                                              </td>
+  
+</td>
+
+</tr>
+
+</table>
+
+</div>
+<h3 id="Commercial_Tools">Commercial Tools</h3>
+<div class="text">
+
+<table class="defaultTable">
 
-                                    </tr>
-                                    
-                                </table>
-                                
-                            </div>
-                            <h3 id="Commercial_Tools">Commercial Tools</h3>
-                            <div class="text">
-                                
-                                <table class="defaultTable">
-                                    
-                                    <tr>
-                                          <td><a href="http://www.yourkit.com/" rel="nofollow">
+<tr>
+  
+<td><a href="http://www.yourkit.com/" rel="nofollow">
       <img src="res/images/yjp.gif" alt="YourKit"></a></td>
   <td>
-                                            <p>YourKit, LLC kindly provide free licenses for the YourKit Java Profiler
+<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.
       It was particularly useful when working on the memory leak detection and
       prevention code.</p>
-                                              </td>
+  
+</td>
+
+</tr>
 
-                                    </tr>
-                                    
-                                    <tr>
-                                          <td><a href="http://www.structure101.com/" rel="nofollow">
+<tr>
+  
+<td><a href="http://www.structure101.com/" rel="nofollow">
       <img src="res/images/s101.png" alt="Structure 101"></a></td>
   <td>
-                                            <p>Headway software kindly provide free licenses for Structure 101 to open
+<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
       be simplified.</p>
-                                               </td>
+   
+</td>
+
+</tr>
 
-                                    </tr>
-                                    
-                                    <tr>
-                                          <td><a href="http://www.harukizaemon.com/simian/index.html" rel="nofollow">
+<tr>
+  
+<td><a href="http://www.harukizaemon.com/simian/index.html" rel="nofollow">
       <img src="res/images/simian.jpg" alt="Simian"></a></td>
   <td>
-                                            <p>Simon Harris kindly provides free licenses for Simian (Similarity
+<p>Simon Harris kindly provides free licenses for Simian (Similarity
       Analyzer) to open source projects. Simian is primarily being used in
       Tomcat trunk to reduce code duplication.</p>
-                                              </td>
+  
+</td>
+
+</tr>
 
-                                    </tr>
-                                    
-                                </table>
-                                
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </main>
-            <footer id="footer">
-                    Copyright &copy; 1999-2018, The Apache Software Foundation
-    
-                <br>
-                    Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
+</table>
+
+</div>
+</div>
+</div>
+</div>
+</main>
+<footer id="footer">
+    Copyright &copy; 1999-2018, 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/whichversion.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Tue Apr 17 14:04:25 2018
@@ -50,14 +50,6 @@
 </ul>
 </div>
 <div>
-<h2>TomcatCon</h2>
-<ul>
-<li>
-<a href="./conference.html">Training, Manchester</a>
-</li>
-</ul>
-</div>
-<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/whoweare.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Tue Apr 17 14:04:25 2018
@@ -1,228 +1,219 @@
 <!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; - Who We Are</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>TomcatCon</h2>
-                                    <ul>
-                                        <li>
-                                            <a href="./conference.html">Training, Manchester</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-8.0-doc/index.html">Tomcat 8.0</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="./svn.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="./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>
-                                    </ul>
-                                </div>
-                            </nav>
-                        </div>
-                    </div>
-                    <div id="mainRight">
-                        <div id="content">
-                            <h2 style="display: none;">Content</h2>
-                            <h3 id="Who_We_Are">Who We Are</h3>
-                            <div class="text">
-                                
-                                <p>
-                                    The Apache Tomcat Project operates on a meritocracy: the more you do,
+<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; - Who We Are</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-8.0-doc/index.html">Tomcat 8.0</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="./svn.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="./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>
+</ul>
+</div>
+</nav>
+</div>
+</div>
+<div id="mainRight">
+<div id="content">
+<h2 style="display: none;">Content</h2>
+<h3 id="Who_We_Are">Who We Are</h3>
+<div class="text">
+
+<p>
+The Apache Tomcat Project operates on a meritocracy: the more you do,
 the more responsibility you will obtain. This page lists all of the
 people who have gone the extra mile and are Committers or members of
 the Project Management Committee (PMC). If you would like to help, please
 see the overview on <a href="getinvolved.html">getting
 involved</a>.
+</p>
+
 
-                                </p>
-                                
-                                <p>
-                                    We ask that you please do not send us emails privately asking for support. We
+<p>
+We ask that you please do not send us emails privately asking for support. We
 are non-paid volunteers who help out with the project and we do not
 necessarily have the time or energy to help people on an individual
 basis. Instead, we have setup <a href="./lists.html">mailing
@@ -230,226 +221,265 @@ lists</a> which contain hundreds of indi
 detailed requests for help. The benefit of using mailing lists over private
 communication is that it is a shared resource where others can also learn from
 common mistakes and as a community we all grow together.
+</p>
 
-                                </p>
-                                
-                                <p>
+
+<p>
 The following is a list of the Apache Tomcat PMC members and Committers with
 short bios for some of them.</p>
-                                
-                                <p>
-                                    A complete list of all the Apache Committers is
+
+
+<p>
+A complete list of all the Apache Committers is
 <a href="http://people.apache.org/committer-index.html">also available</a>.
 (It's a long list, so please be patient.)
+</p>
+
+
+</div>
+<h3 id="PMC_Members_&amp;_Committers">PMC Members &amp; Committers</h3>
+<div class="text">
+
+
+<h4>PMC Chair</h4>
+
+<p>
+<b>Mladen Turk</b> (mturk at apache.org)<br>
+</p>
+
+
+
+<h4>PMC Members &amp; Committers</h4>
+
+
+<p>
+<b>Jean-Francois Arcand</b> (jfarcand at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Bill Barker</b> (billbarker at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Ognjen Blagojević</b> (ognjen at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Emmanuel Bourg</b> (ebourg at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Jeremy Boynes</b> (jboynes at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Jean-Frederic Clere</b> (jfclere at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Keiichi Fujino</b> (kfujino at apache.org)<br>
+</p>
+
+
+
+
+<p>
+<b>Tim Funk</b> (funkman at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Violeta Georgieva</b> (violetagg at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Henri Gomez</b> (hgomez at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Martin Grigorov</b> (mgrigorov at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Filip Hanik</b> (fhanik at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Jacob Hookom</b> (jhook at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Jim Jagielski</b> (jim at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Rainer Jung</b> (rjung at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Konstantin Kolinko</b> (kkolinko at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Olivier Lamy</b> (olamy at apache.org)<br>
+</p>
 
-                                </p>
-                                
-                            </div>
-                            <h3 id="PMC_Members_&amp;_Committers">PMC Members &amp; Committers</h3>
-                            <div class="text">
-                                
-                                <h4>PMC Chair</h4>
-                                
-                                <p>
-                                    <b>Mladen Turk</b> (mturk at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <h4>PMC Members &amp; Committers</h4>
-                                
-                                <p>
-                                    <b>Jean-Francois Arcand</b> (jfarcand at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Bill Barker</b> (billbarker at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Ognjen Blagojević</b> (ognjen at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Emmanuel Bourg</b> (ebourg at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Jeremy Boynes</b> (jboynes at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Jean-Frederic Clere</b> (jfclere at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Keiichi Fujino</b> (kfujino at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Tim Funk</b> (funkman at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Violeta Georgieva</b> (violetagg at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Henri Gomez</b> (hgomez at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Martin Grigorov</b> (mgrigorov at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Filip Hanik</b> (fhanik at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Jacob Hookom</b> (jhook at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Jim Jagielski</b> (jim at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Rainer Jung</b> (rjung at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Konstantin Kolinko</b> (kkolinko at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Olivier Lamy</b> (olamy at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Sylvain Laurent</b> (slaurent at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Remy Maucherat</b> (remm at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Costin Manolache</b> (costin at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Konstantin Prei&szlig;er</b> (kpreisser at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Peter Rossbach</b> (pero at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>William A. Rowe Jr.</b> (wrowe at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Christopher Schultz</b> (schultz at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Felix Schumacher</b> (fschumacher at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Coty Sutherland</b> (csutherl at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Eiji Takahashi</b> (eijit at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Mark Thomas</b> (markt at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Keith Wannamaker</b> (keith at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Andr&eacute; Warnier</b> (soliplaya at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Tim Whittington</b> (timw at apache.org)
-                                    <br>
-                                </p>
-                                
-                                <p>
-                                    <b>Huxing Zhang</b> (huxing at apache.org)
-                                    <br>
-                                </p>
-                                
-                            </div>
-                            <h3 id="Emeritus_PMC_members">Emeritus PMC members</h3>
-                            <div class="text">
-                                
-                                <p>
-                                    <a href="http://www.apache.org/foundation/glossary.html#Emeritus">
-Emeritus</a> is defined in the Apache glossary.
-                                </p>
-                                
-                                <p>
-                                    
-                                    <p>
-                                        <b>Ian Darwin</b> (idarwin at apache.org)
-                                    </p>
-                                    
-                                </p>
-                                
-                                <p>
-                                    <b>Yoav Shapira</b> (yoavs at apache.org)
-                                </p>
-                                
-                            </div>
-                            <h3 id="Emeritus_Committers">Emeritus Committers</h3>
-                            <div class="text">
-                                
-                                <p>
-                                    <a href="http://www.apache.org/foundation/glossary.html#Emeritus">
-Emeritus</a> is defined in the Apache glossary.
-                                </p>
-                                
-                                <p>
-                                    
-                                    <b>James Duncan Davidson</b> (duncan at apache.org),
+
+
+<p>
+<b>Sylvain Laurent</b> (slaurent at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Remy Maucherat</b> (remm at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Costin Manolache</b> (costin at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Konstantin Prei&szlig;er</b> (kpreisser at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Peter Rossbach</b> (pero at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>William A. Rowe Jr.</b> (wrowe at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Christopher Schultz</b> (schultz at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Felix Schumacher</b> (fschumacher at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Coty Sutherland</b> (csutherl at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Eiji Takahashi</b> (eijit at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Mark Thomas</b> (markt at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Keith Wannamaker</b> (keith at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Andr&eacute; Warnier</b> (soliplaya at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Tim Whittington</b> (timw at apache.org)<br>
+</p>
+
+
+
+<p>
+<b>Huxing Zhang</b> (huxing at apache.org)<br>
+</p>
+
+
+</div>
+<h3 id="Emeritus_PMC_members">Emeritus PMC members</h3>
+<div class="text">
+
+
+<p>
+<a href="http://www.apache.org/foundation/glossary.html#Emeritus">
+Emeritus</a> is defined in the Apache glossary.</p>
+
+
+<p>
+
+<p>
+<b>Ian Darwin</b> (idarwin at apache.org)</p>
+
+</p>
+
+
+<p>
+<b>Yoav Shapira</b> (yoavs at apache.org)</p>
+
+
+
+</div>
+<h3 id="Emeritus_Committers">Emeritus Committers</h3>
+<div class="text">
+
+
+<p>
+<a href="http://www.apache.org/foundation/glossary.html#Emeritus">
+Emeritus</a> is defined in the Apache glossary.</p>
+
+
+<p>
+
+<b>James Duncan Davidson</b> (duncan at apache.org),
 <b>Jon Scott Stevens</b> (jon at apache.org),
 <b>Sam Ruby</b> (rubys at apache.org),
 <b>Anil Vijendran</b> (akv at apache.org),
@@ -500,24 +530,22 @@ Emeritus</a> is defined in the Apache gl
 <b>Keith Eric Carmichael</b> (ecarmich at apache.org),
 <b>Guenter Knauf</b> (fuankg at apache.org),
 <b>Jean-Jacques Clar</b> (clar at apache.org),
+</p>
+
 
-                                </p>
-                                
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </main>
-            <footer id="footer">
-                    Copyright &copy; 1999-2018, 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-2018, 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/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=1829368&r1=1829367&r2=1829368&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/project.xml (original)
+++ tomcat/site/trunk/xdocs/stylesheets/project.xml Tue Apr 17 14:04:25 2018
@@ -11,10 +11,12 @@
         <item name="Maven Plugin"             href="/maven-plugin.html"/>
     </menu>
 
+<!--
     <menu name="TomcatCon">
         <item name="Training, Manchester"     href="/conference.html"/>
     </menu>
-     
+-->
+
     <menu name="Download">
         <item name="Which version?"           href="/whichversion.html"/>
         <item name="Tomcat 9"                 href="/download-90.cgi"/>



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