Author: markt
Date: Sun Aug 13 19:26:31 2017
New Revision: 1804941
URL: http://svn.apache.org/viewvc?rev=1804941&view=rev
Log:
Add liferay text
Keep a session open for jfc (if available)
Added:
tomcat/site/trunk/docs/images/liferay.png (with props)
tomcat/site/trunk/xdocs/images/liferay.png (with props)
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=1804941&r1=1804940&r2=1804941&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Sun Aug 13 19:26:31 2017
@@ -290,14 +290,8 @@
Mark Thomas (markt)<br>
See above.</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>
+<li>14.40 TBD</li>
+
<li>15.40 Break</li>
@@ -315,6 +309,26 @@
</div>
</div>
+
+
+<div class="subsection">
+<h4 id="Thanks">Thanks</h4>
+<div class="text">
+
+
+<p>This event is sponsored by Liferay, the robust java-based
+<a
href="https://www.liferay.com/?utm_source=asf%20tomcat%20uk&utm_medium=social&utm_content=explore%20liferay";>open
+source platform</a> (5 million downloads) used to build sophisticated
+transactional websites and deliver them to web browsers and native mobile
+clients. Liferay, Inc provides enterprise support for the commercial release
+which is used by organisations such as Allianz, Volkswagen Group and the
+NHS.</p>
+
+
+<img src="images/liferay.png" width="200">
+
+</div>
+</div>
<div class="subsection">
Added: tomcat/site/trunk/docs/images/liferay.png
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/images/liferay.png?rev=1804941&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/site/trunk/docs/images/liferay.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: tomcat/site/trunk/xdocs/conference.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/conference.xml?rev=1804941&r1=1804940&r2=1804941&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/conference.xml (original)
+++ tomcat/site/trunk/xdocs/conference.xml Sun Aug 13 19:26:31 2017
@@ -62,6 +62,8 @@
<li>13.40 Reverse Proxies, Load-Balancing & Clustering - Part 2<br/>
Mark Thomas (markt)<br/>
See above.</li>
+<li>14.40 TBD</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
@@ -70,6 +72,7 @@
performance issues, memory leaks, garbage collection as well as some rather
more unusual issues Mark has encountered while providing support for Apache
Tomcat.</li>
+-->
<li>15.40 Break</li>
<li>16.00 Ask Us Anything<br/>
Mark Thomas (markt) and Rémy Maucherat (remm)<br/>
@@ -82,6 +85,20 @@
<p>See you there!</p>
</subsection>
+<subsection name="Thanks">
+
+<p>This event is sponsored by Liferay, the robust java-based
+<a
href="https://www.liferay.com/?utm_source=asf%20tomcat%20uk&utm_medium=social&utm_content=explore%20liferay";>open
+source platform</a> (5 million downloads) used to build sophisticated
+transactional websites and deliver them to web browsers and native mobile
+clients. Liferay, Inc provides enterprise support for the commercial release
+which is used by organisations such as Allianz, Volkswagen Group and the
+NHS.</p>
+
+<img src="images/liferay.png" width="200"/>
+
+</subsection>
+
<subsection name="Previous events">
<p>Slides along with audio and video (where available) from previous events are
Added: tomcat/site/trunk/xdocs/images/liferay.png
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/images/liferay.png?rev=1804941&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/site/trunk/xdocs/images/liferay.png
------------------------------------------------------------------------------
svn:mime-type = image/png
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
