Author: markt
Date: Wed Jan 27 12:38:34 2016
New Revision: 1727021
URL: http://svn.apache.org/viewvc?rev=1727021&view=rev
Log:
Add links for yesterday's presentation and schedule the next one
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=1727021&r1=1727020&r2=1727021&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Wed Jan 27 12:38:34 2016
@@ -218,16 +218,16 @@ presentations then please do let us know
<h4 id="Scheduled_presentations">Scheduled presentations</h4>
<div class="text">
-<p>TLS key/certificate generation (markt)</p>
+<p>Connector selection: BIO vs NIO vs NIO2 vs APR (markt)</p>
<ul>
-<li>Webinar: Tuesday 26 January 2016
+<li>Webinar: Tuesday 16 February 2016
<a href="http://markmail.org/message/phsjlphqissybr5z";>10.00 UTC</a>
</li>
-<li>Webinar: Tuesday 26 January 2016
- <a href="http://markmail.org/message/aae3xq5hfiwk6soj";>21.00 UTC</a>
+<li>Webinar: Tuesday 16 February 2016
+ <a href="http://markmail.org/message/aae3xq5hfiwk6soj";>20.00 UTC</a>
</li>
</ul>
@@ -247,8 +247,6 @@ mailing list</a>.</p>
<ul>
-<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>
@@ -267,6 +265,22 @@ mailing list</a>.</p>
</ul>
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Webinar_Series_2016">Webinar Series 2016</h4>
+<div class="text">
+
+<ul>
+
+<li>TLS key/certificate generation (markt) <a
href="https://www.youtube.com/watch?v=I6TbMqH9WFg";>video</a>,
+ <a
href="http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt";>script</a>
+</li>
+
+</ul>
+
</div>
</div>
Modified: tomcat/site/trunk/xdocs/presentations.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1727021&r1=1727020&r2=1727021&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Wed Jan 27 12:38:34 2016
@@ -16,12 +16,12 @@ presentations then please do let us know
<a href="lists.html#tomcat-users">Tomcat Users mailing list</a>.</p>
<subsection name="Scheduled presentations">
-<p>TLS key/certificate generation (markt)</p>
+<p>Connector selection: BIO vs NIO vs NIO2 vs APR (markt)</p>
<ul>
- <li>Webinar: Tuesday 26 January 2016
+ <li>Webinar: Tuesday 16 February 2016
<a href="http://markmail.org/message/phsjlphqissybr5z";>10.00 UTC</a></li>
- <li>Webinar: Tuesday 26 January 2016
- <a href="http://markmail.org/message/aae3xq5hfiwk6soj";>21.00 UTC</a></li>
+ <li>Webinar: Tuesday 16 February 2016
+ <a href="http://markmail.org/message/aae3xq5hfiwk6soj";>20.00 UTC</a></li>
</ul>
</subsection>
@@ -31,7 +31,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>Connector selection: BIO vs NIO vs NIO2 vs APR</li>
<li>Proxy protocol choice HTTP vs AJP</li>
<li>Clustering and session replication</li>
<li>how to set up Tomcat so as to make upgrades easier</li>
@@ -43,6 +42,13 @@ mailing list</a>.</p>
</ul>
</subsection>
+<subsection name="Webinar Series 2016">
+<ul>
+<li>TLS key/certificate generation (markt) <a
href="https://www.youtube.com/watch?v=I6TbMqH9WFg";>video</a>,
+ <a
href="http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt";>script</a></li>
+</ul>
+</subsection>
+
<subsection name="Webinar Series 2015">
<ul>
<li>Tomcat 9: HTTP/2 Quick Start (markt) <a
href="https://www.youtube.com/watch?v=oCFwgMvouis";>video</a></li>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
