Return-Path: 
 <derby-commits-return-1789-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 70657 invoked from network); 9 Nov 2005 20:07:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 9 Nov 2005 20:07:56 -0000
Received: (qmail 33052 invoked by uid 500); 9 Nov 2005 20:07:56 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 32990 invoked by uid 500); 9 Nov 2005 20:07:56 -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 32979 invoked by uid 99); 9 Nov 2005 20:07:55 -0000
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 [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 09 Nov 2005 12:07:55 -0800
Received: (qmail 70313 invoked by uid 65534); 9 Nov 2005 20:07:35 -0000
Message-ID: <20051109200735.70311.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r332132 - in /db/derby/site/trunk: build/site/index.html
 src/documentation/content/xdocs/index.xml
Date: Wed, 09 Nov 2005 20:07:34 -0000
To: derby-commits@db.apache.org
From: jta@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jta
Date: Wed Nov  9 12:07:31 2005
New Revision: 332132

URL: http://svn.apache.org/viewcvs?rev=332132&view=rev
Log:
The ApacheCon US 2005 Performance session moved from Tuesday to Wednesday;
updated the Derby home page accordingly. Also mentioned the 50% scholarship 
for the tutorial.

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/viewcvs/db/derby/site/trunk/build/site/index.html?rev=332132&r1=332131&r2=332132&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/index.html (original)
+++ db/derby/site/trunk/build/site/index.html Wed Nov  9 12:07:31 2005
@@ -162,14 +162,19 @@
      
 <ul>
        
-<li> Apache Derby: Hands On Tutorial (Saturday) </li>
+<li> Apache Derby: Hands On Tutorial 
+            (Saturday) 
+            <a class="external" href="http://www.apachecon.com/2005/US/html/sessions.html/e=MjAwNS9VUw#1436">The first 25 to register will receive a 50% scholarship 
+     courtesy of IBM.</a>
+             
+</li>
        
-<li> Performance Analysis of Apache Derby (Tuesday)</li>
-       
-<li> Apache Derby Security (Wednesday)</li>
+<li> Performance Analysis of Apache Derby (Wednesday)</li>
        
 <li> Building Highly Available Applications with Geronimo and Derby
             (Wednesday)</li>
+       
+<li> Apache Derby Security (Wednesday)</li>
      
 </ul>
   
@@ -181,7 +186,7 @@
 </div>
 
 
-<a name="N10038"></a><a name="News"></a>
+<a name="N1003C"></a><a name="News"></a>
 <h2 class="boxed">News</h2>
 <div class="section">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -234,7 +239,7 @@
 </div>
 
 
-<a name="N10091"></a><a name="Derby+Project+Charter"></a>
+<a name="N10095"></a><a name="Derby+Project+Charter"></a>
 <h2 class="boxed">Derby Project Charter</h2>
 <div class="section">
 <p>
@@ -253,7 +258,7 @@
 <li>Secure</li>
 
 </ul>
-<a name="N100AB"></a><a name="Database+Technology"></a>
+<a name="N100AF"></a><a name="Database+Technology"></a>
 <h3 class="boxed">Database Technology</h3>
 <p>
   Database technology is defined as software that processes data related 
@@ -261,26 +266,26 @@
   Data requests include data definition, data modification and data retrieval.
   Database GUI tooling and IDEs are not developed by the Derby project.
   </p>
-<a name="N100B4"></a><a name="Pure+Java"></a>
+<a name="N100B8"></a><a name="Pure+Java"></a>
 <h3 class="boxed">Pure Java</h3>
 <p>
   Derby technology is written in Java to take advantage of Java&rsquo;s write 
   once, run anywhere promise. 
   Java platforms such as OSGi, J2ME, J2SE and J2EE are supported as appropriate.
   </p>
-<a name="N100BD"></a><a name="Easy+to+Use"></a>
+<a name="N100C1"></a><a name="Easy+to+Use"></a>
 <h3 class="boxed">Easy to Use</h3>
 <p>
   Derby technology aims to be easy to use for software developers and zero administration for end users.
   </p>
-<a name="N100C6"></a><a name="Small+Footprint"></a>
+<a name="N100CA"></a><a name="Small+Footprint"></a>
 <h3 class="boxed">Small Footprint</h3>
 <p>
   Derby technologies are designed to provide significant useful 
   functionality in a small code size footprint with efficient runtime 
   resource usage.
   </p>
-<a name="N100CF"></a><a name="Standards+based"></a>
+<a name="N100D3"></a><a name="Standards+based"></a>
 <h3 class="boxed">Standards based</h3>
 <p>
   Derby technology adheres to database standards such as JDBC
@@ -292,7 +297,7 @@
   And it also means developers can later migrate to other databases if they
   so choose.
   </p>
-<a name="N100D8"></a><a name="Secure"></a>
+<a name="N100DC"></a><a name="Secure"></a>
 <h3 class="boxed">Secure</h3>
 <p>
   Derby technology provides secure data management appropriate to environment 
@@ -304,17 +309,17 @@
 </div>
 
 
-<a name="N100E2"></a><a name="Derby+Technologies"></a>
+<a name="N100E6"></a><a name="Derby+Technologies"></a>
 <h2 class="boxed">Derby Technologies</h2>
 <div class="section">
-<a name="N100E7"></a><a name="Derby+embedded+database+engine"></a>
+<a name="N100EB"></a><a name="Derby+embedded+database+engine"></a>
 <h3 class="boxed">Derby embedded database engine</h3>
 <p>
    The core of the technology, Derby&rsquo;s database engine is a full 
    functioned relational embedded database engine. JDBC and SQL are the 
    programming APIs. 
   </p>
-<a name="N100F0"></a><a name="Derby+network+server"></a>
+<a name="N100F4"></a><a name="Derby+network+server"></a>
 <h3 class="boxed">Derby network server</h3>
 <p>
    The Derby network server increases the reach of the Derby database
@@ -324,7 +329,7 @@
    The network server allows the Derby engine to support networked JDBC, 
    ODBC/CLI, Perl and PHP.
   </p>
-<a name="N100F9"></a><a name="Database+Utilities"></a>
+<a name="N100FD"></a><a name="Database+Utilities"></a>
 <h3 class="boxed">Database Utilities</h3>
 <ul>
    
@@ -346,7 +351,7 @@
 </div>
 
 
-<a name="N10115"></a><a name="Derby+History"></a>
+<a name="N10119"></a><a name="Derby+History"></a>
 <h2 class="boxed">Derby History</h2>
 <div class="section">
 <p>
@@ -369,7 +374,7 @@
 
 <p>
 
-<em>Last updated: 6-August-2005</em>
+<em>Last updated: 9-November-2005</em>
 
 </p>
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/index.xml?rev=332132&r1=332131&r2=332132&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/index.xml Wed Nov  9 12:07:31 2005
@@ -13,11 +13,15 @@
   <td> <a href="http://www.apachecon.com"><img src="images/Conference125x125.jpg" alt="ApacheCon US 2005"/></a></td>
   <td><p>Apache Derby sessions include:</p>
      <ul>
-       <li> Apache Derby: Hands On Tutorial (Saturday) </li>
-       <li> Performance Analysis of Apache Derby (Tuesday)</li>
-       <li> Apache Derby Security (Wednesday)</li>
+       <li> Apache Derby: Hands On Tutorial 
+            (Saturday) 
+            <a href="http://www.apachecon.com/2005/US/html/sessions.html/e=MjAwNS9VUw#1436">The first 25 to register will receive a 50% scholarship 
+     courtesy of IBM.</a>
+             </li>
+       <li> Performance Analysis of Apache Derby (Wednesday)</li>
        <li> Building Highly Available Applications with Geronimo and Derby
             (Wednesday)</li>
+       <li> Apache Derby Security (Wednesday)</li>
      </ul>
   </td>
 </tr>
@@ -189,7 +193,7 @@
 </section>
 
 <p>
-<em>Last updated: 6-August-2005</em>
+<em>Last updated: 9-November-2005</em>
 </p>
 
 </body>