Author: markt
Date: Thu Aug 24 20:01:09 2017
New Revision: 1806080
URL: http://svn.apache.org/viewvc?rev=1806080&view=rev
Log:
Update upcoming presentations
Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml
Modified: tomcat/site/trunk/docs/presentations.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1806080&r1=1806079&r2=1806080&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Thu Aug 24 20:01:09 2017
@@ -225,16 +225,17 @@ presentations then please do let us know
<div class="text">
<p>
-<strong>Tomcat and MoSKito</strong> (Leon Rosenburg)</p>
+<a href="conference.html">TomcatCon London 2017</a>
+</p>
-<p>Monitoring your tomcat web-application in production with MoSKito. Get full
-control of threads, memory and execution time usage of the JVM and your
-code.</p>
+<p>TomcatCon London 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>
<ul>
-<li>Webinar: Thursday 24th August 2017 <a
href="https://pivotal.zoom.us/j/949439493";>14.00 UTC</a>
-</li>
+<li>Conference: Tuesday 26 September 2017</li>
</ul>
Modified: tomcat/site/trunk/xdocs/presentations.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1806080&r1=1806079&r2=1806080&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Thu Aug 24 20:01:09 2017
@@ -16,12 +16,13 @@ presentations then please do let us know
<a href="lists.html#tomcat-users">Tomcat Users mailing list</a>.</p>
<subsection name="Scheduled presentations">
-<p><strong>Tomcat and MoSKito</strong> (Leon Rosenburg)</p>
-<p>Monitoring your tomcat web-application in production with MoSKito. Get full
-control of threads, memory and execution time usage of the JVM and your
-code.</p>
+<p><a href="conference.html">TomcatCon London 2017</a></p>
+<p>TomcatCon London 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>
<ul>
- <li>Webinar: Thursday 24th August 2017 <a
href="https://pivotal.zoom.us/j/949439493";>14.00 UTC</a></li>
+ <li>Conference: Tuesday 26 September 2017</li>
</ul>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
