Author: kkolinko Date: Sat Jan 19 14:37:50 2013 New Revision: 1435559 URL: http://svn.apache.org/viewvc?rev=1435559&view=rev Log: Correct broken links. Old ApacheCons were moved to an archive site.
Modified: tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/xdocs/oldnews-2010.xml Modified: tomcat/site/trunk/docs/oldnews-2010.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1435559&r1=1435558&r2=1435559&view=diff ============================================================================== --- tomcat/site/trunk/docs/oldnews-2010.html (original) +++ tomcat/site/trunk/docs/oldnews-2010.html Sat Jan 19 14:37:50 2013 @@ -428,7 +428,7 @@ content directly in a web application (a <blockquote> <p> -<a href="http://na.apachecon.com/c/acna2010/"><img src="images/ACNA2010_120x240_basic.gif" width="120" height="240" align="right" hspace="10" vspace="10" alt="[ApacheCon North America 2010 Banner]"></a> <a href="http://na.apachecon.com/c/acna2010/">ApacheCon +<a href="http://archive.apachecon.com/c/acna2010/"><img src="images/ACNA2010_120x240_basic.gif" width="120" height="240" align="right" hspace="10" vspace="10" alt="[ApacheCon North America 2010 Banner]"></a> <a href="http://archive.apachecon.com/c/acna2010/">ApacheCon North America 2010</a> will be held 1-5 November 2010, at the Westin Peachtree in Atlanta, Georgia, USA.</p> @@ -442,8 +442,12 @@ innovations, emerging technologies, and The Tomcat Project Management Committee (PMC) have solicited session proposals from the Tomcat community and beyond. The Tomcat track will -take place on <a href="http://na.apachecon.com/c/acna2010/schedule/2010/11/05">Friday the 5th</a> and is a whole day track. -Additionally we have a <a href="http://wiki.apache.org/tomcat/TomcatAtApacheConNA2010">meetup on Thursday the 4th</a> and sessions during the barcamp. +take place on <a href="http://archive.apachecon.com/c/acna2010/schedule/2010/11/05">Friday the 5th</a> and is a whole day track. +Additionally we have a meetup on Thursday the 4th and sessions during the barcamp. +</p> + +<p>See also: +<a href="http://archive.apachecon.com/c/">Apache Conferences Archive</a> </p> </blockquote> @@ -593,54 +597,28 @@ Apache Tomcat. This release includes man <table border="0" cellspacing="0" cellpadding="2" width="100%"> <tr> <td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Tomcat tracks at ApacheCon US 2009"> -<!--()--></a><a name="Tomcat_tracks_at_ApacheCon_US_2009"><strong>Tomcat tracks at ApacheCon US 2009</strong></a></font></td> +<!--()--></a><a name="Tomcat_tracks_at_ApacheCon_US_2009"><strong>Tomcat tracks at ApacheCon US 2009</strong></a></font></td><td align="right" bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><strong>2009-11</strong></font></td> </tr> <tr> -<td> +<td colspan="2"> <p> <blockquote> -<A href="http://us.apachecon.com/c/acus2009/"><IMG border="0" title="ApacheCon US 2009" alt="ApacheCon US 2009 - logo" src="http://www.apache.org/ads/ApacheCon/2009-usa-125x125.png" style="width: 125px;height: 125px;" align="right"></A> - -<p>ApacheCon US 2009, 2-6 November 2009 in Oakland, CA, will have a dedicated track about Tomcat topics. +<p> +<a href="http://archive.apachecon.com/c/acus2009/">ApacheCon US 2009</a>, + 2-6 November 2009 in Oakland, CA, will have a dedicated track about Tomcat topics. We will celebrate our 10th anniversary as an Apache project, explain the future developements: Tomcat7, asynchrounous servlets, show how to get the best of Tomcat and how to front-end Tomcat clusters. - We also have a <a href="http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009">meetup</a> on Monday evening where you can get hands-on advice and really join the ranks of the Tomcat initiated! + We also have a meetup on Monday evening where you can get hands-on advice and really join the ranks of the Tomcat initiated! </p> <p> Join us in Oakland! </p> - -</blockquote> -</p> -</td> -</tr> -<tr> -<td> -<br> -</td> -</tr> -</table> -<table border="0" cellspacing="0" cellpadding="2" width="100%"> -<tr> -<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Free Meetup in Oakland"> -<!--()--></a><a name="Free_Meetup_in_Oakland"><strong>Free Meetup in Oakland</strong></a></font></td> -</tr> -<tr> -<td> -<p> -<blockquote> - -<p>During the ApacheCon a -<a href="http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009">Tomcat meetup</a> -is organised +<p>See also: +<a href="http://archive.apachecon.com/c/">Apache Conferences Archive</a> </p> -<p>On Monday 2nd of November at 20:00 <a href="http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA">register for it</a> -and join us in Oakland at the <a href="http://us.apachecon.com/c/acus2009/">ApacheCon location.</a> - -</p> </blockquote> </p> @@ -655,18 +633,18 @@ and join us in Oakland at the <a href="h <table border="0" cellspacing="0" cellpadding="2" width="100%"> <tr> <td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009"> -<!--()--></a><a name="Live_Video_Streaming_of_Tomcat_Talks_at_ApacheCon_Europe_2009"><strong>Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009</strong></a></font></td> +<!--()--></a><a name="Live_Video_Streaming_of_Tomcat_Talks_at_ApacheCon_Europe_2009"><strong>Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009</strong></a></font></td><td align="right" bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica.sanserif"><strong>2009-03</strong></font></td> </tr> <tr> -<td> +<td colspan="2"> <p> <blockquote> - -<img src="http://eu.apachecon.com/page_attachments/0000/0188/Live_Video_v2.gif" alt="[Live Video Streaming at ApacheCon]" align="right"> - <p>ApacheCon Europe 2009, 23-27 March in Amsterdam, has a dedicated - track about Tomcat topics. + +<p> +<a href="http://archive.apachecon.com/c/aceu2009/">ApacheCon Europe 2009</a>, + 23-27 March in Amsterdam, has a dedicated track about Tomcat topics. If you cannot make it to Amsterdam this time, you can - <a href="http://eu.apachecon.com/c/aceu2009/about/videoStreaming">watch + <a href="http://archive.apachecon.com/c/aceu2009/about/videoStreaming">watch all Tomcat talks online</a>.</p> <p>In addition to the various keynote sessions, and other technical talks, @@ -690,6 +668,10 @@ and join us in Oakland at the <a href="h </ul> +<p>See also: +<a href="http://archive.apachecon.com/c/">Apache Conferences Archive</a> +</p> + </blockquote> </p> </td> Modified: tomcat/site/trunk/xdocs/oldnews-2010.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2010.xml?rev=1435559&r1=1435558&r2=1435559&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/oldnews-2010.xml (original) +++ tomcat/site/trunk/xdocs/oldnews-2010.xml Sat Jan 19 14:37:50 2013 @@ -87,10 +87,10 @@ content directly in a web application (a </section> <section name="Apache Tomcat Track at ApacheCon North America 2010" rtext="2010-05-27"> -<p><a href="http://na.apachecon.com/c/acna2010/"><img +<p><a href="http://archive.apachecon.com/c/acna2010/"><img src="images/ACNA2010_120x240_basic.gif" width="120" height="240" align="right" hspace="10" vspace="10" alt="[ApacheCon North America 2010 -Banner]" /></a> <a href="http://na.apachecon.com/c/acna2010/">ApacheCon +Banner]" /></a> <a href="http://archive.apachecon.com/c/acna2010/">ApacheCon North America 2010</a> will be held 1-5 November 2010, at the Westin Peachtree in Atlanta, Georgia, USA.</p> <p> @@ -102,9 +102,11 @@ innovations, emerging technologies, and The Tomcat Project Management Committee (PMC) have solicited session proposals from the Tomcat community and beyond. The Tomcat track will -take place on <a href="http://na.apachecon.com/c/acna2010/schedule/2010/11/05">Friday the 5th</a> and is a whole day track. -Additionally we have a <a href="http://wiki.apache.org/tomcat/TomcatAtApacheConNA2010">meetup on Thursday the 4th</a> and sessions during the barcamp. +take place on <a href="http://archive.apachecon.com/c/acna2010/schedule/2010/11/05">Friday the 5th</a> and is a whole day track. +Additionally we have a meetup on Thursday the 4th and sessions during the barcamp. </p> +<p>See also: +<a href="http://archive.apachecon.com/c/">Apache Conferences Archive</a></p> </section> <section name="Tomcat 5.5.29 Released" rtext="2010-04-20"> @@ -148,35 +150,25 @@ Apache Tomcat. This release includes man </p> </section> -<section name="Tomcat tracks at ApacheCon US 2009"> -<A href="http://us.apachecon.com/c/acus2009/"><IMG border="0" title="ApacheCon US 2009" alt="ApacheCon US 2009 - logo" src="http://www.apache.org/ads/ApacheCon/2009-usa-125x125.png" style="width: 125px;height: 125px;" align="right"/></A> -<p>ApacheCon US 2009, 2-6 November 2009 in Oakland, CA, will have a dedicated track about Tomcat topics. +<section name="Tomcat tracks at ApacheCon US 2009" rtext="2009-11"> +<p><a href="http://archive.apachecon.com/c/acus2009/">ApacheCon US 2009</a>, + 2-6 November 2009 in Oakland, CA, will have a dedicated track about Tomcat topics. We will celebrate our 10th anniversary as an Apache project, explain the future developements: Tomcat7, asynchrounous servlets, show how to get the best of Tomcat and how to front-end Tomcat clusters. - We also have a <a href="http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009">meetup</a> on Monday evening where you can get hands-on advice and really join the ranks of the Tomcat initiated! + We also have a meetup on Monday evening where you can get hands-on advice and really join the ranks of the Tomcat initiated! </p><p> Join us in Oakland! </p> +<p>See also: +<a href="http://archive.apachecon.com/c/">Apache Conferences Archive</a></p> </section> -<section name="Free Meetup in Oakland"> -<p>During the ApacheCon a -<a href="http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009">Tomcat meetup</a> -is organised -</p> -<p>On Monday 2nd of November at 20:00 <a href="http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA">register for it</a> -and join us in Oakland at the <a href="http://us.apachecon.com/c/acus2009/">ApacheCon location.</a> -</p> -</section> - -<section name="Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009"> -<img src="http://eu.apachecon.com/page_attachments/0000/0188/Live_Video_v2.gif" - alt="[Live Video Streaming at ApacheCon]" align="right"></img> - <p>ApacheCon Europe 2009, 23-27 March in Amsterdam, has a dedicated - track about Tomcat topics. +<section name="Live Video Streaming of Tomcat Talks at ApacheCon Europe 2009" rtext="2009-03"> + <p><a href="http://archive.apachecon.com/c/aceu2009/">ApacheCon Europe 2009</a>, + 23-27 March in Amsterdam, has a dedicated track about Tomcat topics. If you cannot make it to Amsterdam this time, you can - <a href="http://eu.apachecon.com/c/aceu2009/about/videoStreaming">watch + <a href="http://archive.apachecon.com/c/aceu2009/about/videoStreaming">watch all Tomcat talks online</a>.</p> <p>In addition to the various keynote sessions, and other technical talks, the following talks related to Tomcat will be streamed on Thursday, @@ -190,6 +182,8 @@ and join us in Oakland at the <a href="h <li>Introduction to NIO2 (Jean-Francois Arcand)</li> <li>What is Bayeux? (Filip Hanik)</li> </ul> +<p>See also: +<a href="http://archive.apachecon.com/c/">Apache Conferences Archive</a></p> </section> </body> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org