Author: markt
Date: Mon Apr 30 08:01:55 2018
New Revision: 1830536

URL: http://svn.apache.org/viewvc?rev=1830536&view=rev
Log:
Add EU Roadshow and NA to website

Modified:
    tomcat/site/trunk/docs/bugreport.html
    tomcat/site/trunk/docs/ci.html
    tomcat/site/trunk/docs/conference.html
    tomcat/site/trunk/docs/contact.html
    tomcat/site/trunk/docs/download-70.html
    tomcat/site/trunk/docs/download-80.html
    tomcat/site/trunk/docs/download-90.html
    tomcat/site/trunk/docs/download-connectors.html
    tomcat/site/trunk/docs/download-native.html
    tomcat/site/trunk/docs/download-taglibs.html
    tomcat/site/trunk/docs/findhelp.html
    tomcat/site/trunk/docs/getinvolved.html
    tomcat/site/trunk/docs/heritage.html
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/irc.html
    tomcat/site/trunk/docs/legal.html
    tomcat/site/trunk/docs/lists.html
    tomcat/site/trunk/docs/maven-plugin.html
    tomcat/site/trunk/docs/migration-6.html
    tomcat/site/trunk/docs/migration-7.html
    tomcat/site/trunk/docs/migration-8.html
    tomcat/site/trunk/docs/migration-85.html
    tomcat/site/trunk/docs/migration-9.html
    tomcat/site/trunk/docs/migration.html
    tomcat/site/trunk/docs/oldnews-2010.html
    tomcat/site/trunk/docs/oldnews-2011.html
    tomcat/site/trunk/docs/oldnews-2012.html
    tomcat/site/trunk/docs/oldnews-2013.html
    tomcat/site/trunk/docs/oldnews-2014.html
    tomcat/site/trunk/docs/oldnews-2015.html
    tomcat/site/trunk/docs/oldnews-2016.html
    tomcat/site/trunk/docs/oldnews-2017.html
    tomcat/site/trunk/docs/oldnews.html
    tomcat/site/trunk/docs/presentations.html
    tomcat/site/trunk/docs/resources.html
    tomcat/site/trunk/docs/security-3.html
    tomcat/site/trunk/docs/security-4.html
    tomcat/site/trunk/docs/security-5.html
    tomcat/site/trunk/docs/security-6.html
    tomcat/site/trunk/docs/security-7.html
    tomcat/site/trunk/docs/security-8.html
    tomcat/site/trunk/docs/security-9.html
    tomcat/site/trunk/docs/security-impact.html
    tomcat/site/trunk/docs/security-jk.html
    tomcat/site/trunk/docs/security-native.html
    tomcat/site/trunk/docs/security-taglibs.html
    tomcat/site/trunk/docs/security.html
    tomcat/site/trunk/docs/svn.html
    tomcat/site/trunk/docs/taglibs.html
    tomcat/site/trunk/docs/tomcat-55-eol.html
    tomcat/site/trunk/docs/tomcat-60-eol.html
    tomcat/site/trunk/docs/tomcat-80-eol.html
    tomcat/site/trunk/docs/tools.html
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/docs/whoweare.html
    tomcat/site/trunk/xdocs/conference.xml
    tomcat/site/trunk/xdocs/stylesheets/project.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>
@@ -205,16 +213,35 @@
 <div id="mainRight">
 <div id="content">
 <h2 style="display: none;">Content</h2>
-<h3 id="TomcatCon_Training:_Tomcat_for_Administrators">TomcatCon Training: 
Tomcat for Administrators</h3>
+<h3 id="TomcatCon">TomcatCon</h3>
+<div class="text">
+
+
+<p>TomcatCon is the place for all users of Tomcat to expand their Tomcat
+   knowledge in areas such as networking, security, performance and deployment.
+   It also offers an opportunity to discuss the current Tomcat roadmap and
+   help inform future development.</p>
+
+
+</div>
+<h3 id="Quick_Navigation">Quick Navigation</h3>
+<div class="text">
+  
+<p>
+<a href="#TomcatCon_Berlin">TomcatCon Berlin</a> <a 
href="#TomcatCon_Montr%C3%A9al">TomcatCon Montreal</a>
+</p>
+
+</div>
+<h3 id="TomcatCon_Berlin">TomcatCon Berlin</h3>
 <div class="text">
 
 
 <div class="subsection">
-<h4 id="When">When</h4>
+<h4 id="TomcatCon_Berlin/When">When</h4>
 <div class="text">
 
 
-<p>Tuesday, 10 April 2018</p>
+<p>June 13 to 14, 2018.</p> 
 
 
 </div>
@@ -222,11 +249,16 @@
 
 
 <div class="subsection">
-<h4 id="Where">Where</h4>
+<h4 id="TomcatCon_Berlin/Where">Where</h4>
 <div class="text">
 
 
-<p>Hotel Novotel Manchester Centre | 21 Dickinson Street | M1 4LX Manchester | 
United Kingdom</p>
+<p>
+<a href="http://apachecon.com/euroadshow18/venue.html";>KulturBrauerei</a>,
+   Berlin, Germany, as part of the
+   <a href="http://apachecon.com/euroadshow18/index.html";>ApacheCon EU
+   Roadshow</a> and alongside <a href="https://foss-backstage.de/";>FOSS
+   Backstage</a>.</p> 
 
 
 </div>
@@ -234,23 +266,18 @@
 
 
 <div class="subsection">
-<h4 id="What">What</h4>
+<h4 id="TomcatCon_Berlin/What">What</h4>
 <div class="text">
 
 
-<p>This training course is aimed at system administrators who are not very
-   familiar with Apache Tomcat. It will provide them with the skills necessary
-   to set up a Tomcat instance, administer it on a day to day basis and to
-   undertake initial troubleshooting if things go wrong.</p>
-
-
-<p>This course will be taught by Mark Thomas, a Tomcat committer and PMC member
-   with over 15 years experience with Apache Tomcat.</p>
+<p>This is a one day track at the ApacheCon EU Roadshow dedicated to Apache
+   Tomcat.</p>
 
 
 <p>
-<a 
href="https://www.eventbrite.com/e/tomcatcon-training-tomcat-for-administrators-tickets-43039556472?aff=website";>Registration</a>
-   for this training course is now open.</p>
+<a href="https://foss-backstage.de/tickets";>Registration</a>
+   for TomcatCon is open with standard prices available until 7 June.
+   Registration includes access to ApacheCon EU Roadshow and FOSS 
Backstage.</p>
 
 
 </div>
@@ -258,58 +285,89 @@
 
 
 <div class="subsection">
-<h4 id="Schedule">Schedule</h4>
+<h4 id="TomcatCon_Berlin/Schedule">Schedule</h4>
 <div class="text">
 
 
+<p>The full
+   <a 
href="http://apachecon.com/euroadshow18/tomcat-schedule.html";>schedule</a>
+   is now available. The Tomcat team is pleased to be able to say that the 
final
+   schedule has a day of great content covering:</p>
+   
 <ul>
+     
+<li>roadmap</li>
+     
+<li>security</li>
+     
+<li>networking (reverse proxying, load-balancing, clustering)</li>
+     
+<li>performance and monitoring</li>
+     
+<li>reactive applications</li>
+     
+<li>Jakarta EE</li>
+   
+</ul>
+
+<p>See you there!</p>
+
+</div>
+</div>
 
-<li>09.00 Welcome<br>
-    Introductions and Welcome</li>
 
-<li>09.30 Installation<br>
-    Typical installation scenarios using packages from the ASF as well as
-    popular distributions.</li>
+</div>
+<h3 id="TomcatCon_Montr&eacute;al">TomcatCon Montr&eacute;al</h3>
+<div class="text">
 
-<li>10.30 Web Application Packaging and Deployment<br>
-    The options for deploying applications and an in-depth look at automatic
-    deployment.</li>
 
-<li>11.30 Logging<br>
-    The default logging configuration and options for tailoring it for your
-    production environment.</li>
+<div class="subsection">
+<h4 id="TomcatCon_Montr&eacute;al/When">When</h4>
+<div class="text">
 
-<li>12.30 Buffet Lunch</li>
 
-<li>13.30 TLS<br>
-    An introduction to TLS and how it works.</li>
+<p>September 24 to 25, 2018.</p>
 
-<li>14.30 TLS configuration<br>
-    Configuring Tomcat for TLS.</li>
 
-<li>15.30 Performance and tuning<br>
-    How to identify the source of bottlenecks in an application and options for
-    addressing them.</li>
+<p>
+<i>Note: The main conference is September 25 to 27, 2018. The Tomcat track
+   starts the day before.</i>
+</p> 
 
-<li>16.30 Wrap-Up<br>
-    An opportunity to ask any final questions</li>
 
-</ul>
+</div>
+</div>
 
 
-<p>See you there!</p>
+<div class="subsection">
+<h4 id="TomcatCon_Montr&eacute;al/Where">Where</h4>
+<div class="text">
+
+
+<p>
+<a href="https://www.apachecon.com/acna18/venue.html";>Montr&eacute;al Marriott
+      Chateau Champlain</a>, Montr&eacute;al, Canada, as part of
+      <a href="http://apachecon.com/euroadshow18/index.html";>ApacheCon North
+      America 2018</a>.</p> 
+
 
 </div>
 </div>
 
 
 <div class="subsection">
-<h4 id="Thanks">Thanks</h4>
+<h4 id="TomcatCon_Montr&eacute;al/What">What</h4>
 <div class="text">
 
 
-<p>Thanks to <a href="https://pivotal.io/";>Pivotal</a> for donating the
-   trainer's time.</p>
+<p>This is a two day track dedicated to Apache Tomcat that starts the day 
before
+   the main conference.</p>
+
+
+<p>
+<a 
href="https://www.eventbrite.com/e/apachecon-north-america-2018-registration-43200327342";>Registration</a>
+   for TomcatCon is open. Registration includes access to ApacheCon North
+   America.</p>
 
 
 </div>
@@ -317,14 +375,27 @@
 
 
 <div class="subsection">
-<h4 id="Previous_events">Previous events</h4>
+<h4 id="TomcatCon_Montr&eacute;al/Schedule">Schedule</h4>
 <div class="text">
 
 
-<p>Slides along with audio and video (where available) from previous events are
-   available from the <a href="presentations.html">previous presentations</a>
-   page.</p>
+<p>The full
+   <a 
href="http://apachecon.dukecon.org/acna/2018/#/schedule/2018-09-24";>schedule</a>
+   is now available. There are two days of great content covering:</p>
+   
+<ul>
+     
+<li>roadmap</li>
+     
+<li>security</li>
+     
+<li>networking (reverse proxying, load-balancing, clustering)</li>
+     
+<li>performance and monitoring</li>
+   
+</ul>
 
+<p>See you there!</p>
 
 </div>
 </div>

Modified: tomcat/site/trunk/docs/contact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/download-taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-taglibs.html (original)
+++ tomcat/site/trunk/docs/download-taglibs.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/findhelp.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/getinvolved.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/getinvolved.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/getinvolved.html (original)
+++ tomcat/site/trunk/docs/getinvolved.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/heritage.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/heritage.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/heritage.html (original)
+++ tomcat/site/trunk/docs/heritage.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Apr 30 08:01:55 2018
@@ -52,6 +52,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/irc.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/legal.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/lists.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/migration-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-6.html (original)
+++ tomcat/site/trunk/docs/migration-6.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/migration-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2010.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2010.html (original)
+++ tomcat/site/trunk/docs/oldnews-2010.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2011.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2011.html (original)
+++ tomcat/site/trunk/docs/oldnews-2011.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2012.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2012.html (original)
+++ tomcat/site/trunk/docs/oldnews-2012.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2013.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2013.html (original)
+++ tomcat/site/trunk/docs/oldnews-2013.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2014.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2014.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2014.html (original)
+++ tomcat/site/trunk/docs/oldnews-2014.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2015.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2015.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2015.html (original)
+++ tomcat/site/trunk/docs/oldnews-2015.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2016.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2016.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2016.html (original)
+++ tomcat/site/trunk/docs/oldnews-2016.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews-2017.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2017.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2017.html (original)
+++ tomcat/site/trunk/docs/oldnews-2017.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/resources.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-3.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-3.html (original)
+++ tomcat/site/trunk/docs/security-3.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-4.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-5.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-impact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-impact.html (original)
+++ tomcat/site/trunk/docs/security-impact.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-jk.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-native.html (original)
+++ tomcat/site/trunk/docs/security-native.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security-taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-taglibs.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-taglibs.html (original)
+++ tomcat/site/trunk/docs/security-taglibs.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/security.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security.html (original)
+++ tomcat/site/trunk/docs/security.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/svn.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/taglibs.html (original)
+++ tomcat/site/trunk/docs/taglibs.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/tomcat-55-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-55-eol.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-55-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-55-eol.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/tomcat-60-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-60-eol.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-60-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-60-eol.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/tomcat-80-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-80-eol.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-80-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-80-eol.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/tools.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tools.html (original)
+++ tomcat/site/trunk/docs/tools.html Mon Apr 30 08:01:55 2018
@@ -51,6 +51,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Mon Apr 30 08:01:55 2018
@@ -53,6 +53,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</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=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Mon Apr 30 08:01:55 2018
@@ -50,6 +50,14 @@
 </ul>
 </div>
 <div>
+<h2>TomcatCon</h2>
+<ul>
+<li>
+<a href="./conference.html">EU &amp; North America</a>
+</li>
+</ul>
+</div>
+<div>
 <h2>Download</h2>
 <ul>
 <li>

Modified: tomcat/site/trunk/xdocs/conference.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/conference.xml?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/conference.xml (original)
+++ tomcat/site/trunk/xdocs/conference.xml Mon Apr 30 08:01:55 2018
@@ -7,77 +7,111 @@
 
 <body>
 
-<section name="TomcatCon Training: Tomcat for Administrators">
+<section name="TomcatCon">
+
+<p>TomcatCon is the place for all users of Tomcat to expand their Tomcat
+   knowledge in areas such as networking, security, performance and deployment.
+   It also offers an opportunity to discuss the current Tomcat roadmap and
+   help inform future development.</p>
+
+</section>
+
+<section name="Quick Navigation">
+  <p><a href="#TomcatCon_Berlin">TomcatCon Berlin</a> <a 
href="#TomcatCon_Montréal">TomcatCon Montreal</a></p>
+</section>
+
+<section name="TomcatCon Berlin">
 
 <subsection name="When">
 
-<p>Tuesday, 10 April 2018</p>
+<p>June 13 to 14, 2018.</p> 
 
 </subsection>
 
 <subsection name="Where">
 
-<p>Hotel Novotel Manchester Centre | 21 Dickinson Street | M1 4LX Manchester | 
United Kingdom</p>
+<p><a href="http://apachecon.com/euroadshow18/venue.html";>KulturBrauerei</a>,
+   Berlin, Germany, as part of the
+   <a href="http://apachecon.com/euroadshow18/index.html";>ApacheCon EU
+   Roadshow</a> and alongside <a href="https://foss-backstage.de/";>FOSS
+   Backstage</a>.</p> 
 
 </subsection>
 
 <subsection name="What">
 
-<p>This training course is aimed at system administrators who are not very
-   familiar with Apache Tomcat. It will provide them with the skills necessary
-   to set up a Tomcat instance, administer it on a day to day basis and to
-   undertake initial troubleshooting if things go wrong.</p>
-
-<p>This course will be taught by Mark Thomas, a Tomcat committer and PMC member
-   with over 15 years experience with Apache Tomcat.</p>
+<p>This is a one day track at the ApacheCon EU Roadshow dedicated to Apache
+   Tomcat.</p>
 
-<p><a 
href="https://www.eventbrite.com/e/tomcatcon-training-tomcat-for-administrators-tickets-43039556472?aff=website";>Registration</a>
-   for this training course is now open.</p>
+<p><a href="https://foss-backstage.de/tickets";>Registration</a>
+   for TomcatCon is open with standard prices available until 7 June.
+   Registration includes access to ApacheCon EU Roadshow and FOSS 
Backstage.</p>
 
 </subsection>
 
 <subsection name="Schedule">
 
-<ul>
-<li>09.00 Welcome<br/>
-    Introductions and Welcome</li>
-<li>09.30 Installation<br/>
-    Typical installation scenarios using packages from the ASF as well as
-    popular distributions.</li>
-<li>10.30 Web Application Packaging and Deployment<br/>
-    The options for deploying applications and an in-depth look at automatic
-    deployment.</li>
-<li>11.30 Logging<br/>
-    The default logging configuration and options for tailoring it for your
-    production environment.</li>
-<li>12.30 Buffet Lunch</li>
-<li>13.30 TLS<br/>
-    An introduction to TLS and how it works.</li>
-<li>14.30 TLS configuration<br/>
-    Configuring Tomcat for TLS.</li>
-<li>15.30 Performance and tuning<br/>
-    How to identify the source of bottlenecks in an application and options for
-    addressing them.</li>
-<li>16.30 Wrap-Up<br/>
-    An opportunity to ask any final questions</li>
-</ul>
-
+<p>The full
+   <a 
href="http://apachecon.com/euroadshow18/tomcat-schedule.html";>schedule</a>
+   is now available. The Tomcat team is pleased to be able to say that the 
final
+   schedule has a day of great content covering:</p>
+   <ul>
+     <li>roadmap</li>
+     <li>security</li>
+     <li>networking (reverse proxying, load-balancing, clustering)</li>
+     <li>performance and monitoring</li>
+     <li>reactive applications</li>
+     <li>Jakarta EE</li>
+   </ul>
 <p>See you there!</p>
 </subsection>
 
-<subsection name="Thanks">
+</section>
+
+
+<section name="TomcatCon Montréal">
+
+<subsection name="When">
+
+<p>September 24 to 25, 2018.</p>
+
+<p><i>Note: The main conference is September 25 to 27, 2018. The Tomcat track
+   starts the day before.</i></p> 
+
+</subsection>
+
+<subsection name="Where">
 
-<p>Thanks to <a href="https://pivotal.io/";>Pivotal</a> for donating the
-   trainer's time.</p>
+<p><a href="https://www.apachecon.com/acna18/venue.html";>Montréal Marriott
+      Chateau Champlain</a>, Montréal, Canada, as part of
+      <a href="http://apachecon.com/euroadshow18/index.html";>ApacheCon North
+      America 2018</a>.</p> 
 
 </subsection>
 
-<subsection name="Previous events">
+<subsection name="What">
 
-<p>Slides along with audio and video (where available) from previous events are
-   available from the <a href="presentations.html">previous presentations</a>
-   page.</p>
+<p>This is a two day track dedicated to Apache Tomcat that starts the day 
before
+   the main conference.</p>
 
+<p><a 
href="https://www.eventbrite.com/e/apachecon-north-america-2018-registration-43200327342";>Registration</a>
+   for TomcatCon is open. Registration includes access to ApacheCon North
+   America.</p>
+
+</subsection>
+
+<subsection name="Schedule">
+
+<p>The full
+   <a 
href="http://apachecon.dukecon.org/acna/2018/#/schedule/2018-09-24";>schedule</a>
+   is now available. There are two days of great content covering:</p>
+   <ul>
+     <li>roadmap</li>
+     <li>security</li>
+     <li>networking (reverse proxying, load-balancing, clustering)</li>
+     <li>performance and monitoring</li>
+   </ul>
+<p>See you there!</p>
 </subsection>
 
 </section>

Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=1830536&r1=1830535&r2=1830536&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/project.xml (original)
+++ tomcat/site/trunk/xdocs/stylesheets/project.xml Mon Apr 30 08:01:55 2018
@@ -11,11 +11,9 @@
         <item name="Maven Plugin"             href="/maven-plugin.html"/>
     </menu>
 
-<!--
     <menu name="TomcatCon">
-        <item name="Training, Manchester"     href="/conference.html"/>
+        <item name="EU &amp; North America"   href="/conference.html"/>
     </menu>
--->
 
     <menu name="Download">
         <item name="Which version?"           href="/whichversion.html"/>



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

Reply via email to