Author: markt
Date: Tue Aug 22 15:58:21 2017
New Revision: 1805790

URL: http://svn.apache.org/viewvc?rev=1805790&view=rev
Log:
Fill in the TODOs
Reformat
Fix typos

Modified:
    tomcat/site/trunk/docs/conference.html
    tomcat/site/trunk/xdocs/conference.xml

Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1805790&r1=1805789&r2=1805790&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Tue Aug 22 15:58:21 2017
@@ -269,7 +269,7 @@
 <li>08.00 Registration and Breakfast</li>
 
 <li>09.00 Welcome<br>
-    TODO: Short description</li>
+    Introduction and Welcome from our sponsors, Liferay</li>
 
 <li>09.20 State of the Cat<br>
     Mark Thomas (markt)<br>
@@ -279,7 +279,9 @@
 
 <li>10.20 New and upcoming<br>
     R&eacute;my Maucherat (remm)<br>
-    TODO: Short description</li>
+    In this session R&eacute;my will discuss the features recently added to 
Tomcat as
+    well as new features currently being considered including HTTP/2, NIO,
+    suspend/resume, async I/O uses, OpenSSL support and cloud clustering.</li>
 
 <li>11.20 Break</li>
 
@@ -302,23 +304,20 @@
 
 <li>14.40 Tomcat from the Cluster to the Cloud<br>
     Jean-Frederic Clere (jfclere)<br>
-    Using Tomcat in the cloud like in a cluster requires some work.
-    The presentation wiil look to the problems and solutions to have 
distributed
-    application running in the cloud.
-    A small cloud of Raspberry PI will be used to demo one solution using 
Kubernetes.</li>
-
-
+    Using Tomcat in the cloud like in a cluster requires some work. The
+    presentation will look to the problems and solutions to have a distributed
+    application running in the cloud. A small cloud of Raspberry PI will be 
used
+    to demo one solution using Kubernetes.</li>
 
 <li>15.40 Break</li>
 
 <li>16.00 Ask Us Anything<br>
     Mark Thomas (markt),  R&eacute;my Maucherat (remm) and Jean-Frederic
     Clere (jfclere)<br>
-    This is your opportunity to ask Mark,  R&eacute;my and Jean-Frederic
-    anything about working with
-    Apache Tomcat. In addition to being able to ask any questions that occur to
-    you during the day, there will be an opportunity to provide your questions
-    in advance during this registration process.</li>
+    This is your opportunity to ask Mark, R&eacute;my and Jean-Frederic 
anything about
+    working with Apache Tomcat. In addition to being able to ask any questions
+    that occur to you during the day, there will be an opportunity to provide
+    your questions in advance during this registration process.</li>
 
 </ul>
 

Modified: tomcat/site/trunk/xdocs/conference.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/conference.xml?rev=1805790&r1=1805789&r2=1805790&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/conference.xml (original)
+++ tomcat/site/trunk/xdocs/conference.xml Tue Aug 22 15:58:21 2017
@@ -40,7 +40,7 @@
 <ul>
 <li>08.00 Registration and Breakfast</li>
 <li>09.00 Welcome<br/>
-    TODO: Short description</li>
+    Introduction and Welcome from our sponsors, Liferay</li>
 <li>09.20 State of the Cat<br/>
     Mark Thomas (markt)<br/>
     A review of the past year or so for Apache Tomcat and a look forward to 
what
@@ -48,7 +48,9 @@
     progress of Tomcat 9 towards its first stable release.</li>
 <li>10.20 New and upcoming<br/>
     Rémy Maucherat (remm)<br/>
-    TODO: Short description</li>
+    In this session Rémy will discuss the features recently added to Tomcat as
+    well as new features currently being considered including HTTP/2, NIO,
+    suspend/resume, async I/O uses, OpenSSL support and cloud clustering.</li>
 <li>11.20 Break</li>
 <li>11.40 Reverse Proxies, Load-Balancing &amp; Clustering - Part 1<br/>
     Mark Thomas (markt)<br/>
@@ -66,30 +68,18 @@
     See above.</li>
 <li>14.40 Tomcat from the Cluster to the Cloud<br/>
     Jean-Frederic Clere (jfclere)<br/>
-    Using Tomcat in the cloud like in a cluster requires some work.
-    The presentation wiil look to the problems and solutions to have 
distributed
-    application running in the cloud.
-    A small cloud of Raspberry PI will be used to demo one solution using 
Kubernetes.</li>
-
-<!--
-<li>14.40 Fault Finding and Diagnostics<br/>
-    Mark Thomas (markt)<br/>
-    In this session Mark will discuss the types of problems that can occur in a
-    production Tomcat deployment and the tools you can use to help you track
-    down the root cause. Drawing on real-world examples, this session will 
cover
-    performance issues, memory leaks, garbage collection as well as some rather
-    more unusual issues Mark has encountered while providing support for Apache
-    Tomcat.</li>
--->
+    Using Tomcat in the cloud like in a cluster requires some work. The
+    presentation will look to the problems and solutions to have a distributed
+    application running in the cloud. A small cloud of Raspberry PI will be 
used
+    to demo one solution using Kubernetes.</li>
 <li>15.40 Break</li>
 <li>16.00 Ask Us Anything<br/>
     Mark Thomas (markt),  Rémy Maucherat (remm) and Jean-Frederic
     Clere (jfclere)<br/>
-    This is your opportunity to ask Mark,  Rémy and Jean-Frederic
-    anything about working with
-    Apache Tomcat. In addition to being able to ask any questions that occur to
-    you during the day, there will be an opportunity to provide your questions
-    in advance during this registration process.</li>
+    This is your opportunity to ask Mark, Rémy and Jean-Frederic anything 
about
+    working with Apache Tomcat. In addition to being able to ask any questions
+    that occur to you during the day, there will be an opportunity to provide
+    your questions in advance during this registration process.</li>
 </ul>
 
 <p>See you there!</p>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to