Author: markt
Date: Wed Dec 2 11:04:12 2015
New Revision: 1717605
URL: http://svn.apache.org/viewvc?rev=1717605&view=rev
Log:
Schedule the next couple of 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=1717605&r1=1717604&r2=1717605&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Wed Dec 2 11:04:12 2015
@@ -218,7 +218,30 @@ presentations then please do let us know
<h4 id="Scheduled_presentations">Scheduled presentations</h4>
<div class="text">
-<p>TBC.</p>
+<p>TLS Virtual Hosting (markt)</p>
+
+<ul>
+
+<li>Webinar: <a href="http://markmail.org/message/4bby2xijssm54aip";>Tuesday
+ 8 December 2015 10.00 UTC</a>
+</li>
+
+<li>Webinar: <a href="http://markmail.org/message/hjkdx5hptbqq3b6d";>Tuesday
+ 8 December 2015 21.00 UTC</a>
+</li>
+
+</ul>
+
+<p>TLS key/certificate generation (markt)</p>
+
+<ul>
+
+<li>Webinar: Tuesday 5 January 2016 10.00 UTC</li>
+
+<li>Webinar: Tuesday 5 January 2016 20.00 UTC</li>
+
+</ul>
+
</div>
</div>
@@ -234,10 +257,6 @@ mailing list</a>.</p>
<ul>
-<li>TLS virtual hosting with Apache Tomcat</li>
-
-<li>TLS key/certificate generation for Apache Tomcat</li>
-
<li>Connector selection: BIO vs NIO vs NIO2 vs APR</li>
<li>Proxy protocol choice HTTP vs AJP</li>
Modified: tomcat/site/trunk/xdocs/presentations.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1717605&r1=1717604&r2=1717605&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Wed Dec 2 11:04:12 2015
@@ -16,7 +16,19 @@ presentations then please do let us know
<a href="lists.html#tomcat-users">Tomcat Users mailing list</a>.</p>
<subsection name="Scheduled presentations">
-<p>TBC.</p>
+<p>TLS Virtual Hosting (markt)</p>
+<ul>
+ <li>Webinar: <a href="http://markmail.org/message/4bby2xijssm54aip";>Tuesday
+ 8 December 2015 10.00 UTC</a></li>
+ <li>Webinar: <a href="http://markmail.org/message/hjkdx5hptbqq3b6d";>Tuesday
+ 8 December 2015 21.00 UTC</a></li>
+</ul>
+<p>TLS key/certificate generation (markt)</p>
+<ul>
+ <li>Webinar: Tuesday 5 January 2016 10.00 UTC</li>
+ <li>Webinar: Tuesday 5 January 2016 20.00 UTC</li>
+</ul>
+
</subsection>
<subsection name="Future Topics">
@@ -24,8 +36,6 @@ presentations then please do let us know
To add your idea to the list, e-mail the Tomcat <a href="lists.html">users
mailing list</a>.</p>
<ul>
-<li>TLS virtual hosting with Apache Tomcat</li>
-<li>TLS key/certificate generation for Apache Tomcat</li>
<li>Connector selection: BIO vs NIO vs NIO2 vs APR</li>
<li>Proxy protocol choice HTTP vs AJP</li>
<li>Clustering and session replication</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
