Return-Path: <dev-return-185193-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 707682004A1
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 24 Aug 2017 22:01:14 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 6ED0A1689FA; Thu, 24 Aug 2017 20:01:14 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id B5FB11689CE
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 24 Aug 2017 22:01:13 +0200 (CEST)
Received: (qmail 14649 invoked by uid 500); 24 Aug 2017 20:01:10 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 14639 invoked by uid 99); 24 Aug 2017 20:01:10 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Aug 2017 20:01:10 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E3B1D3A0044
	for <dev@tomcat.apache.org>; Thu, 24 Aug 2017 20:01:09 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1806080 - in /tomcat/site/trunk: docs/presentations.html
 xdocs/presentations.xml
Date: Thu, 24 Aug 2017 20:01:09 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170824200109.E3B1D3A0044@svn01-us-west.apache.org>
archived-at: Thu, 24 Aug 2017 20:01:14 -0000

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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org