Author: markt
Date: Thu Aug 3 13:59:43 2017
New Revision: 1803999
URL: http://svn.apache.org/viewvc?rev=1803999&view=rev
Log:
Start to put together the details of TomcatCon London
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=1803999&r1=1803998&r2=1803999&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Thu Aug 3 13:59:43 2017
@@ -210,7 +210,7 @@
<div class="text">
-<p>May 16 to May 18 2017.</p>
+<p>26 September 2017</p>
</div>
@@ -222,7 +222,7 @@
<div class="text">
-<p>Intercontinental Miami, Miami, Florida, alongside ApacheCon NA 2017.</p>
+<p>Hilton Doubletree, Westminster, London, UK</p>
</div>
@@ -234,17 +234,15 @@
<div class="text">
-<p>TomcatCon is the place for all users of Tomcat to expand their Tomcat
+<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>
<p>
-<a
href="http://events.linuxfoundation.org/events/apachecon-north-america/attend/register-";>Registration</a>
- for TomcatCon is open.
- Registration includes access to ApacheCon and the other co-located Apache
- conferences.</p>
+<a href="TODO">Registration</a>
+ for TomcatCon London is now open.</p>
</div>
@@ -256,29 +254,60 @@
<div class="text">
-<p>The full <a
href="https://apachecon2017.sched.com/overview/type/TomcatCon";>schedule</a>
- is now available. The Tomcat team is pleased to be able to say that the
final
- schedule has three days of great content covering all the key topics
- identified by the community including:</p>
-
<ul>
-
-<li>security</li>
-
-<li>networking (reverse proxying, load-balancing, clustering)</li>
-
-<li>performance and monitoring</li>
-
-<li>reactive applications</li>
-
-<li>microservices and cloud</li>
-
+
+<li>08.00 Registration and Breakfast</li>
+
+<li>09.00 Welcome<br>
+ TODO: Short description</li>
+
+<li>09.20 State of the Cat<br>
+ A review of the past year or so for Apache Tomcat and a look forward to
what
+ is expected in the coming 12 months. In particular, this will include the
+ progress of Tomcat 9 towards its first stable release.</li>
+
+<li>10.20 New and upcoming<br>
+ TODO: Short description</li>
+
+<li>11.20 Break</li>
+
+<li>11.40 Proxies, Load-balancing & Clustering Part 1<br>
+ TODO: Short description</li>
+
+<li>12.40 Lunch</li>
+
+<li>13.40 Proxies, Load-balancing & Clustering Part 2<br>
+ TODO: Short description</li>
+
+<li>14.40 Fault Finding and Diagnostics<br>
+ TODO: Short description</li>
+
+<li>15.40 Break</li>
+
+<li>16.00 Ask Us Anything<br>
+ TODO: Short description</li>
+
</ul>
+
<p>See you there!</p>
</div>
</div>
+
+
+<div class="subsection">
+<h4 id="Previous_events">Previous events</h4>
+<div class="text">
+
+
+<p>Slides along with audio and video (where available) from previous events are
+ available from the <a href="presentaions.html">previous presentations</a>
+ page.</p>
+
+
+</div>
+</div>
</div>
Modified: tomcat/site/trunk/xdocs/conference.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/conference.xml?rev=1803999&r1=1803998&r2=1803999&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/conference.xml (original)
+++ tomcat/site/trunk/xdocs/conference.xml Thu Aug 3 13:59:43 2017
@@ -11,46 +11,64 @@
<subsection name="When">
-<p>May 16 to May 18 2017.</p>
+<p>26 September 2017</p>
</subsection>
<subsection name="Where">
-<p>Intercontinental Miami, Miami, Florida, alongside ApacheCon NA 2017.</p>
+<p>Hilton Doubletree, Westminster, London, UK</p>
</subsection>
<subsection name="What">
-<p>TomcatCon is the place for all users of Tomcat to expand their Tomcat
+<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>
-<p><a
href="http://events.linuxfoundation.org/events/apachecon-north-america/attend/register-";>Registration</a>
- for TomcatCon is open.
- Registration includes access to ApacheCon and the other co-located Apache
- conferences.</p>
+<p><a href="TODO">Registration</a>
+ for TomcatCon London is now open.</p>
</subsection>
<subsection name="Schedule">
-<p>The full <a
href="https://apachecon2017.sched.com/overview/type/TomcatCon";>schedule</a>
- is now available. The Tomcat team is pleased to be able to say that the
final
- schedule has three days of great content covering all the key topics
- identified by the community including:</p>
- <ul>
- <li>security</li>
- <li>networking (reverse proxying, load-balancing, clustering)</li>
- <li>performance and monitoring</li>
- <li>reactive applications</li>
- <li>microservices and cloud</li>
- </ul>
+<ul>
+<li>08.00 Registration and Breakfast</li>
+<li>09.00 Welcome<br/>
+ TODO: Short description</li>
+<li>09.20 State of the Cat<br/>
+ A review of the past year or so for Apache Tomcat and a look forward to
what
+ is expected in the coming 12 months. In particular, this will include the
+ progress of Tomcat 9 towards its first stable release.</li>
+<li>10.20 New and upcoming<br/>
+ TODO: Short description</li>
+<li>11.20 Break</li>
+<li>11.40 Proxies, Load-balancing & Clustering Part 1<br/>
+ TODO: Short description</li>
+<li>12.40 Lunch</li>
+<li>13.40 Proxies, Load-balancing & Clustering Part 2<br/>
+ TODO: Short description</li>
+<li>14.40 Fault Finding and Diagnostics<br/>
+ TODO: Short description</li>
+<li>15.40 Break</li>
+<li>16.00 Ask Us Anything<br/>
+ TODO: Short description</li>
+</ul>
+
<p>See you there!</p>
</subsection>
+<subsection name="Previous events">
+
+<p>Slides along with audio and video (where available) from previous events are
+ available from the <a href="presentaions.html">previous presentations</a>
+ page.</p>
+
+</subsection>
+
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
