ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r1045279 [3/12] - in /ant/core/branches/ANT_SITE: ./ docs/ docs/antlibs/ docs/antlibs/antunit/ docs/antlibs/compress/ docs/antlibs/dotnet/ docs/antlibs/props/ docs/antlibs/svn/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ docs...
Date Mon, 13 Dec 2010 18:34:09 GMT
Modified: ant/core/branches/ANT_SITE/docs/antnews.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/antnews.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/antnews.html (original)
+++ ant/core/branches/ANT_SITE/docs/antnews.html Mon Dec 13 18:34:00 2010
@@ -21,7 +21,7 @@
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - News</title>
+        <title>Apache Ant - Apache Ant&#x2122; Project News</title>
         <link type="text/css" href="./page.css" rel="stylesheet">
           <meta name="author" content="Conor MacNeill">
   <meta name="email" content="">
@@ -105,11 +105,11 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
-                              <span class="sel">News</span>
-                              </li>
+                                    <a href="./antnews.html">News</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Documentation
@@ -145,6 +145,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -161,6 +164,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -171,9 +177,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -203,15 +206,26 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">News</h1>
+    <h1 class="title">Apache Ant&#x2122; Project News</h1>
             <h3 class="section">
-      <a name="Ant1.8.0"></a>
-      Ant1.8.0
+      <a name="Apache Ant 1.8.1"></a>
+      Apache Ant 1.8.1
     </h3>
-                        <h3>Februrary 8th, 2010 - Ant 1.8.0 Released</h3>
-                                <p>Apache Ant 1.8.0 is now available for download as source or binary (with and without
+                        <h3>May 7th, 2010 - Apache Ant 1.8.1 Released</h3>
+                                <p>Apache Ant 1.8.1 is now available for download as source or binary (with and without
       dependencies) from
       <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
+                                <p>Key features of the 1.8.1 release are</p>
+                                <ul>
+      <li>new task augment allows to add attributes or nested elements to previously defined references</li>
+      <li>numerous bug fixes and improvements as documented in Bugzilla
+        and in WHATSNEW</li>
+    </ul>
+                        <h3 class="section">
+      <a name="Apache Ant 1.8.0"></a>
+      Apache Ant 1.8.0
+    </h3>
+                        <h3>Februrary 8th, 2010 - Apache Ant 1.8.0 Released</h3>
                                 <p>Key features of the 1.8.0 release are</p>
                                 <ul>
       <li>Lexically scoped local properties, i.e. properties that are only defined inside a target, 
@@ -249,8 +263,8 @@
         and in WHATSNEW</li>
     </ul>
                         <h3 class="section">
-      <a name="Ivy 2.1.0"></a>
-      Ivy 2.1.0
+      <a name="Apache Ivy 2.1.0"></a>
+      Apache Ivy 2.1.0
     </h3>
                         <h3>October 8, 2009 - Apache Ivy 2.1.0 Released</h3>
                                 <p>Apache Ivy 2.1.0 is now available for download as source or binary (with and without
@@ -268,8 +282,8 @@
                                 <p>For more information see
       the <a href="http://ant.apache.org/ivy/">Ivy home page</a>.</p>
                         <h3 class="section">
-      <a name="IvyDE 2.0.0"></a>
-      IvyDE 2.0.0
+      <a name="Apache IvyDE 2.0.0"></a>
+      Apache IvyDE 2.0.0
     </h3>
                         <h3>July 13, 2009 - Apache IvyDE 2.0.0 Released</h3>
                                 <p>Apache IvyDE 2.0.0 is now available for download from 
@@ -291,8 +305,8 @@ have been reported to be working like a 
                                 <p>For more information see
       the <a href="http://ant.apache.org/ivy/ivyde/">IvyDE home page</a>.</p>
                         <h3 class="section">
-      <a name="Ivy 2.0.0"></a>
-      Ivy 2.0.0
+      <a name="Apache Ivy 2.0.0"></a>
+      Apache Ivy 2.0.0
     </h3>
                         <h3>January 20, 2009 - Apache Ivy 2.0.0 Released</h3>
                                 <p>Apache Ivy 2.0.0 (final) is now available for download as source or binary (with and without
@@ -303,8 +317,8 @@ have been reported to be working like a 
       and numerous bug fixes and other improvements.</p>
                                 <p>For more information see the <a href="http://ant.apache.org/ivy/">Ivy home page</a>.</p>
                         <h3 class="section">
-      <a name="AntUnit 1.1"></a>
-      AntUnit 1.1
+      <a name="Apache AntUnit 1.1"></a>
+      Apache AntUnit 1.1
     </h3>
                         <h3>September 26, 2008 - Apache AntUnit 1.1 Released</h3>
                                 <p>Apache AntUnit 1.1 is now available for download as <a href="http://ant.apache.org/antlibs/bindownload.cgi">binary</a>
@@ -318,15 +332,15 @@ have been reported to be working like a 
                                 <p>For more information see the <a href="antlibs/antunit/">Antlib's
         home page</a></p>
                         <h3 class="section">
-      <a name="AntUnit 1.1 Beta 1"></a>
-      AntUnit 1.1 Beta 1
+      <a name="Apache AntUnit 1.1 Beta 1"></a>
+      Apache AntUnit 1.1 Beta 1
     </h3>
                         <h3>September 3, 2008 - Apache AntUnit 1.1 Beta 1 Available</h3>
                         <h3 class="section">
-      <a name="Ant 1.7.1"></a>
-      Ant 1.7.1
+      <a name="Apache Ant 1.7.1"></a>
+      Apache Ant 1.7.1
     </h3>
-                        <h3>June 27, 2008 - Ant 1.7.1 Available</h3>
+                        <h3>June 27, 2008 - Apache Ant 1.7.1 Available</h3>
                                 <p>Apache Ant 1.7.1 is now available for <a href="http://ant.apache.org/bindownload.cgi">download</a>.</p>
                                 <p> Ant 1.7.1 is mainly a bugfix release.</p>
                                 <p>Ant 1.7.1 has extended support for Java6 features.</p>
@@ -344,18 +358,18 @@ have been reported to be working like a 
     Ivy from its <a href="http://incubator.apache.org/ivy/">Incubator
     website</a>.</p>
                         <h3 class="section">
-      <a name="AntUnit 1.0"></a>
-      AntUnit 1.0
+      <a name="Apache AntUnit 1.0"></a>
+      Apache AntUnit 1.0
     </h3>
                         <h3>January 8, 2007 - Apache AntUnit 1.0 Available</h3>
                                 <p>Apache AntUnit 1.0 is now available for <a href="http://ant.apache.org/antlibs/bindownload.cgi">download</a>.</p>
                                 <p>This Ant Library contains tasks to test Ant tasks using Ant
     instead of JUnit.  For more information see the <a href="antlibs/antunit/">AntUnit home page</a>.</p>
                         <h3 class="section">
-      <a name="Ant 1.7.0"></a>
-      Ant 1.7.0
+      <a name="Apache Ant 1.7.0"></a>
+      Apache Ant 1.7.0
     </h3>
-                        <h3>December 19, 2006 - Ant 1.7.0 Available</h3>
+                        <h3>December 19, 2006 - Apache Ant 1.7.0 Available</h3>
                                 <p>Apache Ant 1.7.0 is now available for <a href="http://ant.apache.org/bindownload.cgi">download</a>.</p>
                                 <p> Ant 1.7 introduces a resource framework. Some of the core ant 
     tasks such as &lt;copy/&gt; are now able to process not only file 
@@ -372,8 +386,8 @@ have been reported to be working like a 
                                 <p>Ant 1.7 fixes also a large number of bugs.</p>
                                 <p>Ant 1.7 has some initial support for Java6 features.</p>
                         <h3 class="section">
-      <a name=".NET Ant Library 1.0Beta1"></a>
-      .NET Ant Library 1.0Beta1
+      <a name="Apache .NET Ant Library 1.0Beta1"></a>
+      Apache .NET Ant Library 1.0Beta1
     </h3>
                         <h3>November 6, 2006 - Apache .NET Ant Library 1.0 Available</h3>
                                 <p>Apache .NET Ant Library 1.0 is now available for <a href="http://ant.apache.org/antlibs/bindownload.cgi">download</a>.</p>
@@ -383,24 +397,24 @@ have been reported to be working like a 
                                 <p>For more information see the <a href="antlibs/dotnet/">Antlib's
     home page</a></p>
                         <h3 class="section">
-      <a name="AntUnit 1.0Beta2"></a>
-      AntUnit 1.0Beta2
+      <a name="Apache AntUnit 1.0Beta2"></a>
+      Apache AntUnit 1.0Beta2
     </h3>
                         <h3>October 29, 2006 - Apache AntUnit 1.0Beta2 Available</h3>
                                 <p>Apache AntUnit 1.0Beta1 is now available for <a href="http://ant.apache.org/antlibs/bindownload.cgi">download</a>.</p>
                                 <p>This Ant Library contains tasks to test Ant tasks using Ant
     instead of JUnit.  For more information see the <a href="antlibs/antunit/">AntUnit home page</a>.</p>
                         <h3 class="section">
-      <a name="AntUnit 1.0Beta1"></a>
-      AntUnit 1.0Beta1
+      <a name="Apache AntUnit 1.0Beta1"></a>
+      Apache AntUnit 1.0Beta1
     </h3>
                         <h3>September 22, 2006 - Apache AntUnit 1.0Beta1 Available</h3>
                                 <p>Apache AntUnit 1.0Beta1 is now available for <a href="http://ant.apache.org/antlibs/bindownload.cgi">download</a>.</p>
                                 <p>This Ant Library contains tasks to test Ant tasks using Ant
     instead of JUnit.  For more information see the <a href="antlibs/antunit/">AntUnit home page</a>.</p>
                         <h3 class="section">
-      <a name=".NET Ant Library 1.0Beta1"></a>
-      .NET Ant Library 1.0Beta1
+      <a name="Apache .NET Ant Library 1.0Beta1"></a>
+      Apache .NET Ant Library 1.0Beta1
     </h3>
                         <h3>September 13, 2006 - Apache .NET Ant Library 1.0Beta1 Available</h3>
                                 <p>Apache .NET Ant Library 1.0Beta1 is now available for <a href="http://ant.apache.org/antlibs/bindownload.cgi">download</a>.</p>
@@ -410,32 +424,32 @@ have been reported to be working like a 
                                 <p>For more information see the <a href="antlibs/dotnet/">Antlib's
     home page</a></p>
                         <h3 class="section">
-      <a name="Ant 1.6.5"></a>
-      Ant 1.6.5
+      <a name="Apache Ant 1.6.5"></a>
+      Apache Ant 1.6.5
     </h3>
-                        <h3>June 2, 2005 - Ant 1.6.5 Available</h3>
+                        <h3>June 2, 2005 - Apache Ant 1.6.5 Available</h3>
                                 <p>Apache Ant 1.6.5 is now available for <a href="http://ant.apache.org/bindownload.cgi">download</a>.</p>
                                 <p>This is a bug fix release.</p>
                         <h3 class="section">
-      <a name="Ant 1.6.4"></a>
-      Ant 1.6.4
+      <a name="Apache Ant 1.6.4"></a>
+      Apache Ant 1.6.4
     </h3>
-                        <h3>May 19, 2005 - Ant 1.6.4 Available</h3>
+                        <h3>May 19, 2005 - Apache Ant 1.6.4 Available</h3>
                                 <p>Apache Ant 1.6.4 is now available for <a href="http://archive.apache.org/dist/ant/">download</a>.</p>
                                 <p>This is a bug fix release.</p>
                         <h3 class="section">
-      <a name="Ant 1.6.3"></a>
-      Ant 1.6.3
+      <a name="Apache Ant 1.6.3"></a>
+      Apache Ant 1.6.3
     </h3>
-                        <h3>April 28, 2005 - Ant 1.6.3 Available</h3>
+                        <h3>April 28, 2005 - Apache Ant 1.6.3 Available</h3>
                                 <p>Apache Ant 1.6.3 is now available for <a href="http://archive.apache.org/dist/ant/">download</a>.</p>
                                 <p>There is a large list of fixed bugs and enhancements.</p>
                                 <p>Some of the bugs affecting the embedded use of Ant are fixed.</p>
                         <h3 class="section">
-      <a name="Antidote Retired"></a>
-      Antidote Retired
+      <a name="Apache Antidote Retired"></a>
+      Apache Antidote Retired
     </h3>
-                        <h3>April 4th, 2005 - The Apache Ant Project Retires Antidote, the
+                        <h3>April 4th, 2005 - The Apache Ant Project Retires Apache Antidote, the
     Ant GUI</h3>
                                 <p>The Antidote subproject was once started to provide a GUI for
     Ant at a time where IDE support for Ant was far from usable.
@@ -453,10 +467,10 @@ have been reported to be working like a 
                                 <p>If you are interested in Antidote's sources to learn from or
     build on it, you can find snapshots at <a href="http://archive.apache.org/ant/antidote/">http://archive.apache.org/ant/antidote/</a>.</p>
                         <h3 class="section">
-      <a name="Ant 1.6.2"></a>
-      Ant 1.6.2
+      <a name="Apache Ant 1.6.2"></a>
+      Apache Ant 1.6.2
     </h3>
-                        <h3>July 16, 2004 - Ant 1.6.2 Available</h3>
+                        <h3>July 16, 2004 - Apache Ant 1.6.2 Available</h3>
                                 <p>Apache Ant 1.6.2 available for <a href="http://archive.apache.org/dist/ant/">download</a>.</p>
                                 <p>Nested elements for namespaced tasks and types may belong to the
 Ant default namespace as well as the task's or type's namespace.</p>
@@ -469,15 +483,15 @@ features which were asked for by users o
       Wiki Migration
     </h3>
                         <h3>February 29, 2004</h3>
-                                <p>The Ant Wiki pages have been migrated to their 
+                                <p>The Apache Ant Wiki pages have been migrated to their 
       <a href="http://wiki.apache.org/ant/">new home</a> on the Apache
       Wiki farm.
     </p>
                         <h3 class="section">
-      <a name="Ant 1.6.1"></a>
-      Ant 1.6.1
+      <a name="Apache Ant 1.6.1"></a>
+      Apache Ant 1.6.1
     </h3>
-                        <h3>February 12, 2004 - Ant 1.6.1 Available</h3>
+                        <h3>February 12, 2004 - Apache Ant 1.6.1 Available</h3>
                                 <p>Apache Ant 1.6.1 is still available for
       <a href="http://archive.apache.org/dist/ant/">download</a>.
      </p>
@@ -492,10 +506,10 @@ features which were asked for by users o
                                 <p>Ant 1.6.1 also introduces initial support for compiling with
     Java 1.5.</p>
                         <h3 class="section">
-      <a name="Ant 1.6.0"></a>
-      Ant 1.6.0
+      <a name="Apache Ant 1.6.0"></a>
+      Apache Ant 1.6.0
     </h3>
-                        <h3>December 18, 2003 - Ant 1.6.0 Available</h3>
+                        <h3>December 18, 2003 - Apache Ant 1.6.0 Available</h3>
                                 <p>Apache Ant 1.6.0 is still available for
       <a href="http://archive.apache.org/dist/ant/">download</a>.
      </p>
@@ -511,10 +525,10 @@ features which were asked for by users o
 did) or could be explained better, feel free to help us out in the
 <a href="http://wiki.apache.org/ant/NewAntFeaturesInDetail">Wiki</a>.</p>
                         <h3 class="section">
-      <a name="Ant 1.5.4"></a>
-      Ant 1.5.4
+      <a name="Apache Ant 1.5.4"></a>
+      Apache Ant 1.5.4
     </h3>
-                        <h3>August 12, 2003 - Ant 1.5.4 Available</h3>
+                        <h3>August 12, 2003 - Apache Ant 1.5.4 Available</h3>
                                 <p>Apache Ant 1.5.4 is still available for
      <a href="http://archive.apache.org/dist/ant/">download</a>.
     </p>
@@ -535,7 +549,7 @@ did) or could be explained better, feel 
     </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>
-                                <h3>June 11th, 2003: Ant wins a Java Pro readers' choice award</h3>
+                                <h3>June 11th, 2003: Apache Ant wins a Java Pro readers' choice award</h3>
                                 <p>
       Ant has won the Java Pro 2003 Readers' Choice Award for 
     </p>
@@ -553,16 +567,16 @@ did) or could be explained better, feel 
       JDJ Editors Choice Award
     </h3>
                         <a href="http://sys-con.com/java/article2a.cfm?id=2059&amp;count=1734&amp;tot=6&amp;page=2"><img src="images/JDJEditorsChoiceAward.jpg" alt="" border="0" align="right" /></a>
-                                <h3>June 2003: Ant wins JDJ Editors' Choice Award</h3>
+                                <h3>June 2003: Apache Ant wins JDJ Editors' Choice Award</h3>
                                 <p>
 "Ant is the hammer of the Java world: without it, civilization might have progressed, but much more slowly than it has. Ant is one of the most useful build tools I have ever had the pleasure to use." - Joe Ottinger
     </p>
                         <h3 class="section">
-      <a name="Ant keeps on winning!"></a>
-      Ant keeps on winning!
+      <a name="Apache Ant keeps on winning!"></a>
+      Apache Ant keeps on winning!
     </h3>
                         <a href="http://www.javaworld.com/"><img src="images/jw_ec_logo_winner2003.gif" alt="" border="0" height="108" width="252" align="right" /></a>
-                                <h3>June 9th, 2003: Ant wins the JavaWorld Editors' Choice Award</h3>
+                                <h3>June 9th, 2003: Apache Ant wins the JavaWorld Editors' Choice Award</h3>
                                 <p>
     Ant has won the JavaWorld Editors' Choice Award for
     </p>
@@ -574,26 +588,26 @@ did) or could be explained better, feel 
     <a href="http://www.javaworld.com/javaworld/jw-06-2003/jw-0609-eca.html"> full article</a> -- or jump directly to the bit about
     <a href="http://www.javaworld.com/javaworld/jw-06-2003/jw-0609-eca-p4.html"> our award</a> <code>:)</code></p>
                         <h3 class="section">
-      <a name="Ant 1.5.3"></a>
-      Ant 1.5.3
+      <a name="Apache Ant 1.5.3"></a>
+      Apache Ant 1.5.3
     </h3>
-                        <h3>April 9, 2003 - Ant 1.5.3 Available</h3>
+                        <h3>April 9, 2003 - Apache Ant 1.5.3 Available</h3>
                                 <p>Apache Ant 1.5.3 is still available for
      <a href="http://archive.apache.org/dist/ant/">download</a>.
     </p>
                         <h3 class="section">
-      <a name="Ant 1.5.2"></a>
-      Ant 1.5.2
+      <a name="Apache Ant 1.5.2"></a>
+      Apache Ant 1.5.2
     </h3>
-                        <h3>March 3, 2003 - Ant 1.5.2 Available!</h3>
+                        <h3>March 3, 2003 - Apache Ant 1.5.2 Available!</h3>
                                 <p>The final version of Ant 1.5.2 is available for
      <a href="http://archive.apache.org/dist/ant/">download</a>.
      If you have any feedback on this release, feel free to join the 
      discussion on the dev and user mailing lists.
      </p>
                         <h3 class="section">
-      <a name="Ant Top Level Project"></a>
-      Ant Top Level Project
+      <a name="Apache Ant Top Level Project"></a>
+      Apache Ant Top Level Project
     </h3>
                         <h3>November 18, 2002</h3>
                                 <p>The Apache board <a href="mission.html">created</a>
@@ -605,34 +619,34 @@ did) or could be explained better, feel 
        is now located at <a href="http://ant.apache.org/">http://ant.apache.org/</a>
      </p>
                         <h3 class="section">
-      <a name="Ant 1.5.1"></a>
-      Ant 1.5.1
+      <a name="Apache Ant 1.5.1"></a>
+      Apache Ant 1.5.1
     </h3>
-                        <h3>October 3, 2002 - Ant 1.5.1 Available !</h3>
+                        <h3>October 3, 2002 - Apache Ant 1.5.1 Available !</h3>
                                 <p>The final version of Ant 1.5.1 is still available for
      <a href="http://archive.apache.org/dist/ant/">
      download</a>. If you have any feedback on this release, feel free to join the 
      discussion on the ant-dev and ant-user mailing lists.
      </p>
                         <h3 class="section">
-      <a name="Ant 1.5"></a>
-      Ant 1.5
+      <a name="Apache Ant 1.5"></a>
+      Apache Ant 1.5
     </h3>
                         <h3>July 15, 2002 - Fix for Cygwin problem in wrapper script available</h3>
-                                <p>The wrapper script of Ant 1.5 needs to be replaced with a new
+                                <p>The wrapper script of Apache Ant 1.5 needs to be replaced with a new
       version for Cygwin users.  See the <a href="faq.html#1.5-cygwin-sh">FAQ</a> for details.</p>
-                                <h3>July 10, 2002 - Ant 1.5 Released!</h3>
+                                <h3>July 10, 2002 - Apache Ant 1.5 Released!</h3>
                                 <p>The final version of Ant 1.5 is now available for 
      <a href="http://archive.apache.org/dist/ant/">
      download</a>. If you have any feedback on this release, feel free to join the 
      discussion on the ant-dev and ant-user mailing lists.
      </p>
                         <h3 class="section">
-      <a name="Ant wins again!"></a>
-      Ant wins again!
+      <a name="Apache Ant wins again!"></a>
+      Apache Ant wins again!
     </h3>
                         <a href="http://www.sdmagazine.com/"><img src="images/sdm_productivity_award.gif" alt="" border="0" height="108" width="181" align="right" /></a>
-                                <h3>Apr 29, 2002: Ant wins <em>Software Development</em> magazine's
+                                <h3>Apr 29, 2002: Apache Ant wins <em>Software Development</em> magazine's
     2002 Productivity Award.</h3>
                                 <p>
     Ant has been awarded a <strong>2002 Productivity Award</strong> by
@@ -642,11 +656,11 @@ did) or could be explained better, feel 
     press release</a> for more information and the full list of winners.
     </p>
                         <h3 class="section">
-      <a name="Ant has won!"></a>
-      Ant has won!
+      <a name="Apache Ant has won!"></a>
+      Apache Ant has won!
     </h3>
                         <a href="http://www.javaworld.com/"><img src="images/jw_ec_logo_winner2002.gif" alt="" border="0" height="108" width="252" align="right" /></a>
-                                <h3>Mar 26, 2002: Ant wins the JavaWorld Editors' Choice
+                                <h3>Mar 26, 2002: Apache Ant wins the JavaWorld Editors' Choice
     Award</h3>
                                 <p>
     Ant has won the JavaWorld Editors' Choice Award for
@@ -660,7 +674,7 @@ did) or could be explained better, feel 
     </h3>
                         <h3>Feb 15, 2002: Java 1.4 Support</h3>
                                 <p>
-      Java 1.4 has now been released by Sun. The latest Ant source supports 
+      Java 1.4 has now been released by Sun. The latest Apache Ant source supports 
       the new <tt>assert</tt> statement in the compiler task via the <tt>source</tt> 
       attribute. It also contains a compatibility fix needed for some ant tasks
       on Java 1.4 over Windows XP. If you have problems running Ant 1.4.1 on WinXP/Java 1.4,
@@ -672,25 +686,26 @@ did) or could be explained better, feel 
     </h3>
                         <h3>Have a look at our new cool logo!</h3>
                         <h3 class="section">
-      <a name="Ant 1.4.1"></a>
-      Ant 1.4.1
+      <a name="Apache Ant 1.4.1"></a>
+      Apache Ant 1.4.1
     </h3>
-                        <h3>11 October 2001 Ant 1.4.1 released !</h3>
+                        <h3>11 October 2001 Apache Ant 1.4.1 released !</h3>
                                 <p>Please visit the 
      <a href="http://archive.apache.org/dist/ant/">
      download area</a>. 
      </p>
                         <h3 class="section">
-      <a name="Best-Practices Profile of Ant at Sun's Dot-Com Builder"></a>
-      Best-Practices Profile of Ant at Sun's Dot-Com Builder
+      <a name="Best-Practices Profile of Apache Ant at Sun's Dot-Com Builder"></a>
+      Best-Practices Profile of Apache Ant at Sun's Dot-Com Builder
     </h3>
-                        <p>Sun has released an introductory article on Ant on their
+                        <p>Sun has released an introductory article on Apache Ant on their
       Dot-Com Builder site on May 30 2001. See <a href="http://dcb.sun.com/practices/profiles/ant.jsp">http://dcb.sun.com/practices/profiles/ant.jsp</a></p>
                 
     </div>
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/bindownload.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/bindownload.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/bindownload.html (original)
+++ ant/core/branches/ANT_SITE/docs/bindownload.html Mon Dec 13 18:34:00 2010
@@ -97,7 +97,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -137,6 +137,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -153,6 +156,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -163,9 +169,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -197,8 +200,14 @@
   <div class="content">
     <h1 class="title">Binary Distributions</h1>
             <h3 class="section">
-      <a name="Downloading Ant"></a>
-      Downloading Ant
+      <a name="Apache Ant&amp;#x2122;"></a>
+      Apache Ant&#x2122;
+    </h3>
+                        <p>Apache Ant is a Java library and command-line tool that help
+  building software.</p>
+                        <h3 class="section">
+      <a name="Downloading Apache Ant"></a>
+      Downloading Apache Ant
     </h3>
                         <p>Use the links below to download a binary distribution of Ant from
 one of our mirrors.  It is good practice to
@@ -244,11 +253,11 @@ Other mirrors: <select name="Preferred">
       <a name="Current Release of Ant"></a>
       Current Release of Ant
     </h3>
-                        <p>Currently, Apache Ant 1.8.0 is the best available version, see the
+                        <p>Currently, Apache Ant 1.8.1 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.8.0 was released on 8-Feb-2010 and
+<div class="content">Ant 1.8.1 was released on 7-May-2010 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -259,37 +268,38 @@ may not be available on all mirrors for 
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.8.0-bin.zip">apache-ant-1.8.0-bin.zip</a>
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.zip.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.zip.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.8.1-bin.zip">apache-ant-1.8.1-bin.zip</a>
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.8.0-bin.tar.gz">apache-ant-1.8.0-bin.tar.gz</a>
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.gz.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.gz.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.8.1-bin.tar.gz">apache-ant-1.8.1-bin.tar.gz</a>
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.8.0-bin.tar.bz2">apache-ant-1.8.0-bin.tar.bz2</a>
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.bz2.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.bz2.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.0-bin.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.8.1-bin.tar.bz2">apache-ant-1.8.1-bin.tar.bz2</a>
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
       Old Ant Releases
     </h3>
-                        <p>Older releases of Ant can be found <a href="http://archive.apache.org/dist/ant/binaries/">here</a>.  Those
-releases are only provided as <code>zip</code> archives that can be
-extracted by <code>jar xf </code><em>archive.zip</em> - we highly
+                        <p>Older releases of Ant can be found <a href="http://archive.apache.org/dist/ant/binaries/">here</a>.  We highly
 recommend to not use those releases but upgrade to Ant's <a href="[location]#Current Release of Ant">latest</a> release.</p>
                         <h3 class="section">
       <a name="Verify Releases"></a>
       Verify Releases
     </h3>
                         <p>It is essential that you verify the integrity of the downloaded
-files using the PGP signature or the SHA1 or MD5 checksums.  The
+files using the PGP signature or the SHA1, SHA512 or MD5 checksums.  The
 checksums are not as strong indicators as the PGP signature.</p>
                                 <p>The PGP signatures can be verified using PGP or GPG.  First
 download the <a href="http://www.apache.org/dist/ant/KEYS">KEYS</a>
@@ -299,25 +309,25 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.8.0-bin.tar.gz.asc<br />
+% pgpv apache-ant-1.8.1-bin.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.8.0-bin.tar.gz.asc<br />
+% pgp apache-ant-1.8.1-bin.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.8.0-bin.tar.gz.asc
+% gpg --verify apache-ant-1.8.1-bin.tar.gz.asc
 </code></p>
                                 <p>A command line version of <a href="http://www.gnupg.org/download/">GnuPG</a> 
 is also available for Windows users.  Follow the 
 <a href="http://www.gnupg.org/(en)/documentation/faqs.html#q4.19">instructions</a> 
 to verify the package.</p>
                                 <p>Alternatively, you can verify the checksums on the files.  Unix
-programs called <code>md5</code>/<code>sha1</code> or
-<code>md5sum</code>/<code>sha1sum</code> are included in many unix
+programs called <code>md5</code>/<code>sha1</code>/<code>sha512</code> or
+<code>md5sum</code>/<code>sha1sum</code>/<code>sha512sum</code> are included in many unix
 distributions.  <code>*sum</code> is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU
 Textutils</a>.  Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/freeware/console/">here</a>.  <a href="http://www.slavasoft.com/fsum/">fsum</a> supports MD5 and
 SHA1.</p>
@@ -327,6 +337,7 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/bugs.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/bugs.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/bugs.html (original)
+++ ant/core/branches/ANT_SITE/docs/bugs.html Mon Dec 13 18:34:00 2010
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -230,8 +233,8 @@
             add yourself to the <code>CC</code> list to follow the progress
             of this bug.
          </p>
-                                <p><a href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=Ant&amp;long_desc_type=substring&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailassigned_to1=1&amp;emailtype1=substring&amp;email1=&amp;emailassigned_to2=1&amp;emailreporter2=1&amp;emailcc2=1&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">Open Ant bugs by order of priority</a>.</p>
-                                <p><a href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=Ant&amp;long_desc_type=substring&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailassigned_to1=1&amp;emailtype1=substring&amp;email1=&amp;emailassigned_to2=1&amp;emailreporter2=1&amp;emailcc2=1&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;order=bugs.votes,bugs.priority%2Cbugs.bug_severity&amp;query_based_on=">Open Ant bugs by number of votes</a>.</p>
+                                <p><a href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=Ant&amp;long_desc_type=substring&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailassigned_to1=1&amp;emailtype1=substring&amp;email1=&amp;emailassigned_to2=1&amp;emailreporter2=1&amp;emailcc2=1&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">Open Apache Ant bugs by order of priority</a>.</p>
+                                <p><a href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=Ant&amp;long_desc_type=substring&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailassigned_to1=1&amp;emailtype1=substring&amp;email1=&amp;emailassigned_to2=1&amp;emailreporter2=1&amp;emailcc2=1&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=&amp;order=bugs.votes,bugs.priority%2Cbugs.bug_severity&amp;query_based_on=">Open Apache Ant bugs by number of votes</a>.</p>
                                                           <h4 class="subsection">
         <a name="Filing a Bug Report"></a>
         Filing a Bug Report
@@ -239,7 +242,7 @@
                         <p>
             Please read our document about <a href="problems.html">problems</a>
             before deciding that there is an unreported
-            bug in Ant.
+            bug in Apache Ant.
         </p>
                                 <p>
             You have a few choices at this point. You can send

Modified: ant/core/branches/ANT_SITE/docs/bylaws.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/bylaws.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/bylaws.html (original)
+++ ant/core/branches/ANT_SITE/docs/bylaws.html Mon Dec 13 18:34:00 2010
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -199,8 +202,8 @@
   <div class="content">
     <h1 class="title">Project Bylaws</h1>
             <h3 class="section">
-      <a name="Apache Ant Project Bylaws"></a>
-      Apache Ant Project Bylaws
+      <a name="Apache Ant&amp;#x2122; Project Bylaws"></a>
+      Apache Ant&#x2122; Project Bylaws
     </h3>
                         <p>
       This document defines the bylaws under which the Apache Ant project
@@ -803,6 +806,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/contributors.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/contributors.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/contributors.html (original)
+++ ant/core/branches/ANT_SITE/docs/contributors.html Mon Dec 13 18:34:00 2010
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management

Modified: ant/core/branches/ANT_SITE/docs/external.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/external.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/external.html (original)
+++ ant/core/branches/ANT_SITE/docs/external.html Mon Dec 13 18:34:00 2010
@@ -23,9 +23,7 @@
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
         <title>Apache Ant - External Tools and Tasks</title>
         <link type="text/css" href="./page.css" rel="stylesheet">
-          <meta name="author" content="Stefan Bodewig">
-  <meta name="email" content="bodewig@apache.org">
-      </head>
+        </head>
 
     <body>
       <p class="navpath">
@@ -99,7 +97,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +137,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +156,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +169,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -205,7 +206,7 @@
                         <p>This page lists external resources for Apache Ant: <a href="#Tasks">Tasks</a>, <a href="#Compiler%20Implementations">Compiler Implementations</a>,
       <a href="#IDE%20and%20Editor%20Integration">IDE integration
       tools</a>, <a href="#Source%20Control%20ystems">Source Control
-      Systems</a>, loggers, you name it. If you've written
+      Systems</a>, <a href="#Loggers">Loggers</a>, you name it. If you've written
       something that should be included, please post all relevant
       information to one of the mailing lists.  For details, see the
       <a href="faq.html#adding-external-tasks">FAQ</a>.</p>
@@ -1452,6 +1453,67 @@
       </tr>
           </table>
                                                           <h4 class="subsection">
+        <a name="Commons Configuration Ant Task"></a>
+        Commons Configuration Ant Task
+      </h4>
+                        <p>A set of Ant task that help convert Apache Commons
+       Configuration property files into build properties, java Enum's
+       (that are populated at runtime), and any exportable property /
+       env file desired (e.g., csh, bash, bat, etc.).</p>
+                                <p>This project provides the following tasks: 
+       <ul>
+         <li><b>CreateEnumTask</b>: Creates a Java enum based on
+         commons configuration property files. </li>
+         <li><b>ExportPropertiesTask</b>: Exports commons
+         configuration properties to a external file in a using a
+         specified format.</li>
+         <li><b>LoadPropertiesTask</b>: Loads commons configuration
+         properties into pre-generated Java enum.</li>
+       </ul>
+       </p>
+                                      <table class="externals" cellspacing="1" cellpadding="4">
+              <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Compatibility:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Ant 1.6 and above
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          URL:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://code.google.com/p/commonsconfiganttask/">http://code.google.com/p/commonsconfiganttask/</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Contact:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="mailto:ndunn.at.me.com">ndunn at me.com</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          License:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Apache License 2.0
+      </td>
+      </tr>
+          </table>
+                                                          <h4 class="subsection">
         <a name="Configure"></a>
         Configure
       </h4>
@@ -2644,7 +2706,7 @@
         <a name="J2ME Ant Tasks"></a>
         J2ME Ant Tasks
       </h4>
-                        <p>There are different sets of tasks to help build <a href="http://java.sun.com/j2me/">Java 2 Platform, Micro
+                        <p>There are different sets of tasks to help build <a href="http://www.oracle.com/technetwork/java/javame/overview/index.html">Java 2 Platform, Micro
         Edition</a> (J2ME) applications.</p>
                                       <h5 class="subsection">
         <a name="Antenna"></a>
@@ -6939,7 +7001,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          bundles 1.8.0 starting with NetBeans 6.9
+          bundles 1.8.0 starting with NetBeans 6.9; 1.8.1 for 6.9.1
       </td>
       </tr>
                   <tr>
@@ -7417,6 +7479,59 @@
       </td>
       </tr>
           </table>
+                                            <h3 class="section">
+      <a name="Loggers"></a>
+      Loggers
+    </h3>
+                              <h4 class="subsection">
+        <a name="AntStatistics"></a>
+        AntStatistics
+      </h4>
+                        <p><a href="http://code.google.com/p/antstatistics/">AntStatistics</a> logs execution times for
+        all build targets and displays them at the end of the build. Furthermore execution times of
+        past builds are collected and graphed in a chart.</p>
+                                      <table class="externals" cellspacing="1" cellpadding="4">
+              <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Compatibility:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Ant 1.3
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          URL:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://code.google.com/p/antstatistics/">http://code.google.com/p/antstatistics/</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Contact:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://code.google.com/p/antstatistics/issues/list">issue tracker</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          License:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Apache License 2.0
+      </td>
+      </tr>
+          </table>
                                     
     </div>
   </div>

Propchange: ant/core/branches/ANT_SITE/docs/external.html
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: ant/core/branches/ANT_SITE/docs/faq.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/faq.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/faq.html (original)
+++ ant/core/branches/ANT_SITE/docs/faq.html Mon Dec 13 18:34:00 2010
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -230,7 +233,7 @@
         <ul>
                 <li><a href="#java-version">
   Which version of Java is required to run
-        Ant?
+        Apache Ant?
       </a></li>
                 <li><a href="#no-gnu-tar">
   I get checksum errors when I try to extract the
@@ -361,10 +364,10 @@
         Windows.
       </a></li>
             </ul>
-                <h4 class="toc">Ant and IDEs/Editors</h4>
+                <h4 class="toc">Apache Ant and IDEs/Editors</h4>
         <ul>
                 <li><a href="#integration">
-  Is Ant supported by my IDE/Editor?
+  Is Apache Ant supported by my IDE/Editor?
       </a></li>
                 <li><a href="#emacs-mode">
   Why doesn't (X)Emacs/vi/MacOS X's project builder
@@ -445,7 +448,7 @@
       Where do I find the latest version of this
         document?
     </p>
-                  <p>The latest version can always be found at Ant's homepage
+                  <p>The latest version can always be found at Apache Ant's homepage
           <a href="http://ant.apache.org/faq.html">http://ant.apache.org/faq.html</a>.</p>
                     <p class="faq">
       <a name="adding-faqs"></a>
@@ -721,11 +724,21 @@
           8 February 2010
       </td>
       </tr>
+                  <tr>
+                      <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          1.8.1
+      </td>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          7 May 2010
+      </td>
+      </tr>
           </table>
                                 <p class="faq">
       <a name="java-version"></a>
       Which version of Java is required to run
-        Ant?
+        Apache Ant?
     </p>
                   <p>You will need Java installed on your system, version 1.4 or
           later required, 1.5 or later strongly recommended. The later
@@ -832,7 +845,7 @@ Apache Ant version 1.6.2 compiled on Jul
       <a name="precompile-jsps"></a>
       How to I precompile Java Server Pages (JSPs)?
     </p>
-                  <p>Ant has a built in optional task <a href="/manual/OptionalTasks/jspc.html">&lt;jspc&gt;</a>
+                  <p>Apache Ant has a built in optional task <a href="/manual/Tasks/jspc.html">&lt;jspc&gt;</a>
         which was intended for that. <b>But this task is deprecated.</b>
         Here the alternative suggested by the manual:</p>
                         <p><i>Instead of relying on container specific JSP-compilers we suggest deploying
@@ -1159,7 +1172,7 @@ shell-prompt&gt; m4 foo.m4 &gt; foo
         course, comes with the overhead of adding JAR files to support
         the language, to say nothing of the added maintenance in requiring
         two languages to implement a single system. See the
-        <a href="manual/OptionalTasks/script.html">
+        <a href="manual/Tasks/script.html">
         <code>&lt;script&gt;</code> task documentation</a> for more
         details.</p>
                     <p class="faq">
@@ -1263,7 +1276,7 @@ shell-prompt&gt; m4 foo.m4 &gt; foo
       <a name="general-advice"></a>
       General Advice
     </p>
-                  <p>There are many reasons why Ant doesn't behave as
+                  <p>There are many reasons why Apache Ant doesn't behave as
         expected, not all of them are due to Ant bugs.  See our <a href="problems.html">Having Problems?</a> page for hints that
         may help pinning down the reasons for your problem.</p>
                     <p class="faq">
@@ -1457,7 +1470,7 @@ shell-prompt&gt; m4 foo.m4 &gt; foo
     </p>
                   <p>
           Ant implements the Java
-          <a href="http://java.sun.com/j2se/1.4.2/docs/guide/jar/jar.html">Jar
+          <a href="http://download.oracle.com/javase/1.4.2/docs/guide/jar/jar.html">Jar
           file specification</a>. Please refer to the notes section where it
           discusses the maximum allowable length of a line and the concept of
           continuation characters.
@@ -1494,7 +1507,7 @@ shell-prompt&gt; m4 foo.m4 &gt; foo
           your buildfile.</p>
                                 <p class="faq">
       <a name="integration"></a>
-      Is Ant supported by my IDE/Editor?
+      Is Apache Ant supported by my IDE/Editor?
     </p>
                   <p>See the <a href="external.html#IDE and Editor Integration">section
         on IDE integration</a> on our External Tools and Tasks page.</p>
@@ -1572,7 +1585,7 @@ while(&lt;STDIN&gt;) {
             <a href="http://www.sdv.fr/pages/casa/html/ant-dtd.en.html">this
             page</a> by Michel Casabianca for a solution to this
             problem.  Note that the DTD you can download at this page
-            is based on Ant 0.3.1.</li>
+            is based on Apache Ant 0.3.1.</li>
 
             <li>It may even be an invalid DTD.  As Ant allows tasks
             writers to define arbitrary elements, name collisions will
@@ -1659,7 +1672,7 @@ while(&lt;STDIN&gt;) {
         BuildListener that sends out an email
         in the buildFinished() method.  Will Glozer
         &lt;will.glozer@jda.com&gt; has written such a listener based
-        on <a href="http://java.sun.com/products/javamail/">JavaMail</a>.
+        on <a href="http://www.oracle.com/technetwork/java/index-jsp-139225.html">JavaMail</a>.
         The source is:</p>
                         <pre class="code">
 import java.io.*;
@@ -1798,7 +1811,7 @@ ant -listener BuildMonitor -logfile buil
 </pre>
                         <p>Make sure that <code>mail.jar</code> from JavaMail and
         <code>activation.jar</code> from the
-        <a href="http://java.sun.com/products/javabeans/glasgow/jaf.html">Java
+        <a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html">Java
         Beans Activation Framework</a> are in your <code>CLASSPATH</code>.</p>
                     <p class="faq">
       <a name="listener-properties"></a>
@@ -1824,7 +1837,7 @@ public void buildFinished(BuildEvent e) 
         or leads to strange behaviour of <code>&lt;input&gt;</code>
         tasks.
     </p>
-                  <p>When Ant forks a new process for example by using the
+                  <p>When Apache Ant forks a new process for example by using the
           <code>&lt;exec&gt;</code>, <code>&lt;apply&gt;</code>
           or <code>&lt;java&gt;</code> tasks, it will also start a
           new thread reading from standard input and sending
@@ -1928,7 +1941,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun
         requires you to have <code>junit.jar</code> in Ant's startup
         classpath even if <code>ant-junit.jar</code> is present there.</p>
                         <p>Ant's class loader implementation uses Java's
-        delegation model, see <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/ClassLoader.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/ClassLoader.html</a>
+        delegation model, see <a href="http://download.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html">http://download.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html</a>
         the paragraph</p>
                         <blockquote>The <code>ClassLoader</code> class uses a
         delegation model to search for classes and resources. Each

Modified: ant/core/branches/ANT_SITE/docs/index.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/index.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/index.html (original)
+++ ant/core/branches/ANT_SITE/docs/index.html Mon Dec 13 18:34:00 2010
@@ -101,7 +101,7 @@
                               <span class="sel">Welcome</span>
                               </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -141,6 +141,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -157,6 +160,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -167,9 +173,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -201,67 +204,76 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
-      <a name="Ant 1.8.0"></a>
-      Ant 1.8.0
+      <a name="Apache Ant&amp;#x2122;"></a>
+      Apache Ant&#x2122;
     </h3>
-                        <h3>February 8, 2010 - Ant 1.8.0 Available</h3>
+                        <p>Apache Ant is a Java library and command-line tool who's
+		mission is to drive processes described in build files as targets
+		and extension points dependent upon each other.
+		The main known usage of Ant is the build of Java applications.
+		Ant supplies a number of built-in tasks allowing to compile, assemble,
+		test and run Java applications.
+		Ant can also be used effectively to build non Java applications, for
+		instance C or C++ applications. More generally, Ant can be used to
+		pilot any type of process which can be described in terms of targets
+		and tasks.
+    </p>
                                 <p>
-			Apache Ant 1.8.0 is now available for
-			<a href="http://ant.apache.org/bindownload.cgi">download</a>
-			.
-		</p>
-                                <ul>
-		    <li>Lexically scoped local properties, i.e. properties that are only
-		        defined inside a target, 
-                sequential block or similar environment.</li>
-            <li>&lt;import&gt; can now import from any file- or URL-providing resource - 
-                this includes &lt;javaresource&gt;.</li>    
-			<li>Various improvements to the directory scanning code that help 
-			with symbolic link cycles (as can be found on MacOS X Java
-			installations for example) and improve scanning performance. 
-			For big directory trees the improvement is 
-            <a href="http://mail-archives.apache.org/mod_mbox/ant-dev/200809.mbox/%3Cy1u4p48li29.fsf@v30161.1blu.de%3E">dramatic</a>.</li>
-            <li>The way developers can extend Ant's property expansion algorithm has been rewritten 
-            (breaking the older API) to be easier to use and be more powerful.
-            </li>
-            <li>a new top level element extension-point allows build files to be
-				extended with custom targets more easily</li>
-			<li>At the same time the if and unless attributes have been rewritten to do the expected 
-            thing if applied to a property expansion (i.e. if="${foo}" will mean "yes, do it" 
-            if ${foo} expands to true, in Ant 1.7.1 it would mean "no" unless a property named 
-           "true" existed). This adds "testing conditions" as a new use-case to property 
-            expansion.</li>
-			<li>Ant now requires Java 1.4 or later</li>
-			<li>new task include provides an alternative to &lt;import&gt; that
-				should be preferred when you don't want to override any targets</li>
-			<li>numerous bug fixes and improvements as documented in Bugzilla
-				and in WHATSNEW</li>
-		</ul>
+		Ant is written in Java. Users of Ant can develop their own
+		"antlibs" containing Ant tasks and types, and are offered 
+		a large number of ready-made commercial or open-source "antlibs".
+    </p>
+                                <p>
+		Ant is extremely flexible and does not impose coding conventions or
+		directory layouts to the Java projects which adopt it as a build tool.
+	</p>
+                                <p>
+		Software development projects looking for a solution combining build tool and
+		dependency management can use Ant in combination with <a href="http://ant.apache.org/ivy/">Apache Ivy</a>.
+</p>
+                                <p>The Apache Ant project is part of
+          the <a href="http://www.apache.org/">Apache Software
+          Foundation</a>.</p>
                         <h3 class="section">
-      <a name="Ivy 2.1.0"></a>
-      Ivy 2.1.0
+      <a name="Apache Ivy 2.2.0"></a>
+      Apache Ivy 2.2.0
     </h3>
-                        <h3>October 8, 2009 - Apache Ivy 2.1.0 Released</h3>
-                                <p>Apache Ivy 2.1.0 is now available for download as source or binary (with and without
+                        <h3>September 30, 2010 - Apache Ivy 2.2.0 Released</h3>
+                                <p>Apache Ivy 2.2.0 is now available for download as source or binary (with and without
       dependencies) from
       <a href="http://ant.apache.org/ivy/download.cgi">http://ant.apache.org/ivy/download.cgi</a>.</p>
-                                <p>Key features of the 2.1.0 release are</p>
+                                <p>Key features of the 2.2.0 release are</p>
                                 <ul>
       <li>enhanced Maven2 compatibility, with several bug fixes and
         more pom features covered</li>
-      <li>new options for the Ivy Ant tasks and commandline</li>
-      <li>configuration intersections and configuration groups</li>
+      <li>new parent mechanism for Ivy files</li>
+      <li>improved pom generation from an ivy.xml file</li>
+      <li>automated PGP signature generation when uploading artifacts</li>
       <li>numerous bug fixes and improvements as documented in Jira
         and in the release notes</li>
     </ul>
                                 <p>For more information see
       the <a href="http://ant.apache.org/ivy/">Ivy home page</a>.</p>
                         <h3 class="section">
-      <a name="AntUnit 1.1"></a>
-      AntUnit 1.1
+      <a name="Apache Ant1.8.1"></a>
+      Apache Ant1.8.1
+    </h3>
+                        <h3>May 7th, 2010 - Apache Ant 1.8.1 Released</h3>
+                                <p>Apache Ant 1.8.1 is now available for download as source or binary (with and without
+      dependencies) from
+      <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
+                                <p>Key features of the 1.8.1 release are</p>
+                                <ul>
+      <li>new task augment allows to add attributes or nested elements to previously defined references</li>
+      <li>numerous bug fixes and improvements as documented in Bugzilla
+        and in WHATSNEW</li>
+    </ul>
+                        <h3 class="section">
+      <a name="Apache AntUnit 1.1"></a>
+      Apache AntUnit 1.1
     </h3>
                         <h3>September 26, 2008 - Apache AntUnit 1.1 Released</h3>
-                                <p>Apache AntUnit 1.1 Beta is now available for download as <a href="http://ant.apache.org/antlibs/bindownload.cgi">binary</a>
+                                <p>Apache AntUnit 1.1 is now available for download as <a href="http://ant.apache.org/antlibs/bindownload.cgi">binary</a>
       or <a href="http://ant.apache.org/antlibs/srcdownload.cgi">source</a>
       release.</p>
                                 <p>In addition to a few bugfixes and some new assertions AntUnit
@@ -272,40 +284,11 @@
                                 <p>For more information see the <a href="antlibs/antunit/">Antlib's
         home page</a></p>
                         <h3 class="section">
-      <a name="Apache Ant"></a>
-      Apache Ant
-    </h3>
-                        <p>
-		Ant is a Java library and command-line tool.
-		Ant's mission is to drive processes described in build files as targets
-		and extension points dependent upon each other.
-		The main known usage of Ant is the build of Java applications.
-		Ant supplies a number of built-in tasks allowing to compile, assemble,
-		test and run Java applications.
-		Ant can also be used effectively to build non Java applications, for
-		instance C or C++ applications. More generally, Ant can be used to
-		pilot any type of process which can be described in terms of targets
-		and tasks.
-    </p>
-                                <p>
-		Ant is written in Java. Users of Ant can develop their own
-		"antlibs" containing Ant tasks and types, and are offered 
-		a large number of ready-made commercial or open-source "antlibs".
-    </p>
-                                <p>
-		Ant is extremely flexible and does not impose coding conventions or
-		directory layouts to the Java projects which adopt it as a build tool.
-	</p>
-                                <p>
-		Software development projects looking for a solution combining build tool and
-		dependency management can use Ant in combination with <a href="http://ant.apache.org/ivy/">Ivy</a>.
-</p>
-                        <h3 class="section">
       <a name="Documentation"></a>
       Documentation
     </h3>
                         <p>
-You can view the documentation for the current release (Apache Ant 1.8.0)
+You can view the documentation for the current release (Apache Ant 1.8.1)
 <a href="manual/index.html">online</a>
 </p>
                                 <p>
@@ -318,9 +301,9 @@ Comprehensive documentation is included 
                         <ul>
 <li><a href="http://jakarta.apache.org/getinvolved/getinvolvedindex.html">Get Involved</a></li>
 <li><a href="mail.html">Join Mailing Lists</a></li>
-<li><a href="http://marc.theaimsgroup.com/?l=ant-dev&amp;r=1&amp;w=2">Search the Dev Mailing List</a>
+<li><a href="http://marc.info/?l=ant-dev&amp;r=1&amp;w=2">Search the Dev Mailing List</a>
 </li>
-<li><a href="http://marc.theaimsgroup.com/?l=ant-user&amp;r=1&amp;w=2">Search the User Mailing List</a>
+<li><a href="http://marc.info/?l=ant-user&amp;r=1&amp;w=2">Search the User Mailing List</a>
 </li>
 </ul>
                 
@@ -328,6 +311,7 @@ Comprehensive documentation is included 
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/legal.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/legal.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/legal.html (original)
+++ ant/core/branches/ANT_SITE/docs/legal.html Mon Dec 13 18:34:00 2010
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
                                 </li>
                             <li>
-                                    <a href="./license.html">License</a>
+                                    <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -204,9 +207,12 @@
     </h3>
                         <p>All material on this website is Copyright © 1999-2010,
       The Apache Software Foundation.</p>
+                                <p>Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather
+      logo, and the Apache Ant project logos are trademarks of The
+      Apache Software Foundation.</p>
                                 <p>Sun, Sun Microsystems, Solaris, Java, JavaServer Web
       Development Kit, and JavaServer Pages are trademarks or
-      registered trademarks of Sun Microsystems, Inc. UNIX is a
+      registered trademarks of Oracle Corporation. UNIX is a
       registered trademark in the United States and other countries,
       exclusively licensed through X/Open Company, Ltd.  Windows,
       WindowsNT, and Win32 are registered trademarks of Microsoft
@@ -218,6 +224,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->

Modified: ant/core/branches/ANT_SITE/docs/license.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/license.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/license.html (original)
+++ ant/core/branches/ANT_SITE/docs/license.html Mon Dec 13 18:34:00 2010
@@ -139,6 +139,9 @@
                             <li>
                                     <a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
                                 </li>
+                            <li>
+                                    <a href="http://ant.apache.org/manualdownload.cgi">Ant Manual</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                             <li>
                                     <a href="./bugs.html">Bug Database</a>
                                 </li>
+                            <li>
+                                    <a href="http://www.apache.org/security/">Security</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                             <li>
                                     <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
                                 </li>
-                            <li>
-                                    <a href="http://www.apache.org/foundation/contributing.html">Donations</a>
-                                </li>
                       </ul>
         </li>
               <li class="menuheader">Project Management
@@ -203,7 +206,7 @@
       The Apache License Version 2.0
     </h3>
                         <p>The Apache License Version 2.0 applies 
-    to all releases of Ant starting with ant 1.6.1</p>
+    to all releases of Apache Ant starting with Ant 1.6.1</p>
                                 <pre class="code">/*
  *                                 Apache License
  *                           Version 2.0, January 2004
@@ -436,7 +439,7 @@
       <a name="The Apache Software License, Version 1.1"></a>
       The Apache Software License, Version 1.1
     </h3>
-                        <p> The Apache Software License, Version 1.1, applies to all versions of up to ant 1.6.0 included.</p>
+                        <p> The Apache Software License, Version 1.1, applies to all versions of up to Apache Ant 1.6.0 included.</p>
                                 <pre class="code">/*
  * ============================================================================
  *                   The Apache Software License, Version 1.1



Mime
View raw message