ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r1045279 [12/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/ doc...
Date Mon, 13 Dec 2010 18:34:09 GMT
Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/svn/index.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/svn/index.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/svn/index.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/svn/index.xml Mon Dec 13 18:34:00 2010
@@ -19,13 +19,13 @@
 
   <properties>
     <index value="1"/>
-    <title>Subversion Ant Library</title>
+    <title>Apache Subversion Ant Library</title>
   </properties>
 
   <body>
 
     <section name="Idea">
-      <p>The main purpose of this Ant library is to provide the same
+      <p>The main purpose of this Apache Ant library is to provide the same
       level of support that Ant provides for CVS.  This means the
       tasks are wrappers on top of the command line client (read: you
       still need to install an svn client) and there is not much more
@@ -42,14 +42,14 @@
       <subsection name="svn">
         <p>A very thin layer on top of the command line executable,
         comparable to <a
-        href="http://ant.apache.org/manual/CoreTasks/cvs.html">the CVS
+        href="http://ant.apache.org/manual/Tasks/cvs.html">the CVS
         task</a>.</p>
       </subsection>
 
       <subsection name="changelog">
         <p>Creates a log of change comments between two revisions,
         comparable to <a
-        href="http://ant.apache.org/manual/CoreTasks/changelog.html">CvsChangeLog</a>.</p>
+        href="http://ant.apache.org/manual/Tasks/changelog.html">CvsChangeLog</a>.</p>
       </subsection>
 
       <subsection name="*diff">
@@ -60,7 +60,7 @@
         for the changes between two revisions.</p>
 
         <p>Together comparable to <a
-        href="http://ant.apache.org/manual/CoreTasks/cvstagdiff.html">CvsTagDiff</a>.</p>
+        href="http://ant.apache.org/manual/Tasks/cvstagdiff.html">CvsTagDiff</a>.</p>
       </subsection>
     </section>
 

Modified: ant/core/branches/ANT_SITE/xdocs/antnews.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antnews.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antnews.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antnews.xml Mon Dec 13 18:34:00 2010
@@ -22,16 +22,27 @@
     <author email="">Stefan Bodewig</author>
     <author email="">Magesh Umasankar</author>
     <author email="">Antoine Levy-Lambert</author>
-    <title>News</title>
+    <title>Apache Ant&amp;#x2122; Project News</title>
   </properties>
 
 <body>
-  <section name="Ant1.8.0">
-    <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
+  <section name="Apache Ant 1.8.1">
+    <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>
+      
+  </section>
+
+  <section name="Apache Ant 1.8.0">
+    <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, 
@@ -71,7 +82,7 @@
       
       </section>
 
-  <section name="Ivy 2.1.0">
+  <section name="Apache Ivy 2.1.0">
     <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
       dependencies) from
@@ -91,7 +102,7 @@
       the <a href="http://ant.apache.org/ivy/">Ivy home page</a>.</p>
   </section>
 
-  <section name="IvyDE 2.0.0">
+  <section name="Apache IvyDE 2.0.0">
     <h3>July 13, 2009 - Apache IvyDE 2.0.0 Released</h3>
     
     <p>Apache IvyDE 2.0.0 is now available for download from 
@@ -117,7 +128,7 @@ have been reported to be working like a 
       the <a href="http://ant.apache.org/ivy/ivyde/">IvyDE home page</a>.</p>
   </section>
 
-  <section name="Ivy 2.0.0">
+  <section name="Apache Ivy 2.0.0">
     <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
       dependencies) from
@@ -131,7 +142,7 @@ have been reported to be working like a 
   </section>
 
 
-  <section name="AntUnit 1.1">
+  <section name="Apache AntUnit 1.1">
     <h3>September 26, 2008 - Apache AntUnit 1.1 Released</h3>
     
     <p>Apache AntUnit 1.1 is now available for download as <a
@@ -150,12 +161,12 @@ have been reported to be working like a 
         home page</a></p>
   </section>
 
-  <section name="AntUnit 1.1 Beta 1">
+  <section name="Apache AntUnit 1.1 Beta 1">
     <h3>September 3, 2008 - Apache AntUnit 1.1 Beta 1 Available</h3>
   </section>
 
-  <section name="Ant 1.7.1">
-    <h3>June 27, 2008 - Ant 1.7.1 Available</h3>
+  <section name="Apache Ant 1.7.1">
+    <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>
 
@@ -180,7 +191,7 @@ have been reported to be working like a 
     website</a>.</p>
   </section>
 
-  <section name="AntUnit 1.0">
+  <section name="Apache AntUnit 1.0">
     <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>
@@ -190,8 +201,8 @@ have been reported to be working like a 
     href="antlibs/antunit/">AntUnit home page</a>.</p>
   </section>
 
-  <section name="Ant 1.7.0">
-    <h3>December 19, 2006 - Ant 1.7.0 Available</h3>
+  <section name="Apache Ant 1.7.0">
+    <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>
 
@@ -214,7 +225,7 @@ have been reported to be working like a 
     <p>Ant 1.7 has some initial support for Java6 features.</p>
   </section>
 
-  <section name=".NET Ant Library 1.0Beta1">
+  <section name="Apache .NET Ant Library 1.0Beta1">
     <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>
@@ -227,7 +238,7 @@ have been reported to be working like a 
     home page</a></p>
   </section>
 
-  <section name="AntUnit 1.0Beta2">
+  <section name="Apache AntUnit 1.0Beta2">
     <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>
@@ -237,7 +248,7 @@ have been reported to be working like a 
     href="antlibs/antunit/">AntUnit home page</a>.</p>
   </section>
 
-  <section name="AntUnit 1.0Beta1">
+  <section name="Apache AntUnit 1.0Beta1">
     <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>
@@ -247,7 +258,7 @@ have been reported to be working like a 
     href="antlibs/antunit/">AntUnit home page</a>.</p>
   </section>
 
-  <section name=".NET Ant Library 1.0Beta1">
+  <section name="Apache .NET Ant Library 1.0Beta1">
     <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>
@@ -260,30 +271,30 @@ have been reported to be working like a 
     home page</a></p>
   </section>
 
-  <section name="Ant 1.6.5">
-    <h3>June 2, 2005 - Ant 1.6.5 Available</h3>
+  <section name="Apache Ant 1.6.5">
+    <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>
   </section>
 
-  <section name="Ant 1.6.4">
-    <h3>May 19, 2005 - Ant 1.6.4 Available</h3>
+  <section name="Apache Ant 1.6.4">
+    <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>
   </section>
 
-  <section name="Ant 1.6.3">
-    <h3>April 28, 2005 - Ant 1.6.3 Available</h3>
+  <section name="Apache Ant 1.6.3">
+    <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>
   </section>
 
-  <section name="Antidote Retired">
-    <h3>April 4th, 2005 - The Apache Ant Project Retires Antidote, the
+  <section name="Apache Antidote Retired">
+    <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
@@ -308,8 +319,8 @@ have been reported to be working like a 
     href="http://archive.apache.org/ant/antidote/">http://archive.apache.org/ant/antidote/</a>.</p>
   </section>
 
-  <section name="Ant 1.6.2">
-    <h3>July 16, 2004 - Ant 1.6.2 Available</h3>
+  <section name="Apache Ant 1.6.2">
+    <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
@@ -322,14 +333,14 @@ features which were asked for by users o
 
   <section name="Wiki Migration">
     <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>
   </section>
 
-  <section name="Ant 1.6.1">
-    <h3>February 12, 2004 - Ant 1.6.1 Available</h3>
+  <section name="Apache Ant 1.6.1">
+    <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>
@@ -344,8 +355,8 @@ features which were asked for by users o
     <p>Ant 1.6.1 also introduces initial support for compiling with
     Java 1.5.</p>
   </section>
-   <section name="Ant 1.6.0">
-    <h3>December 18, 2003 - Ant 1.6.0 Available</h3>
+   <section name="Apache Ant 1.6.0">
+    <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>
@@ -365,8 +376,8 @@ did) or could be explained better, feel 
 
    </section>
 
-  <section name="Ant 1.5.4">
-    <h3>August 12, 2003 - Ant 1.5.4 Available</h3>
+  <section name="Apache Ant 1.5.4">
+    <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>
@@ -388,7 +399,7 @@ did) or could be explained better, feel 
   <section name="Java Pro 2003 Readers Choice 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>
-    <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>
@@ -406,7 +417,7 @@ did) or could be explained better, feel 
 
   <section name="JDJ Editors Choice Award">
     <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&apos; Choice Award</h3>
+    <h3>June 2003: Apache Ant wins JDJ Editors&apos; Choice Award</h3>
 
     <p>
 &quot;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.&quot; - Joe Ottinger
@@ -414,9 +425,9 @@ did) or could be explained better, feel 
     
   </section>
 
-  <section name="Ant keeps on winning!">
+  <section name="Apache Ant keeps on winning!">
     <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&apos; Choice Award</h3>
+    <h3>June 9th, 2003: Apache Ant wins the JavaWorld Editors&apos; Choice Award</h3>
 
     <p>
     Ant has won the JavaWorld Editors&apos; Choice Award for
@@ -431,16 +442,16 @@ did) or could be explained better, feel 
     <a href="http://www.javaworld.com/javaworld/jw-06-2003/jw-0609-eca-p4.html"> our award</a> <code>:)</code></p>
   </section>
   
-  <section name="Ant 1.5.3">
-    <h3>April 9, 2003 - Ant 1.5.3 Available</h3>
+  <section name="Apache Ant 1.5.3">
+    <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>
   </section>
 
 
-  <section name="Ant 1.5.2">
-    <h3>March 3, 2003 - Ant 1.5.2 Available!</h3>
+  <section name="Apache Ant 1.5.2">
+    <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 
@@ -448,7 +459,7 @@ did) or could be explained better, feel 
      </p>
   </section>
 
-  <section name="Ant Top Level Project">
+  <section name="Apache Ant Top Level Project">
     <h3>November 18, 2002</h3>
     <p>The Apache board <a href="mission.html">created</a>
        the Apache Ant top level project. Ant has now migrated from the Jakarta
@@ -460,8 +471,8 @@ did) or could be explained better, feel 
      </p>
   </section>
     
-  <section name="Ant 1.5.1">
-    <h3>October 3, 2002 - Ant 1.5.1 Available !</h3>
+  <section name="Apache Ant 1.5.1">
+    <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 
@@ -469,13 +480,13 @@ did) or could be explained better, feel 
      </p>
   </section>
 
-  <section name="Ant 1.5">
+  <section name="Apache Ant 1.5">
     <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 
@@ -483,9 +494,9 @@ did) or could be explained better, feel 
      </p>
   </section>
 
-  <section name="Ant wins again!">
+  <section name="Apache Ant wins again!">
     <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&apos;s
+    <h3>Apr 29, 2002: Apache Ant wins <em>Software Development</em> magazine&apos;s
     2002 Productivity Award.</h3>
     <p>
     Ant has been awarded a <strong>2002 Productivity Award</strong> by
@@ -496,9 +507,9 @@ did) or could be explained better, feel 
     </p>
   </section>
 
-  <section name="Ant has won!">
+  <section name="Apache Ant has won!">
     <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&apos; Choice
+    <h3>Mar 26, 2002: Apache Ant wins the JavaWorld Editors&apos; Choice
     Award</h3>
 
     <p>
@@ -513,7 +524,7 @@ did) or could be explained better, feel 
   <section name="Java 1.4 Support">
     <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,
@@ -525,16 +536,16 @@ did) or could be explained better, feel 
     <h3>Have a look at our new cool logo!</h3>
   </section>
   
-  <section name="Ant 1.4.1">
-  <h3>11 October 2001 Ant 1.4.1 released !</h3>
+  <section name="Apache Ant 1.4.1">
+  <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>
   </section>
 
-  <section name="Best-Practices Profile of Ant at Sun&apos;s Dot-Com Builder">
-      <p>Sun has released an introductory article on Ant on their
+  <section name="Best-Practices Profile of Apache Ant at Sun&apos;s Dot-Com Builder">
+      <p>Sun has released an introductory article on Apache Ant on their
       Dot-Com Builder site on May&#160;30&#160;2001. See <a
       href="http://dcb.sun.com/practices/profiles/ant.jsp">http://dcb.sun.com/practices/profiles/ant.jsp</a></p>
   </section>

Modified: ant/core/branches/ANT_SITE/xdocs/bindownload.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/bindownload.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/bindownload.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/bindownload.xml Mon Dec 13 18:34:00 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -24,7 +24,12 @@
 
 <body>
 
-<section name="Downloading Ant">
+<section name="Apache Ant&amp;#x2122;">
+  <p>Apache Ant is a Java library and command-line tool that help
+  building software.</p>
+</section>
+
+<section name="Downloading Apache Ant">
 
 <p>Use the links below to download a binary distribution of Ant from
 one of our mirrors.  It is good practice to
@@ -75,12 +80,12 @@ Other mirrors: <select name="Preferred">
 
 <section name="Current Release of Ant">
 
-<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></br>
@@ -92,22 +97,25 @@ may not be available on all mirrors for 
 
 <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>
 </section>
 
@@ -115,9 +123,7 @@ may not be available on all mirrors for 
 <section name="Old Ant Releases">
 
 <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
+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>
 
@@ -126,7 +132,7 @@ href="[location]#Current Release of Ant"
 <section name="Verify Releases">
 
 <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
@@ -139,17 +145,17 @@ 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> 
@@ -158,8 +164,8 @@ is also available for Windows users.  Fo
 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

Modified: ant/core/branches/ANT_SITE/xdocs/bugs.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/bugs.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/bugs.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/bugs.xml Mon Dec 13 18:34:00 2010
@@ -49,15 +49,15 @@
             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>
       </subsection>
 
       <subsection name="Filing a Bug Report">
          <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/xdocs/bylaws.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/bylaws.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/bylaws.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/bylaws.xml Mon Dec 13 18:34:00 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -23,7 +23,7 @@
   </properties>
 
 <body>
-  <section name="Apache Ant Project Bylaws">
+  <section name="Apache Ant&amp;#x2122; Project Bylaws">
     <p>
       This document defines the bylaws under which the Apache Ant project
       operates. It defines the roles and responsibilities of the

Modified: ant/core/branches/ANT_SITE/xdocs/external.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/external.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/external.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/external.xml Mon Dec 13 18:34:00 2010
@@ -18,7 +18,6 @@
 <document>
 
   <properties>
-    <author email="bodewig@apache.org">Stefan Bodewig</author>
     <title>External Tools and Tasks</title>
     <!-- Last link check: 2009-03-06 -->
   </properties>
@@ -32,7 +31,7 @@
       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>
@@ -718,6 +717,44 @@
        </table>
      </subsection>
 
+     <subsection name="Commons Configuration Ant Task">
+       <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">
+         <tr>
+           <th>Compatibility:</th>
+           <td>Ant 1.6 and above</td>
+         </tr>
+         <tr>
+           <th>URL:</th>
+           <td><a href="http://code.google.com/p/commonsconfiganttask/">http://code.google.com/p/commonsconfiganttask/</a></td>
+         </tr>
+         <tr>
+           <th>Contact:</th>
+           <td><a href="mailto:ndunn.at.me.com">ndunn at me.com</a></td>
+         </tr>
+         <tr>
+           <th>License:</th>
+           <td>Apache License 2.0</td>
+         </tr>
+       </table>
+     </subsection>
+
      <subsection name="Configure">
 
         <p>Recursive build support (call ant on every package level,
@@ -1377,7 +1414,7 @@
       <subsection name="J2ME Ant Tasks">
 
         <p>There are different sets of tasks to help build <a
-        href="http://java.sun.com/j2me/">Java 2 Platform, Micro
+        href="http://www.oracle.com/technetwork/java/javame/overview/index.html">Java 2 Platform, Micro
         Edition</a> (J2ME) applications.</p>
 
         <subsubsection name="Antenna">
@@ -3793,7 +3830,7 @@
         <table class="externals">
           <tr>
             <th>Compatibility:</th>
-            <td>bundles 1.8.0 starting with NetBeans 6.9 (1.8.1 for next major release)</td>
+            <td>bundles 1.8.0 starting with NetBeans 6.9; 1.8.1 for 6.9.1</td>
           </tr>
           <tr>
             <th>URL:</th>
@@ -4059,5 +4096,32 @@
 
     </section>
 
+    <section name="Loggers">
+      <subsection name="AntStatistics">
+
+        <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">
+          <tr>
+            <th>Compatibility:</th>
+            <td>Ant 1.3</td>
+          </tr>
+          <tr>
+            <th>URL:</th>
+            <td><a href="http://code.google.com/p/antstatistics/">http://code.google.com/p/antstatistics/</a></td>
+          </tr>
+          <tr>
+            <th>Contact:</th>
+            <td><a href="http://code.google.com/p/antstatistics/issues/list">issue tracker</a></td>
+          </tr>
+          <tr>
+            <th>License:</th>
+            <td>Apache License 2.0</td>
+          </tr>
+        </table>
+      </subsection>
+    </section>
   </body>
 </document>

Modified: ant/core/branches/ANT_SITE/xdocs/faq.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/faq.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/faq.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/faq.xml Mon Dec 13 18:34:00 2010
@@ -27,7 +27,7 @@
       <question>Where do I find the latest version of this
         document?</question>
       <answer>
-        <p>The latest version can always be found at Ant&apos;s homepage
+        <p>The latest version can always be found at Apache Ant&apos;s homepage
           <a href="http://ant.apache.org/faq.html">http://ant.apache.org/faq.html</a>.</p>
       </answer>
     </faq>
@@ -226,6 +226,10 @@
             <td>1.8.0</td>
             <td>8 February 2010</td>
           </tr>
+          <tr>
+            <td>1.8.1</td>
+            <td>7 May 2010</td>
+          </tr>
         </table>
       </answer>
     </faq>
@@ -235,7 +239,7 @@
   <faqsection title="Installation">
     <faq id="java-version">
       <question>Which version of Java is required to run
-        Ant?</question>
+        Apache Ant?</question>
       <answer>
 
         <p>You will need Java installed on your system, version 1.4 or
@@ -331,7 +335,7 @@ Apache Ant version 1.6.2 compiled on Jul
     <faq id="precompile-jsps">
       <question>How to I precompile Java Server Pages (JSPs)?</question>
       <answer>
-        <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
@@ -678,7 +682,7 @@ shell-prompt> m4 foo.m4 > 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>
       </answer>
@@ -805,7 +809,7 @@ shell-prompt> m4 foo.m4 > foo
       <question>General Advice</question>
       <answer>
 
-        <p>There are many reasons why Ant doesn&apos;t behave as
+        <p>There are many reasons why Apache Ant doesn&apos;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>
@@ -1044,7 +1048,7 @@ shell-prompt> m4 foo.m4 > foo
       <answer>
         <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.
@@ -1089,9 +1093,9 @@ shell-prompt> m4 foo.m4 > foo
     </faq>
   </faqsection>
 
-  <faqsection title="Ant and IDEs/Editors">
+  <faqsection title="Apache Ant and IDEs/Editors">
     <faq id="integration">
-      <question>Is Ant supported by my IDE/Editor?</question>
+      <question>Is Apache Ant supported by my IDE/Editor?</question>
       <answer>
         <p>See the <a href="external.html#IDE and Editor Integration">section
         on IDE integration</a> on our External Tools and Tasks page.</p>
@@ -1186,7 +1190,7 @@ while(<STDIN>) {
             <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
@@ -1290,7 +1294,7 @@ while(<STDIN>) {
         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>
 
         <source><![CDATA[
@@ -1435,7 +1439,7 @@ ant -listener BuildMonitor -logfile buil
 
         <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>
 
       </answer>
@@ -1474,7 +1478,7 @@ public void buildFinished(BuildEvent e) 
 
       <answer>
 
-        <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
@@ -1610,7 +1614,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun
 
         <p>Ant&apos;s class loader implementation uses Java&apos;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>
+        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

Modified: ant/core/branches/ANT_SITE/xdocs/index.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/index.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/index.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/index.xml Mon Dec 13 18:34:00 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -24,53 +24,52 @@
   </properties>
 
 <body>
-	<section name="Ant 1.8.0">
-		<h3>February 8, 2010 - Ant 1.8.0 Available</h3>
-		<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> 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>
-	</section>
-  <section name="Ivy 2.1.0">
-    <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
+
+  <section name="Apache Ant&amp;#x2122;">
+
+    <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>
+		Ant is written in Java. Users of Ant can develop their own
+		&quot;antlibs&quot; containing Ant tasks and types, and are offered 
+		a large number of ready-made commercial or open-source &quot;antlibs&quot;.
+    </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>
+  </section>
+
+  <section name="Apache Ivy 2.2.0">
+    <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>
@@ -78,12 +77,25 @@
     <p>For more information see
       the <a href="http://ant.apache.org/ivy/">Ivy home page</a>.</p>
   </section>
+  <section name="Apache Ant1.8.1">
+    <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>
+      
+  </section>
 
-
-  <section name="AntUnit 1.1">
+  <section name="Apache AntUnit 1.1">
     <h3>September 26, 2008 - Apache AntUnit 1.1 Released</h3>
     
-    <p>Apache AntUnit 1.1 Beta is now available for download as <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>
@@ -100,42 +112,10 @@
   </section>
 
 
-  <section name="Apache Ant">
-
-    <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
-		&quot;antlibs&quot; containing Ant tasks and types, and are offered 
-		a large number of ready-made commercial or open-source &quot;antlibs&quot;.
-    </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>
-
-
-
-  </section>
-
   <section name="Documentation">
 
 <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>
 
@@ -157,9 +137,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>
 

Modified: ant/core/branches/ANT_SITE/xdocs/legal.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/legal.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/legal.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/legal.xml Mon Dec 13 18:34:00 2010
@@ -29,9 +29,13 @@
       <p>All material on this website is Copyright &#169; 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

Modified: ant/core/branches/ANT_SITE/xdocs/license.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/license.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/license.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/license.xml Mon Dec 13 18:34:00 2010
@@ -26,7 +26,7 @@
 
   <section name="The Apache License Version 2.0">
     <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>
 
     <source>/*
  *                                 Apache License
@@ -258,7 +258,7 @@
 </source>
 </section>
   <section name="The Apache Software License, Version 1.1">
-<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>
     <source>/*
  * ============================================================================
  *                   The Apache Software License, Version 1.1

Modified: ant/core/branches/ANT_SITE/xdocs/mail.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/mail.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/mail.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/mail.xml Mon Dec 13 18:34:00 2010
@@ -29,7 +29,7 @@
       <p>Please read the <a
       href="http://jakarta.apache.org/site/mail.html">guidelines of
       the Jakarta Project</a> before subscribing and posting to any of
-      the lists below.  They apply to Ant's lists as well.</p>
+      the lists below.  They apply to Apache Ant's lists as well.</p>
 
       <p>The user and dev list are subscriber only lists, this means
       you have to subscribe before you can post to the list.  Please
@@ -51,7 +51,7 @@
 
         <p>This list is for developers that are using Ant in their own
         projects to ask questions, share knowledge, and discuss issues
-        related to using Ant as a build tool.</p>
+        related to using Apache Ant as a build tool.</p>
       </subsection>
 
       <subsection name="Ivy User List: ivy-user@ant.apache.org">
@@ -64,7 +64,7 @@
 
         <p>This list is for developers that are using Ivy or IvyDE in
         their own projects to ask questions, share knowledge, and
-        discuss issues related to using Ivy with or without Ant.</p>
+        discuss issues related to using Apache Ivy with or without Apache Ant.</p>
       </subsection>
 
       <subsection name="Developer List: dev@ant.apache.org">
@@ -76,8 +76,8 @@
           <a href="http://marc.theaimsgroup.com/?l=ant-dev&amp;r=1&amp;w=2">Third Party Archive</a>
         </p>
 
-        <p>This is the list where participating developers of the Ant
-        build tool, Ivy or the Ant libraries developed by the Ant team
+        <p>This is the list where participating developers of the Apache Ant
+        build tool, Apache Ivy or the Ant libraries developed by the Ant team
         meet and discuss issues, code changes/additions, etc.</p>
       </subsection>
 
@@ -125,7 +125,7 @@
         <ul>
           <li><a href="http://mail-archives.apache.org/mod_mbox/">List Index on mail-archives.apache.org</a></li>
           <li><a href="http://ant.apache.org/mail/">Full mbox archives of all lists</a></li>
-          <li><a href="http://marc.theaimsgroup.com/">Mailing list Archives</a></li>
+          <li><a href="http://marc.info/">Mailing list Archives</a></li>
           <li><a href="http://news.gmane.org/gmane.comp.jakarta.ant.devel/">Ant Developer List on gmane</a></li>
           <li><a href="http://news.gmane.org/gmane.comp.jakarta.ant.user/">Ant User List on gmane</a></li>
           <li><a href="http://old.nabble.com/Ant---Dev-f108.html">Ant Developer List on nabble</a></li>

Modified: ant/core/branches/ANT_SITE/xdocs/mission.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/mission.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/mission.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/mission.xml Mon Dec 13 18:34:00 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -18,7 +18,7 @@
 <document>
 
   <properties>
-    <title>Apache Ant Mission</title>
+    <title>Apache Ant&amp;#x2122; Mission</title>
     <author email="">Apache Ant PMC</author>
   </properties>
 

Modified: ant/core/branches/ANT_SITE/xdocs/nightlies.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/nightlies.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/nightlies.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/nightlies.xml Mon Dec 13 18:34:00 2010
@@ -27,7 +27,7 @@
 <section name="Nightly Builds">
 
 <p>We don't provide binary nightly builds at the moment, but if you
-want to build Ant from sources, you can use a <a
+want to build Apache Ant from sources, you can use a <a
 href="http://svn.apache.org/snapshots/ant/">Subversion snapshot</a>.</p>
 
 </section>
@@ -42,22 +42,42 @@ But if you have problems with <i>testing
 that on the <a href="mail.html#Developer%20List:%20dev@ant.apache.org">developer mailinglist</a>.
 You can directly access the builds of Ant and Ivy on these CI installations:</p>
 
-<p>The Apache Software Foundation <a href="http://hudson.zones.apache.org/hudson/">hosts</a> an
-installation of the <a href="http://hudson.dev.java.net/">Hudson</a> CI-system which Ant + Ivy
-<a href="http://hudson.zones.apache.org/hudson/view/Ant/">use</a>.</p>
+<p>The Apache Software Foundation <a href="http://hudson.apache.org/hudson/">hosts</a> an
+installation of the <a href="http://hudson-ci.org/">Hudson</a> CI-system which Ant + Ivy
+<a href="https://hudson.apache.org/hudson/view/A-F/view/Ant/">use</a>.</p>
 
 <!-- TODO: insert the job commands  //job/@command  -->
-<hudson base="http://hudson.zones.apache.org/hudson/view/Ant/">
+<hudson base="https://hudson.apache.org/hudson/view/A-F/view/Ant/">
     <project name="Apache Ant">
+        <job id="Ant_JDK_1.4" title="Ant Trunk on JDK 1.4" command="build.sh">
+            <description>current development on the lowest defined JDK</description>
+        </job>
+        <job id="Ant_JDK_1.4_Test" title="Ant Trunk Tests on JDK 1.4" command="build.sh allclean test">
+            <description>current development on the lowest defined JDK</description>
+        </job>
+        <job id="Ant_BuildFromPOMs" title="Checks Ant POMs by building Ant from the POMs." command="maven src/etc/poms/pom.xml clean package">
+            <description>Checks the POMs by building Ant by Maven</description>
+        </job>
+        <job id="Ant_Nightly" title="Ant Nightly" command="ant allclean distribution | ant -f check.xml dumphtml findbugs rat">
+            <description>Metric checks of Ant Trunk (Findbugs, RAT, Checkstyle)</description>
+        </job>
+        <job id="Ant-Build-Matrix" title="Ant JDK-Matrix" command="ant test">
+            <description>Checks Ant Trunk against several JDKs (1.4, 1.5, 1.6)</description>
+        </job>
     </project>
     <project name="Apache Ivy">
-        <job id="Ivy" title="Ivy Core Trunk" command="">
+        <job id="Ivy" title="Ivy Core Trunk" command="ant clean jar">
             <description>current development</description>
         </job>
-        <job id="IvyDE" title="IvyDE Trunk" command="">
+        <job id="Ivy-check" title="Ivy Core Trunk Checks" command="ant findbugs checkstyle-internal | ant -f build-release.xml rat">
+            <description>Metric checks of Ivy Trunk (Findbugs, RAT, Checkstyle)</description>
+        </job>
+    </project>
+    <project name="Apache IvyDE">
+        <job id="IvyDE" title="IvyDE Trunk" command="ant clean hudson-prepare | ant dist checkstyle rat">
             <description>current development</description>
         </job>
-        <job id="IvyDE-updatesite" title="Eclipse Updatesite" command="">
+        <job id="IvyDE-updatesite" title="Eclipse Updatesite" command="ant hudson-prepare | ant hudson-build">
             <description>Update your Eclipse installation with the latest Ivy/IvyDE</description>
         </job>
     </project>

Modified: ant/core/branches/ANT_SITE/xdocs/problems.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/problems.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/problems.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/problems.xml Mon Dec 13 18:34:00 2010
@@ -26,7 +26,7 @@
     <section name="Having Problems?">
         <p>
            This page details some steps you can take to try and resolve
-           any problems you may be having with Ant. If you find you can't
+           any problems you may be having with Apache Ant. If you find you can't
            resolve the problem, then this page will help you collect some of
            the relevant information to provide in a bug report. This information
            will help the Ant developers understand and resolve the problem.

Modified: ant/core/branches/ANT_SITE/xdocs/projects.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/projects.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/projects.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/projects.xml Mon Dec 13 18:34:00 2010
@@ -27,7 +27,7 @@
 
     <section name="Related Projects">
 
-      <p>Nothing listed here is directly supported by the Ant
+      <p>Nothing listed here is directly supported by the Apache Ant
       developers, if you encounter any problems with them, please use
       the contact information.</p>
 

Modified: ant/core/branches/ANT_SITE/xdocs/projects/index.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/projects/index.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/projects/index.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/projects/index.xml Mon Dec 13 18:34:00 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -25,10 +25,10 @@
 
 <body>
 
-  <section name="Welcome to the Ant Projects Area">
-    <h3>This is where the Ant sub-projects live!</h3>
+  <section name="Welcome to the Apache Ant&amp;#x2122; Projects Area">
+    <h3>This is where the Apache Ant sub-projects live!</h3>
 
-    <p>Now, that Ant has become an Apache Top-Level Project it is time to make space on this
+    <p>Now, that Apache Ant has become an Apache Top-Level Project it is time to make space on this
     Web-Page for Ant sub-projects.</p>
     <p>To make sure you do not miss anything: Stay tuned and visit this page from time to time :)!
     </p>

Modified: ant/core/branches/ANT_SITE/xdocs/projects/ivy.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/projects/ivy.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/projects/ivy.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/projects/ivy.xml Mon Dec 13 18:34:00 2010
@@ -19,15 +19,15 @@
 
   <properties>
     <index value="1"/>
-    <title>The Ivy Subproject</title>
+    <title>The Apache Ivy Subproject</title>
   </properties>
 
   <body>
 
-    <section name="The Ivy Subproject">
+    <section name="The Apache Ivy&amp;#x2122; Subproject">
       <h3>Apache Ivy</h3>
 
-      <p>Ivy is a simple yet powerful dependency manager featuring continuous integration,
+      <p>Apache Ivy is a simple yet powerful dependency manager featuring continuous integration,
       dependencies of dependencies management, multiple repositories including ibiblio and
       high performance (use of a local cache).</p>
 

Modified: ant/core/branches/ANT_SITE/xdocs/projects/ivyde.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/projects/ivyde.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/projects/ivyde.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/projects/ivyde.xml Mon Dec 13 18:34:00 2010
@@ -19,15 +19,15 @@
 
   <properties>
     <index value="1"/>
-    <title>The IvyDE Subproject</title>
+    <title>The Apache IvyDE Subproject</title>
   </properties>
 
   <body>
 
-    <section name="The IvyDE Subproject">
+    <section name="The Apache IvyDE&amp;#x2122; Subproject">
       <h3>Apache IvyDE</h3>
 
-      <ul>IvyDE is the Eclipse plugin which intergrate Ivy into your java development enviromnent. It includes:
+      <ul>Apache IvyDE is the Eclipse plugin which intergrates Apache Ivy into your java development enviromnent. It includes:
         <li>an Ivy xml files editor: creation wizard, html preview and completion for Ivy xml tag, attributes but also attributes' values.</li>
         <li>an Ivy settings files editor: completion for xml tag, attributes but also attributes' values.</li>
         <li>a classpath container: automatic downloads, access "resolve" task from your IDE, and resolve in Eclipse's workspace</li>

Modified: ant/core/branches/ANT_SITE/xdocs/resources.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/resources.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/resources.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/resources.xml Mon Dec 13 18:34:00 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -18,15 +18,14 @@
 <document>
 
   <properties>
-    <author email="bodewig@apache.org">Stefan Bodewig</author>
     <title>Resources</title>
   </properties>
 
   <body>
     <section name="FAQs">
-      <subsection name="At Ant's website">
+      <subsection name="At Apache Ant&amp;#x2122;'s website">
 
-        <p>Starting with the release of Ant 1.4 the Ant's FAQ is
+        <p>Starting with the release of Apache Ant 1.4 the Ant's FAQ is
         bundled with the distribution, the most recent version can
         always be found at the website.</p>
 
@@ -56,7 +55,7 @@
       <subsection name="FAQ about Borland Application Server tasks">
         <p>Benoit Moussaud, the original author of the Borland
         Application Server specific <a
-        href="manual/OptionalTasks/ejb.html#ejbtasks">EJB tasks</a> has put
+        href="manual/Tasks/ejb.html#ejbtasks">EJB tasks</a> has put
         together a FAQ for this specific subtask.</p>
 
         <table class="externals">

Modified: ant/core/branches/ANT_SITE/xdocs/srcdownload.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/srcdownload.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/srcdownload.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/srcdownload.xml Mon Dec 13 18:34:00 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -24,7 +24,12 @@
 
 <body>
 
-<section name="Downloading Ant">
+<section name="Apache Ant&amp;#x2122;">
+  <p>Apache Ant is a Java library and command-line tool that help
+  building software.</p>
+</section>
+
+<section name="Downloading Apache Ant">
 
 <p>Use the links below to download a source distribution of Ant from
 one of our mirrors.  It is good practice to
@@ -70,14 +75,14 @@ Other mirrors: <select name="Preferred">
 </form>
 </section>
 
-<section name="Current Release of Ant">
+<section name="Current Release of Apache Ant">
 
-<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></br>
@@ -89,22 +94,25 @@ may not be available on all mirrors for 
 
 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0-src.zip">apache-ant-1.8.0-src.zip</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.1-src.zip">apache-ant-1.8.1-src.zip</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.zip.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.zip.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.zip.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0-src.tar.gz">apache-ant-1.8.0-src.tar.gz</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.1-src.tar.gz">apache-ant-1.8.1-src.tar.gz</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.gz.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.gz.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.gz.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.8.0-src.tar.bz2">apache-ant-1.8.0-src.tar.bz2</a>
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.asc">PGP</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.sha1">SHA1</a>]
-[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.0-src.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.8.1-src.tar.bz2">apache-ant-1.8.1-src.tar.bz2</a>
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.bz2.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.bz2.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.bz2.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/source/apache-ant-1.8.1-src.tar.bz2.md5">MD5</a>]</li>
 </ul>
 </section>
 
@@ -112,9 +120,7 @@ may not be available on all mirrors for 
 <section name="Old Ant Releases">
 
 <p>Older releases of Ant can be found <a
-href="http://archive.apache.org/dist/ant/source/">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
+href="http://archive.apache.org/dist/ant/source/">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>
 
@@ -123,7 +129,7 @@ href="[location]#Current Release of Ant"
 <section name="Verify Releases">
 
 <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
@@ -136,22 +142,22 @@ using</p>
 
 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.8.0-src.tar.gz.asc<br />
+% pgpv apache-ant-1.8.1-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.8.0-src.tar.gz.asc<br />
+% pgp apache-ant-1.8.1-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.8.0-src.tar.gz.asc
+% gpg --verify apache-ant-1.8.1-src.tar.gz.asc
 </code></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

Modified: ant/core/branches/ANT_SITE/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/stylesheets/project.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/stylesheets/project.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/stylesheets/project.xml Mon Dec 13 18:34:00 2010
@@ -24,7 +24,7 @@
        <menusection name="Home" index="0"         href="/index.html">
             <menu name="Apache Ant">
                 <item name="Welcome"               href="/index.html"/>
-                <item name="License"               href="/license.html"/>
+                <item name="License"               href="http://www.apache.org/licenses/LICENSE-2.0.html"/>
                 <item name="News"                  href="/antnews.html"/>
             </menu>
 
@@ -48,6 +48,7 @@
             <menu name="Download">
                 <item name="Binary Distributions" href="http://ant.apache.org/bindownload.cgi"/>
                 <item name="Source Distributions" href="http://ant.apache.org/srcdownload.cgi"/>
+                <item name="Ant Manual" href="http://ant.apache.org/manualdownload.cgi"/>
             </menu>
 
             <menu name="Contributing">
@@ -55,12 +56,12 @@
                 <item name="Subversion Repositories"      href="/svn.html"/>
                 <item name="Nightly+Continuous Builds"    href="/nightlies.html"/>
                 <item name="Bug Database"                 href="/bugs.html"/>
+                <item name="Security"                     href="http://www.apache.org/security/"/>
             </menu>
 
             <menu name="Sponsorship">
                 <item name="Thanks"                href="http://www.apache.org/foundation/thanks.html"/>
                 <item name="Sponsorship"           href="http://www.apache.org/foundation/sponsorship.html"/>
-                <item name="Donations"             href="http://www.apache.org/foundation/contributing.html"/>
             </menu>
 
             <menu name="Project Management">
@@ -75,7 +76,7 @@
             <menu name="Projects">
                 <item name="Welcome"               href="/projects/index.html"/>
             </menu>
-            <menu name="Ant Libraries">
+            <menu name="Apache Ant Libraries">
                 <item name="Introduction"          href="/antlibs/index.html"/>
                 <item name="Charter"               href="/antlibs/charter.html"/>
                 <item name="Ant Libraries"         href="/antlibs/proper.html"/>
@@ -83,13 +84,13 @@
                 <item name="Binary Distributions" href="http://ant.apache.org/antlibs/bindownload.cgi"/>
                 <item name="Source Distributions" href="http://ant.apache.org/antlibs/srcdownload.cgi"/>
             </menu>
-            <menu name="Ivy">
+            <menu name="Apache Ivy">
                 <item name="Introduction"         href="/projects/ivy.html"/>
                 <item name="Homepage"             href="http://ant.apache.org/ivy/"/>
                 <item name="Distributions"        href="http://ant.apache.org/ivy/download.cgi"/>
                 <item name="Wiki"                 href="http://cwiki.apache.org/IVY/"/>
             </menu>
-            <menu name="IvyDE">
+            <menu name="Apache IvyDE">
                 <item name="Introduction"         href="/projects/ivyde.html"/>
                 <item name="Homepage"             href="http://ant.apache.org/ivy/ivyde"/>
                 <item name="Screenshots"          href="http://ant.apache.org/ivy/ivyde/screenshots.html"/>

Modified: ant/core/branches/ANT_SITE/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/stylesheets/site.vsl?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/stylesheets/site.vsl (original)
+++ ant/core/branches/ANT_SITE/xdocs/stylesheets/site.vsl Mon Dec 13 18:34:00 2010
@@ -174,8 +174,8 @@
       #else
         <td class="when">continuously</td>
       #end
-      <td class="link"><a href="$base/$jobId/lastBuild/">last build</a></td>
-      <td class="link"><a href="$base/$jobId/lastSuccessfulBuild/">last success</a></td>
+      <td class="link"><a href="$base/job/$jobId/lastBuild/">last build</a></td>
+      <td class="link"><a href="$base/job/$jobId/lastSuccessfulBuild/">last success</a></td>
     </tr>
 #end
 

Modified: ant/core/branches/ANT_SITE/xdocs/stylesheets/templates.vm
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/stylesheets/templates.vm?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/stylesheets/templates.vm (original)
+++ ant/core/branches/ANT_SITE/xdocs/stylesheets/templates.vm Mon Dec 13 18:34:00 2010
@@ -285,6 +285,7 @@
 
 #macro (footer)
       <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);
               //  -->



Mime
View raw message