Author: markt
Date: Thu Sep 15 11:28:47 2016
New Revision: 1760918
URL: http://svn.apache.org/viewvc?rev=1760918&view=rev
Log:
Correct title. Move more recent presentations to the top
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=1760918&r1=1760917&r2=1760918&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Thu Sep 15 11:28:47 2016
@@ -276,16 +276,27 @@ mailing list</a>.</p>
<div class="subsection">
-<h4 id="Webinar_Series_2016">Webinar Series 2016</h4>
+<h4 id="ApacheCon_2016">ApacheCon 2016</h4>
<div class="text">
<ul>
-
-<li>Connector selection: BIO vs NIO vs NIO2 vs APR (markt) <a
href="https://www.youtube.com/watch?v=LBSWixIwMmU";>video</a>
+
+<li>
+ Seamless Upgrades for Credential Security in Apache Tomcat - Christopher
Schultz,
+ <a
href="http://people.apache.org/~schultz/ApacheCon%20NA%202016/Seamless%20Upgrades%20for%20Credential%20Security%20in%20Apache%20Tomcat.pdf";>slides</a>
+
</li>
-
-<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>
+ Monitoring Apache Tomcat with JMX - Christopher Schultz,
+ <a
href="http://people.apache.org/~schultz/ApacheCon%20NA%202016/Monitoring%20Apache%20Tomcat%20with%20JMX.pdf";>slides</a>
+
+</li>
+
+<li>
+ Using OpenSSL to Boost JSSE in Tomcat - Jean-Frederic Clere,
+ <a
href="http://schd.ws/hosted_files/apachecon2016/22/Using%20OpenSSL%20to%20Boost%20JSSE%20in%20Tomcat.pdf";>slides</a>
+
</li>
</ul>
@@ -295,15 +306,16 @@ mailing list</a>.</p>
<div class="subsection">
-<h4 id="Webinar_Series_2015">Webinar Series 2015</h4>
+<h4 id="Webinar_Series_2016">Webinar Series 2016</h4>
<div class="text">
<ul>
-<li>Tomcat 9: HTTP/2 Quick Start (markt), <a
href="https://www.youtube.com/watch?v=oCFwgMvouis";>video</a>
+<li>Connector selection: BIO vs NIO vs NIO2 vs APR (markt) <a
href="https://www.youtube.com/watch?v=LBSWixIwMmU";>video</a>
</li>
-<li>TLS Virtual Hosting (markt), <a
href="https://www.youtube.com/watch?v=UnEcYYutbRg";>video</a>
+<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>
@@ -313,27 +325,15 @@ mailing list</a>.</p>
<div class="subsection">
-<h4 id="Presentations/ApacheCon_2015">ApacheCon 2015</h4>
+<h4 id="Webinar_Series_2015">Webinar Series 2015</h4>
<div class="text">
<ul>
-
-<li>
- Seamless Upgrades for Credential Security in Apache Tomcat - Christopher
Schultz,
- <a
href="http://people.apache.org/~schultz/ApacheCon%20NA%202016/Seamless%20Upgrades%20for%20Credential%20Security%20in%20Apache%20Tomcat.pdf";>slides</a>
-
-</li>
-
-<li>
- Monitoring Apache Tomcat with JMX - Christopher Schultz,
- <a
href="http://people.apache.org/~schultz/ApacheCon%20NA%202016/Monitoring%20Apache%20Tomcat%20with%20JMX.pdf";>slides</a>
-
+
+<li>Tomcat 9: HTTP/2 Quick Start (markt), <a
href="https://www.youtube.com/watch?v=oCFwgMvouis";>video</a>
</li>
-
-<li>
- Using OpenSSL to Boost JSSE in Tomcat - Jean-Frederic Clere,
- <a
href="http://schd.ws/hosted_files/apachecon2016/22/Using%20OpenSSL%20to%20Boost%20JSSE%20in%20Tomcat.pdf";>slides</a>
-
+
+<li>TLS Virtual Hosting (markt), <a
href="https://www.youtube.com/watch?v=UnEcYYutbRg";>video</a>
</li>
</ul>
@@ -343,7 +343,7 @@ mailing list</a>.</p>
<div class="subsection">
-<h4 id="Presentations/ApacheCon_2015">ApacheCon 2015</h4>
+<h4 id="ApacheCon_2015">ApacheCon 2015</h4>
<div class="text">
<ul>
Modified: tomcat/site/trunk/xdocs/presentations.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1760918&r1=1760917&r2=1760918&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Thu Sep 15 11:28:47 2016
@@ -41,22 +41,7 @@ mailing list</a>.</p>
</ul>
</subsection>
-<subsection name="Webinar Series 2016">
-<ul>
-<li>Connector selection: BIO vs NIO vs NIO2 vs APR (markt) <a
href="https://www.youtube.com/watch?v=LBSWixIwMmU";>video</a></li>
-<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>
-<li>TLS Virtual Hosting (markt), <a
href="https://www.youtube.com/watch?v=UnEcYYutbRg";>video</a></li>
-</ul>
-</subsection>
-
-<subsection name="ApacheCon 2015">
+<subsection name="ApacheCon 2016">
<ul>
<li>
Seamless Upgrades for Credential Security in Apache Tomcat - Christopher
Schultz,
@@ -73,6 +58,21 @@ mailing list</a>.</p>
</ul>
</subsection>
+<subsection name="Webinar Series 2016">
+<ul>
+<li>Connector selection: BIO vs NIO vs NIO2 vs APR (markt) <a
href="https://www.youtube.com/watch?v=LBSWixIwMmU";>video</a></li>
+<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>
+<li>TLS Virtual Hosting (markt), <a
href="https://www.youtube.com/watch?v=UnEcYYutbRg";>video</a></li>
+</ul>
+</subsection>
+
<subsection name="ApacheCon 2015">
<ul>
<li>Tomcat Clustering: Part 1 - Reverse Proxies (markt), <a
href="2015-04-15-Tomcat-clustering-part-1-reverse-proxies.pdf">slides</a></li>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
