From 0a890ccf68463c736b5e44d5bd060725c7b24fa5 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Thu, 18 Sep 2003 14:27:02 +0000
Subject: [PATCH] ApacheCon blurb

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275259 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/index.html | 27 +++++++++++++--------------
 docs/page.css   | 40 ++++++++++++++++++++--------------------
 xdocs/index.xml | 42 ++++++++++++++++++++----------------------
 3 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 2bbf80e38..e8063291b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -169,25 +169,24 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
-      <a name="Ant wins Java Pro award"></a>
-      Ant wins Java Pro award
+      <a name="ApacheCon 2003"></a>
+      ApacheCon 2003
     </h3>
-                        <a href="http://www.ftponline.com/javapro/">
-      <img style="padding: 5px" src="images/jp_rcwinner_2003.gif" alt="" border="0" height="80" width="139" align="right" />
-    </a>
+                        <a href="http://apachecon.com/2003/US/index.html">
+    <img align="right" border="0" src="http://jakarta.apache.org/images/logos/ac2003-150.gif" />
+  </a>
                                 <p>
-    Following on from recently winning the Javaworld Editors' award, Ant has 
-    been awarded the Java Pro 2003 Readers' Choice Award for
-    </p>
-                                <p>
-          <strong>Most Valuable Java Deployment Technology</strong>
+    <a href="http://apachecon.com/2003/US/index.html">ApacheCon US 2003</a>
+    is now open for registration. ApacheCon is the conference for all things
+    Apache. Come along and learn about a range of new technologies, meet some
+    Apache folks and share the knowledge.
     </p>
                         <h3 class="section">
       <a name="Ant 1.5.4"></a>
       Ant 1.5.4
     </h3>
-                        <p>Apache Ant 1.5.4 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>. 
+                        <p>Apache Ant 1.5.4 is now available for
+     <a href="http://ant.apache.org/bindownload.cgi">download</a>.
     </p>
                                 <div class="warning">
     <div class="label">Note</div>
@@ -248,14 +247,14 @@ You can view the documentation for the current release (Apache Ant 1.5.4)
 <a href="manual/index.html">online</a>
 </p>
                                 <p>
-Comprehensive documentation is included in the source and binary distributions. 
+Comprehensive documentation is included in the source and binary distributions.
 </p>
                         <h3 class="section">
       <a name="Nightly Builds"></a>
       Nightly Builds
     </h3>
                         <p>
-    If you wish to use the latest Ant features, you can try downloading a nightly 
+    If you wish to use the latest Ant features, you can try downloading a nightly
     build from <a href="http://cvs.apache.org/builds/ant/nightly/">here</a>
     </p>
                         <h3 class="section">
diff --git a/docs/page.css b/docs/page.css
index 20ac475bf..b4e2feade 100644
--- a/docs/page.css
+++ b/docs/page.css
@@ -1,9 +1,9 @@
-body {  
+body {
     background-color: #FFFFFF;
     color: #000000;
-    margin: 0px 0px 0px 0px; 
-    font-family: Verdana, Helvetica, sans-serif;  
-    font-size : 90%;  
+    margin: 0px 0px 0px 0px;
+    font-family: Verdana, Helvetica, sans-serif;
+    font-size : 90%;
 }
 
 a:link { color: #0F3660; }
@@ -12,15 +12,15 @@ a:active { color: #000066; }
 a:hover { color: #000066; }
 
 .menucontainer {
-    float: left; 
-    background-color: #4C6C8F; 
-    margin: 0px 5px; 
-    width: 250px; 
+    float: left;
+    background-color: #4C6C8F;
+    margin: 0px 5px;
+    width: 250px;
 }
 
 .menu {
-    font-size : 90%; 
-    padding: 3px 8px 5px 3px; 
+    font-size : 90%;
+    padding: 3px 8px 5px 3px;
     border-right: 1px solid #294563;
     border-left: 1px solid #294563;
 }
@@ -52,15 +52,15 @@ table .title { background-color: #FFFFFF; width:100%; border: 0px; }
 .pre { white-space: pre;}
 .nowrap { white-space: nowrap;}
 
-.main { 
+.main {
     margin-left: 280px;
     margin-right: 5px;
 }
 
-.content { 
-    padding: 5px 5px 5px 10px; 
-    font : small Verdana, Helvetica, sans-serif;  
-    font-size : 90%; 
+.content {
+    padding: 5px 5px 5px 10px;
+    font : small Verdana, Helvetica, sans-serif;
+    font-size : 90%;
 }
 
 .content .ForrestTable { width: 100%; background-color: #7099C5; color: #ffffff; font-size : 90%;}
@@ -112,7 +112,7 @@ table .title { background-color: #FFFFFF; width:100%; border: 0px; }
     font-family: arial,helvetica,sanserif;
     background-color: #4C6C8F;
     color: #ffffff;
-    font-weight: bold; 
+    font-weight: bold;
     padding: 2px;
     clear: right;
 }
@@ -153,20 +153,20 @@ table .title { background-color: #FFFFFF; width:100%; border: 0px; }
     clear: both;
     text-align: center;
     margin: 0px;
-    border-top: thin solid #4C6C8F; 
+    border-top: thin solid #4C6C8F;
 }
 
 .bluebar {
-    padding: 5px 5px 5px 10px; 
+    padding: 5px 5px 5px 10px;
     background-color: #4C6C8F;
     margin: 0px;
 }
 
 .lightbluebar {
-    padding: 5px 5px 5px 10px; 
+    padding: 5px 5px 5px 10px;
     background-color: #CFDCED;
     margin: 0px;
-    border-top: 1px solid #294563; 
+    border-top: 1px solid #294563;
     border-bottom: 1px solid #294563;
 }
 
diff --git a/xdocs/index.xml b/xdocs/index.xml
index d213a7a38..41cc13bca 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -9,26 +9,24 @@
 
 <body>
 
- <section name="Ant wins Java Pro award">
-    <a href="http://www.ftponline.com/javapro/">
-      <img style="padding: 5px" src="images/jp_rcwinner_2003.gif" alt="" 
-           border="0" height="80" width="139" align="right"/>
-    </a>
-
-    <p>
-    Following on from recently winning the Javaworld Editors' award, Ant has 
-    been awarded the Java Pro 2003 Readers' Choice Award for
-    </p>
+<section name="ApacheCon 2003">
+  <a href="http://apachecon.com/2003/US/index.html">
+    <img align="right"
+         border="0" src="http://jakarta.apache.org/images/logos/ac2003-150.gif"/>
+  </a>
     <p>
-          <strong>Most Valuable Java Deployment Technology</strong>
+    <a href="http://apachecon.com/2003/US/index.html">ApacheCon US 2003</a>
+    is now open for registration. ApacheCon is the conference for all things
+    Apache. Come along and learn about a range of new technologies, meet some
+    Apache folks and share the knowledge.
     </p>
 </section>
-    
+
  <section name="Ant 1.5.4">
-    <p>Apache Ant 1.5.4 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>. 
+    <p>Apache Ant 1.5.4 is now available for
+     <a href="http://ant.apache.org/bindownload.cgi">download</a>.
     </p>
-    
+
     <div class="warning">
     <div class="label">Note</div>
     <div class="content">Ant 1.5.4 will be the last release that supports
@@ -36,7 +34,7 @@
       later
     </div>
     </div>
-    
+
   </section>
 
   <section name="Apache Ant">
@@ -86,28 +84,28 @@ on.
 </p>
 
   </section>
-  
+
   <section name="Documentation">
-  
+
 <p>
 You can view the documentation for the current release (Apache Ant 1.5.4)
 <a href="manual/index.html">online</a>
 </p>
 
 <p>
-Comprehensive documentation is included in the source and binary distributions. 
+Comprehensive documentation is included in the source and binary distributions.
 </p>
 
   </section>
 
   <section name="Nightly Builds">
     <p>
-    If you wish to use the latest Ant features, you can try downloading a nightly 
+    If you wish to use the latest Ant features, you can try downloading a nightly
     build from <a href="http://cvs.apache.org/builds/ant/nightly/">here</a>
     </p>
-    
+
   </section>
-  
+
   <section name="Get Involved">
 <ul>
 <li><a href="http://jakarta.apache.org/getinvolved/getinvolvedindex.html">Get Involved</a></li>