You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by jt...@apache.org on 2006/06/16 22:30:21 UTC
svn commit: r414899 - in /db/derby/site/trunk: build/site/index.html src/documentation/content/xdocs/index.xml

Author: jta
Date: Fri Jun 16 13:30:21 2006
New Revision: 414899

URL: http://svn.apache.org/viewvc?rev=414899&view=rev
Log:
Added ApacheCon Asia and U.S. dates to Derby home page.

Modified:
    db/derby/site/trunk/build/site/index.html
    db/derby/site/trunk/src/documentation/content/xdocs/index.xml

Modified: db/derby/site/trunk/build/site/index.html
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/index.html?rev=414899&r1=414898&r2=414899&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/index.html (original)
+++ db/derby/site/trunk/build/site/index.html Fri Jun 16 13:30:21 2006
@@ -113,7 +113,7 @@
 <a href="#Google+Summer+of+Code+2006">Google Summer of Code 2006</a>
 </li>
 <li>
-<a href="#ApacheCon+Europe+2006">ApacheCon Europe 2006</a>
+<a href="#ApacheCon">ApacheCon</a>
 </li>
 </ul>
 </li>
@@ -176,28 +176,55 @@
 Information about this year's Derby projects is on the
 <a class="external" href="http://wiki.apache.org/db-derby/GoogleSummerOfCodeProjects">Derby wiki</a>.
 </p>
-<a name="N10058"></a><a name="ApacheCon+Europe+2006"></a>
-<h3 class="boxed">ApacheCon Europe 2006</h3>
+<a name="N10058"></a><a name="ApacheCon"></a>
+<h3 class="boxed">ApacheCon</h3>
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
 
 <tr>
+   
+<th colspan="1" rowspan="1">Date</th>
+   <th colspan="1" rowspan="1">Region</th>
+   <th colspan="1" rowspan="1">Location</th>
+   <th colspan="1" rowspan="1">Call for papers due</th>
 
-<td colspan="1" rowspan="1">
-<a class="external" href="http://www.eu.apachecon.com"><img alt="ApacheCon Europe 2006" src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif"></a>
-</td>
-<td colspan="1" rowspan="1">
-ApacheCon Europe 2006 will be in Dublin, Ireland, 
-June 26-30, 2006. Details are on the
-<a class="external" href="http://www.eu.apachecon.com">ApacheCon Europe</a> website.
-</td>
+</tr>
+
+
+<tr>
+   
+<td colspan="1" rowspan="1">June 26-30, 2006</td>
+   <td colspan="1" rowspan="1"> <a class="external" href="http://www.eu.apachecon.com">Europe</a></td>
+   <td colspan="1" rowspan="1">Dublin, Ireland</td>
+   <td colspan="1" rowspan="1"> &nbsp; </td>
 
 </tr>
 
+
+<tr>
+   
+<td colspan="1" rowspan="1">August 15-17, 2006</td>
+   <td colspan="1" rowspan="1"> <a class="external" href="http://www.asia.apachecon.com">Asia</a></td>
+   <td colspan="1" rowspan="1">Colombo, Sri Lanka</td>
+   <td colspan="1" rowspan="1"> July 9, 2006 </td>
+
+</tr>
+
+
+<tr>
+   
+<td colspan="1" rowspan="1">October 9-13, 2006</td>
+   <td colspan="1" rowspan="1"> <a class="external" href="http://www.us.apachecon.com">U.S.</a></td>
+   <td colspan="1" rowspan="1">Austin, Texas</td>
+   <td colspan="1" rowspan="1"> June 28, 2006 </td>
+
+</tr>
+
+
 </table>
 </div>
 
 
-<a name="N10079"></a><a name="News"></a>
+<a name="N100C7"></a><a name="News"></a>
 <h2 class="boxed">News</h2>
 <div class="section">
 <ul>
@@ -254,7 +281,7 @@
 
 <p>
 
-<em>Last updated: 30-May-2006</em>
+<em>Last updated: 16-June-2006</em>
 
 </p>
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/index.xml?rev=414899&r1=414898&r2=414899&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/index.xml Fri Jun 16 13:30:21 2006
@@ -50,19 +50,37 @@
 </p>
 </section>
 
-<section><title>ApacheCon Europe 2006</title>
+<section><title>ApacheCon</title>
 
 <table>
 <tr>
-<td>
-<a href="http://www.eu.apachecon.com"><img src="http://www.eu.apachecon.com/konferenzen/apachecon06/images/header-left.gif" alt="ApacheCon Europe 2006"/></a>
-</td>
-<td>
-ApacheCon Europe 2006 will be in Dublin, Ireland, 
-June 26-30, 2006. Details are on the
-<a href="http://www.eu.apachecon.com">ApacheCon Europe</a> website.
-</td>
+   <th>Date</th>
+   <th>Region</th>
+   <th>Location</th>
+   <th>Call for papers due</th>
 </tr>
+
+<tr>
+   <td>June 26-30, 2006</td>
+   <td> <a href="http://www.eu.apachecon.com">Europe</a></td>
+   <td>Dublin, Ireland</td>
+   <td> &nbsp; </td>
+</tr>
+
+<tr>
+   <td>August 15-17, 2006</td>
+   <td> <a href="http://www.asia.apachecon.com">Asia</a></td>
+   <td>Colombo, Sri Lanka</td>
+   <td> July 9, 2006 </td>
+</tr>
+
+<tr>
+   <td>October 9-13, 2006</td>
+   <td> <a href="http://www.us.apachecon.com">U.S.</a></td>
+   <td>Austin, Texas</td>
+   <td> June 28, 2006 </td>
+</tr>
+
 </table>
 </section>
 
@@ -105,7 +123,7 @@
 </section>
 
 <p>
-<em>Last updated: 30-May-2006</em>
+<em>Last updated: 16-June-2006</em>
 </p>
 
 </body>