Return-Path: 
 <derby-commits-return-6255-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 35973 invoked from network); 25 Jan 2007 16:27:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 25 Jan 2007 16:27:35 -0000
Received: (qmail 82148 invoked by uid 500); 25 Jan 2007 16:27:41 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 82124 invoked by uid 500); 25 Jan 2007 16:27:41 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 82113 invoked by uid 99); 25 Jan 2007 16:27:41 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jan 2007 08:27:41 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jan 2007 08:27:34 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7E8861A981D; Thu, 25 Jan 2007 08:27:14 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r499831 - in /db/derby/site/trunk: build/site/index.html
 src/documentation/content/xdocs/index.xml
Date: Thu, 25 Jan 2007 16:27:14 -0000
To: derby-commits@db.apache.org
From: jta@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070125162714.7E8861A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jta
Date: Thu Jan 25 08:27:12 2007
New Revision: 499831

URL: http://svn.apache.org/viewvc?view=rev&rev=499831
Log:
Switched ApacheCon section on the home page to incorporate the ConCom images 
as described in 

    http://www.apache.org/ads/adserver.txt 

However, Forrest 0.7 doesn't support iframe nor comments (FOR-834) for the 
include strategy, so the images have to be hardcoded.  Copied source from     

    http://www.apache.org/ads/bannerbar.html 

Then removed the elements that forrest doesn't support, such as "div", "border" in an image and "style".

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?view=diff&rev=499831&r1=499830&r2=499831
==============================================================================
--- db/derby/site/trunk/build/site/index.html (original)
+++ db/derby/site/trunk/build/site/index.html Thu Jan 25 08:27:12 2007
@@ -178,31 +178,19 @@
 </p>
 <a name="N10059"></a><a name="ApacheCon"></a>
 <h3 class="boxed">ApacheCon</h3>
-<table class="ForrestTable" cellspacing="1" cellpadding="4">
+<p>
+
+<a class="external" href="http://www.apachecon.com/2007/EU"><img alt="ApacheCon Europe 2007" height="60" src="http://www.apache.org/ads/ApacheCon/2007-europe-234x60.png" width="234"></a>
 
-<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>
-
-</tr>
-
-<tr> 
-   
-<td colspan="1" rowspan="1">May 1-4, 2007</td>
-   <td colspan="1" rowspan="1"> <a class="external" href="http://www.apachecon.com/2007/EU">Europe</a></td>
-   <td colspan="1" rowspan="1">Amsterdam</td>
-   <td colspan="1" rowspan="1"> <a class="external" href="http://www.apachecon.com/">January 12, 2007</a> </td>
+<br>
 
-</tr>
+<a class="external" href="http://people.apache.org/calendar.html#200711"><img alt="ApacheCon US 2007" height="60" src="http://www.apache.org/ads/ApacheCon/2007-usa-234x60.png" width="234"></a>
 
-</table>
+</p>
 </div>
 
 
-<a name="N10098"></a><a name="News"></a>
+<a name="N1007B"></a><a name="News"></a>
 <h2 class="boxed">News</h2>
 <div class="section">
 <ul>
@@ -279,7 +267,7 @@
 
 <p>
 
-<em>Last updated: 20-Dec-2006</em>
+<em>Last updated: 25-Jan-2007</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?view=diff&rev=499831&r1=499830&r2=499831
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/index.xml Thu Jan 25 08:27:12 2007
@@ -68,20 +68,22 @@
 
 <section><title>ApacheCon</title>
 
-<table>
-<tr>
-   <th>Date</th>
-   <th>Region</th>
-   <th>Location</th>
-   <th>Call for papers due</th>
-</tr>
-<tr> 
-   <td>May 1-4, 2007</td>
-   <td> <a href="http://www.apachecon.com/2007/EU">Europe</a></td>
-   <td>Amsterdam</td>
-   <td> <a href="http://www.apachecon.com/">January 12, 2007</a> </td>
-</tr>
-</table>
+<!-- Incorporate the ConCom images as described in 
+    http://www.apache.org/ads/adserver.txt 
+However, Forrest 0.7 doesn't support iframe nor comments (FOR-834) for the
+include strategy, so the images have to be hardcoded.  Copied source from 
+    http://www.apache.org/ads/bannerbar.html 
+Then removed the elements that forrest doesn't support, such as "div", 
+"border" in an image and "style".
+-->
+<!-- ads start -->
+<p>
+<a href="http://www.apachecon.com/2007/EU"><img src="http://www.apache.org/ads/ApacheCon/2007-europe-234x60.png" width="234" height="60" alt="ApacheCon Europe 2007"/></a>
+<br />
+<a href="http://people.apache.org/calendar.html#200711"><img src="http://www.apache.org/ads/ApacheCon/2007-usa-234x60.png" width="234" height="60" alt="ApacheCon US 2007"/></a>
+</p>
+<!-- ads end -->
+
 </section>
 
 </section>
@@ -136,7 +138,7 @@
 </section>
 
 <p>
-<em>Last updated: 20-Dec-2006</em>
+<em>Last updated: 25-Jan-2007</em>
 </p>
 
 </body>