You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2010/09/15 14:31:45 UTC

svn commit: r997311 [1/4] - in /harmony/standard/site/branches/live: ./ docs/ docs/documentation/ docs/documentation/milestones/ docs/images/ docs/subcomponents/buildtest/ docs/subcomponents/classlibrary/ docs/subcomponents/drlvm/ docs/subcomponents/jc...

Author: tellison
Date: Wed Sep 15 12:31:42 2010
New Revision: 997311

URL: http://svn.apache.org/viewvc?rev=997311&view=rev
Log:
Merge to live site changes for new milestones, apachecon banner, and news story.

Added:
    harmony/standard/site/branches/live/docs/images/apachecon-na2010.gif
      - copied unchanged from r997307, harmony/standard/site/trunk/docs/images/apachecon-na2010.gif
    harmony/standard/site/branches/live/xdocs/images/apachecon-na2010.gif
      - copied unchanged from r997307, harmony/standard/site/trunk/xdocs/images/apachecon-na2010.gif
Modified:
    harmony/standard/site/branches/live/   (props changed)
    harmony/standard/site/branches/live/docs/auth_cont_quest.html
    harmony/standard/site/branches/live/docs/bulk_contribution_checklist.html
    harmony/standard/site/branches/live/docs/bundles.html
    harmony/standard/site/branches/live/docs/bundles.ru.html
    harmony/standard/site/branches/live/docs/cmd_options.html
    harmony/standard/site/branches/live/docs/code_scan_tools.html
    harmony/standard/site/branches/live/docs/contribution_policy.html
    harmony/standard/site/branches/live/docs/contributors.html
    harmony/standard/site/branches/live/docs/documentation/build_website.html
    harmony/standard/site/branches/live/docs/documentation/conventions.html
    harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html
    harmony/standard/site/branches/live/docs/documentation/eclipse_update.html
    harmony/standard/site/branches/live/docs/documentation/idea_algorithm.html
    harmony/standard/site/branches/live/docs/documentation/milestones/m2-relnotes.html
    harmony/standard/site/branches/live/docs/download.html
    harmony/standard/site/branches/live/docs/faq.html
    harmony/standard/site/branches/live/docs/get-involved.html
    harmony/standard/site/branches/live/docs/guidelines.html
    harmony/standard/site/branches/live/docs/hdk.html
    harmony/standard/site/branches/live/docs/index.html
    harmony/standard/site/branches/live/docs/index.ru.html
    harmony/standard/site/branches/live/docs/issue_resolution_guideline.html
    harmony/standard/site/branches/live/docs/license.html
    harmony/standard/site/branches/live/docs/mailing.html
    harmony/standard/site/branches/live/docs/mailing.ru.html
    harmony/standard/site/branches/live/docs/newshistory.html
    harmony/standard/site/branches/live/docs/newshistory.ru.html
    harmony/standard/site/branches/live/docs/performance.html
    harmony/standard/site/branches/live/docs/presentations_papers.html
    harmony/standard/site/branches/live/docs/quickhelp_contributors.html
    harmony/standard/site/branches/live/docs/quickhelp_contributors.ru.html
    harmony/standard/site/branches/live/docs/quickhelp_users.html
    harmony/standard/site/branches/live/docs/quickhelp_users.ru.html
    harmony/standard/site/branches/live/docs/related.html
    harmony/standard/site/branches/live/docs/roadmap.html
    harmony/standard/site/branches/live/docs/sitemap.html
    harmony/standard/site/branches/live/docs/snapshots_v5.html
    harmony/standard/site/branches/live/docs/status.html
    harmony/standard/site/branches/live/docs/subcomponents/buildtest/howto.html
    harmony/standard/site/branches/live/docs/subcomponents/buildtest/index.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/agreements.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/asn1_framework.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/awt.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/compat.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/dns_support.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/index.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/java2d.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/pkgnaming.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/regexp.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/rmi_provider.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/ser_testing.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/status.html
    harmony/standard/site/branches/live/docs/subcomponents/classlibrary/testing.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/DoxygenStart.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/EM.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/JIT.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/JIT_PMF.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/JVMTI-PopFrame.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/NCAI.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/NCAI_spec.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/TM.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/breakpoints_and_ss.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/cp-verifier.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/crash_handler.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/debugging_VM_and_JIT.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/developers_guide.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/emguide.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/encoder_library.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/gc-howto.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/gc-v5.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/getting_started.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/index.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/internal_profiler.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/kernel_classes.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/verifier-files.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/verifier.html
    harmony/standard/site/branches/live/docs/subcomponents/drlvm/x-verifier.html
    harmony/standard/site/branches/live/docs/subcomponents/jchevm/index.html
    harmony/standard/site/branches/live/docs/subcomponents/performance/dacapo.html
    harmony/standard/site/branches/live/docs/subcomponents/performance/scimark.html
    harmony/standard/site/branches/live/docs/subcomponents/stresstest/index.html
    harmony/standard/site/branches/live/docs/supported_platforms.html
    harmony/standard/site/branches/live/docs/svn.html
    harmony/standard/site/branches/live/xdocs/download.xml
    harmony/standard/site/branches/live/xdocs/index.xml
    harmony/standard/site/branches/live/xdocs/stylesheets/site.vsl

Propchange: harmony/standard/site/branches/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 12:31:42 2010
@@ -1 +1 @@
-/harmony/standard/site/trunk:822221-996516
+/harmony/standard/site/trunk:822221-997307

Modified: harmony/standard/site/branches/live/docs/auth_cont_quest.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/auth_cont_quest.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/auth_cont_quest.html (original)
+++ harmony/standard/site/branches/live/docs/auth_cont_quest.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="./images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/bulk_contribution_checklist.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/bulk_contribution_checklist.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/bulk_contribution_checklist.html (original)
+++ harmony/standard/site/branches/live/docs/bulk_contribution_checklist.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="./images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/bundles.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/bundles.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/bundles.html (original)
+++ harmony/standard/site/branches/live/docs/bundles.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="./images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/bundles.ru.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/bundles.ru.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/bundles.ru.html (original)
+++ harmony/standard/site/branches/live/docs/bundles.ru.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="./images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/cmd_options.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/cmd_options.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/cmd_options.html (original)
+++ harmony/standard/site/branches/live/docs/cmd_options.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="./images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/code_scan_tools.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/code_scan_tools.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/code_scan_tools.html (original)
+++ harmony/standard/site/branches/live/docs/code_scan_tools.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="./images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/contribution_policy.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/contribution_policy.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/contribution_policy.html (original)
+++ harmony/standard/site/branches/live/docs/contribution_policy.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="./images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/contributors.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/contributors.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/contributors.html (original)
+++ harmony/standard/site/branches/live/docs/contributors.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="./images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/documentation/build_website.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/build_website.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/build_website.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/build_website.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="../images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/documentation/conventions.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/conventions.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/conventions.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/conventions.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="../images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/dev_eclipse.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="../images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/documentation/eclipse_update.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/eclipse_update.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/eclipse_update.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/eclipse_update.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="../images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/documentation/idea_algorithm.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/idea_algorithm.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/idea_algorithm.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/idea_algorithm.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="../images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->
 

Modified: harmony/standard/site/branches/live/docs/documentation/milestones/m2-relnotes.html
URL: http://svn.apache.org/viewvc/harmony/standard/site/branches/live/docs/documentation/milestones/m2-relnotes.html?rev=997311&r1=997310&r2=997311&view=diff
==============================================================================
--- harmony/standard/site/branches/live/docs/documentation/milestones/m2-relnotes.html (original)
+++ harmony/standard/site/branches/live/docs/documentation/milestones/m2-relnotes.html Wed Sep 15 12:31:42 2010
@@ -53,13 +53,12 @@ limitations under the License.
                         <a id="harmonyLogo" href="http://harmony.apache.org/"><img src="../../images/harmony-logo-new.png" alt="Apache Harmony"
           width="415" height="50" /></a>
       
-            <!-- Advertisement
-            <a href="http://www.us.apachecon.com">
+            <!-- Advertisement -->
+            <a href="http://na.apachecon.com">
                 <img id="advertisement"
-                     src="http://www.us.apachecon.com/page_attachments/0000/0211/234x60_bold.gif"
+                     src="images/apachecon-na2010.gif"
                      width="234" height="60"
-                     alt="ApacheCon US 2009" /></a>
-            -->
+                     alt="ApacheCon US 2010" /></a>
 
             </div> <!-- pageHeader -->