ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r1045279 [4/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/mail.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/mail.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/mail.html (original)
+++ ant/core/branches/ANT_SITE/docs/mail.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,7 +207,7 @@
     </h3>
                         <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
       note that any HTML parts sent to the lists will be removed by our
@@ -225,7 +228,7 @@
         </p>
                                 <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>
                                                           <h4 class="subsection">
         <a name="Ivy User List: ivy-user@ant.apache.org"></a>
         Ivy User List: ivy-user@ant.apache.org
@@ -238,7 +241,7 @@
         </p>
                                 <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>
                                                           <h4 class="subsection">
         <a name="Developer List: dev@ant.apache.org"></a>
         Developer List: dev@ant.apache.org
@@ -250,8 +253,8 @@
           <a href="http://mail-archives.apache.org/mod_mbox/ant-dev/">ASF Archive</a>
           <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>
                                                           <h4 class="subsection">
         <a name="Notifications List: notifications@ant.apache.org"></a>
@@ -299,7 +302,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/docs/manual/Integration/jext-plugin.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/Integration/jext-plugin.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/Integration/jext-plugin.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/Integration/jext-plugin.html Mon Dec 13 18:34:00 2010
@@ -36,7 +36,7 @@ href="ftp://jext.sourceforge.net/pub/jex
 
 <h2>Installation instructions from the Readme.txt:</h2>
 
-<p>You have to enable the Jext Console to see the Ant output (menu:
+<p>You have to enable the Jext Console to see the Apache Ant output (menu:
 Edit-&gt;Options... - General Panel), because the Ant messages are
 redirected to the Jext console.</p>
 

Modified: ant/core/branches/ANT_SITE/docs/manual/antexternal.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/antexternal.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/antexternal.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/antexternal.html Mon Dec 13 18:34:00 2010
@@ -23,11 +23,11 @@
 </head>
 
 <body>
-<h1>Using Ant Tasks Outside of Ant</h1>
+<h1>Using Apache Ant&trade; Tasks Outside of Ant</h1>
 
 <h2>Rationale</h2>
 
-<p>Ant provides a rich set of tasks for buildfile creators and
+<p>Apache Ant provides a rich set of tasks for buildfile creators and
 administrators.  But what about programmers?  Can the functionality
 provided by Ant tasks be used in java programs?</p>
 

Modified: ant/core/branches/ANT_SITE/docs/manual/anttaskslist.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/anttaskslist.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/anttaskslist.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/anttaskslist.html Mon Dec 13 18:34:00 2010
@@ -28,11 +28,10 @@
 
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
-<h3>Ant Tasks</h3>
+<h3>Apache Ant Tasks</h3>
 <ul class="inlinelist">
 <li><a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a></li>
-<li><a href="coretasklist.html" target="navFrame">Core Tasks</a></li>
-<li><a href="optionaltasklist.html" target="navFrame">Optional Tasks</a></li>
+<li><a href="tasklist.html" target="navFrame">List of Tasks</a></li>
 <div style="padding-left:1em">
   <li><a href="install.html#librarydependencies" target="mainFrame">Library Dependencies</a></li>
 </div>

Modified: ant/core/branches/ANT_SITE/docs/manual/api/index.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/api/index.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/api/index.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/api/index.html Mon Dec 13 18:34:00 2010
@@ -27,5 +27,10 @@ href="http://ant.apache.org/">ant.apache
 on purpose.  We do not provide an online version of the API docs, they
 are included with all our distributions.</p>
 
+<p align="left">Ant's manual and API documentation is part of
+  the <a href="http://ant.apache.org/bindownload.cgi">binary</a>
+  distributions or available as a
+  separate <a href="http://ant.apache.org/manualdownload.cgi">archive</a>.
+</p>
 </body>
 </html>

Modified: ant/core/branches/ANT_SITE/docs/manual/clonevm.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/clonevm.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/clonevm.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/clonevm.html Mon Dec 13 18:34:00 2010
@@ -26,12 +26,12 @@
 
 <h2><a name="clonevm">ant.build.clonevm</a></h2>
 
-<p><em>Since Ant 1.7</em></p>
+<p><em>Since Apache Ant 1.7</em></p>
 
 <p>The value of the ant.build.clonevm system property controls how Ant
 instruments forked Java Virtual Machines.  The <a
-href="CoreTasks/java.html">java</a> and <a
-href="OptionalTasks/junit.html">junit</a> tasks support clonevm
+href="Tasks/java.html">java</a> and <a
+href="Tasks/junit.html">junit</a> tasks support clonevm
 attributes to control the VMs on a task-by-task basis while the system
 property applies to all forked Java VMs.</p>
 

Modified: ant/core/branches/ANT_SITE/docs/manual/conceptstypeslist.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/conceptstypeslist.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/conceptstypeslist.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/conceptstypeslist.html Mon Dec 13 18:34:00 2010
@@ -34,58 +34,54 @@
 <li><a href="clonevm.html">ant.build.clonevm</a></li>
 <li><a href="sysclasspath.html">build.sysclasspath</a></li>
 <li><a href="javacprops.html">Ant properties controlling javac</a></li>
-<li><a href="CoreTasks/common.html">Common Attributes</a></li>
+<li><a href="Tasks/common.html">Common Attributes</a></li>
 </ul>
 
-<h3>Core Types</h3>
+<h3>List of Types</h3>
 <ul class="inlinelist">
-<li><a href="CoreTypes/description.html">Description Type</a></li>
+<li><a href="Types/classfileset.html">Class Fileset</a></li>
+<li><a href="Types/description.html">Description Type</a></li>
 <li><a href="dirtasks.html">Directory-based Tasks</a></li>
-<li><a href="CoreTypes/dirset.html">DirSet</a></li>
-<li><a href="CoreTypes/filelist.html">FileList</a></li>
-<li><a href="CoreTypes/fileset.html">FileSet</a></li>
-<li><a href="CoreTypes/mapper.html">File Mappers</a></li>
-<li><a href="CoreTypes/filterchain.html">FilterChains and FilterReaders</a></li>
-<li><a href="CoreTypes/filterset.html">FilterSet</a></li>
-<li><a href="CoreTypes/patternset.html">PatternSet</a></li>
+<li><a href="Types/dirset.html">DirSet</a></li>
+<li><a href="Types/extension.html">Extension Package</a></li>
+<li><a href="Types/extensionset.html">Set of Extension Packages</a></li>
+<li><a href="Types/filelist.html">FileList</a></li>
+<li><a href="Types/fileset.html">FileSet</a></li>
+<li><a href="Types/mapper.html">File Mappers</a></li>
+<li><a href="Types/filterchain.html">FilterChains and FilterReaders</a></li>
+<li><a href="Types/filterset.html">FilterSet</a></li>
+<li><a href="Types/patternset.html">PatternSet</a></li>
 <li><a href="using.html#path">Path-like Structures</a></li>
-<li><a href="CoreTypes/permissions.html">Permissions</a></li>
-<li><a href="CoreTypes/propertyset.html">PropertySet</a></li>
-<li><a href="CoreTypes/redirector.html">I/O Redirectors</a></li>
-<li><a href="CoreTypes/regexp.html">Regexp</a></li>
-<li><a href="CoreTypes/resources.html">Resources</a></li>
-<li><a href="CoreTypes/resources.html#collection">Resource Collections</a></li>
-<li><a href="CoreTypes/selectors.html">Selectors</a></li>
-<li><a href="CoreTypes/tarfileset.html">TarFileSet</a></li>
-<li><a href="CoreTypes/xmlcatalog.html">XMLCatalog</a></li>
-<li><a href="CoreTypes/zipfileset.html">ZipFileSet</a></li>
-</ul>
-
-<h3>Optional Types</h3>
-<ul class="inlinelist">
-<li><a href="OptionalTypes/classfileset.html">Class Fileset</a></li>
-<li><a href="OptionalTypes/extension.html">Extension Package</a></li>
-<li><a href="OptionalTypes/extensionset.html">Set of Extension Packages</a></li>
+<li><a href="Types/permissions.html">Permissions</a></li>
+<li><a href="Types/propertyset.html">PropertySet</a></li>
+<li><a href="Types/redirector.html">I/O Redirectors</a></li>
+<li><a href="Types/regexp.html">Regexp</a></li>
+<li><a href="Types/resources.html">Resources</a></li>
+<li><a href="Types/resources.html#collection">Resource Collections</a></li>
+<li><a href="Types/selectors.html">Selectors</a></li>
+<li><a href="Types/tarfileset.html">TarFileSet</a></li>
+<li><a href="Types/xmlcatalog.html">XMLCatalog</a></li>
+<li><a href="Types/zipfileset.html">ZipFileSet</a></li>
 </ul>
 
 <h3>Namespace</h3>
 <ul class="inlinelist">
-<li><a href="CoreTypes/namespace.html">Namespace Support</a></li>
+<li><a href="Types/namespace.html">Namespace Support</a></li>
 </ul>
 
 <h3>Antlib</h3>
 <ul class="inlinelist">
-<li><a href="CoreTypes/antlib.html">Antlib</a></li>
-<li><a href="CoreTypes/antlib.html#antlibnamespace">Antlib namespace</a></li>
-<li><a href="CoreTypes/antlib.html#currentnamespace">Current namespace</a></li>
+<li><a href="Types/antlib.html">Antlib</a></li>
+<li><a href="Types/antlib.html#antlibnamespace">Antlib namespace</a></li>
+<li><a href="Types/antlib.html#currentnamespace">Current namespace</a></li>
 </ul>
 
 <h3>Custom Components</h3>
 <ul class="inlinelist">
-<li><a href="CoreTypes/custom-programming.html">Custom Components</a></li>
-<li><a href="CoreTypes/custom-programming.html#customconditions">Conditions</a></li>
-<li><a href="CoreTypes/custom-programming.html#customselectors">Selectors</a></li>
-<li><a href="CoreTypes/custom-programming.html#filterreaders">FilterReaders</a></li>
+<li><a href="Types/custom-programming.html">Custom Components</a></li>
+<li><a href="Types/custom-programming.html#customconditions">Conditions</a></li>
+<li><a href="Types/custom-programming.html#customselectors">Selectors</a></li>
+<li><a href="Types/custom-programming.html#filterreaders">FilterReaders</a></li>
 </ul>
 
 </body>

Modified: ant/core/branches/ANT_SITE/docs/manual/cover.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/cover.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/cover.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/cover.html Mon Dec 13 18:34:00 2010
@@ -19,14 +19,14 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant 1.8.0 User Manual</title>
+<title>Apache Ant 1.8.1 User Manual</title>
 </head>
 
 <body bgcolor="#FFFFFF">
 <div align="center"> 
   <h1><img src="../images/ant_logo_large.gif" width="190" height="120"></h1>
-  <h1>Apache Ant 1.8.0 Manual</h1>
-  <p align="left">This is the manual for version 1.8.0 of 
+  <h1>Apache Ant&trade; 1.8.1 Manual</h1>
+  <p align="left">This is the manual for version 1.8.1 of 
   <a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>. 
     If your version 
     of Ant (as verified with <tt>ant -version</tt>) is older or newer than this 
@@ -35,6 +35,17 @@
     older than the most recent release, we recommend an upgrade to fix bugs
     as well as provide new functionality. </p>
   <p>&nbsp;</p>
+
+  <p align="left">Ant's manual and API documentation is part of
+    the <a href="http://ant.apache.org/bindownload.cgi">binary</a>
+    distributions or available as a
+    separate <a href="http://ant.apache.org/manualdownload.cgi">archive</a>.
+    Manuals for older releases are available for
+    download
+    <a href="http://ant.apache.org/bindownload.cgi#Old Ant Releases">as
+      well</a>.</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>
 </div>
 
 

Modified: ant/core/branches/ANT_SITE/docs/manual/credits.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/credits.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/credits.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/credits.html Mon Dec 13 18:34:00 2010
@@ -62,7 +62,7 @@
 </ul>
 
 <center>
-<p>Version: 1.8.0</p>
+<p>Version: 1.8.1</p>
 </center>
 
 

Modified: ant/core/branches/ANT_SITE/docs/manual/develop.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/develop.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/develop.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/develop.html Mon Dec 13 18:34:00 2010
@@ -23,7 +23,7 @@
 </head>
 
 <body>
-<h1>Developing with Ant</h1>
+<h1>Developing with Apache Ant</h1>
 
 <h2><a name="writingowntask">Writing Your Own Task</a></h2>
 <p>It is very easy to write your own task:</p>
@@ -41,7 +41,7 @@
     conversions for you, see <a href="#set-magic">below</a>.</li>
 
   <li>If your task shall contain other tasks as nested elements (like
-  <a href="CoreTasks/parallel.html"><code>parallel</code></a>), your
+  <a href="Tasks/parallel.html"><code>parallel</code></a>), your
   class must implement the interface
   <code>org.apache.tools.ant.TaskContainer</code>.  If you do so, your
   task can not support any other nested elements.  See 
@@ -135,7 +135,7 @@ good convention, though.</p>
 
 <p>Ant will always expand properties before it passes the value of an
 attribute to the corresponding setter method. <b>Since Ant 1.8</b>, it is
-possible to <a href="CoreTasks/propertyhelper.html">extend Ant's property handling</a>
+possible to <a href="Tasks/propertyhelper.html">extend Ant's property handling</a>
 such that a non-string Object may be the result of the evaluation of a string
 containing a single property reference. These will be assigned directly via
 setter methods of matching type. Since it requires some beyond-the-basics
@@ -486,9 +486,9 @@ for the following events</P>
 </ul>
 
 <p>If the build file invokes another build file via <a
-href="CoreTasks/ant.html"><code>&lt;ant&gt;</code></a> or <a
-href="CoreTasks/subant.html"><code>&lt;subant&gt;</code></a> or uses <a
-href="CoreTasks/antcall.html"><code>&lt;antcall&gt;</code></a>, you are creating a
+href="Tasks/ant.html"><code>&lt;ant&gt;</code></a> or <a
+href="Tasks/subant.html"><code>&lt;subant&gt;</code></a> or uses <a
+href="Tasks/antcall.html"><code>&lt;antcall&gt;</code></a>, you are creating a
 new Ant "project" that will send target and task level events of its
 own but never sends build started/finished events.  Ant 1.6.2
 introduces an extension of the BuildListener interface named

Modified: ant/core/branches/ANT_SITE/docs/manual/developlist.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/developlist.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/developlist.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/developlist.html Mon Dec 13 18:34:00 2010
@@ -27,7 +27,7 @@
 
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
-<h3>Developing with Ant</h3>
+<h3>Developing with Apache Ant</h3>
 
 <ul class="inlinelist">
 <li><a href="../ant_in_anger.html">Ant in Anger</a></li>

Modified: ant/core/branches/ANT_SITE/docs/manual/dirtasks.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/dirtasks.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/dirtasks.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/dirtasks.html Mon Dec 13 18:34:00 2010
@@ -26,31 +26,31 @@
 
 <h2><a name="directorybasedtasks">Directory-based Tasks</a></h2>
 <p>Some tasks use directory trees for the actions they perform.
-For example, the <a href="CoreTasks/javac.html">javac</a> task, which
+For example, the <a href="Tasks/javac.html">javac</a> task, which
 compiles a directory tree with <code>.java</code> files into
 <code>.class</code> files, is one of these directory-based tasks. Because
 some of these tasks do so much work with a directory tree, the task itself
-can act as an implicit <a href="CoreTypes/fileset.html">FileSet</a>.</p>
+can act as an implicit <a href="Types/fileset.html">FileSet</a>.</p>
 <p>Whether the fileset is implicit or not, it can often be very useful to
 work on a subset of the directory tree. This section describes how you can
 select a subset of such a directory tree when using one of these
 directory-based tasks.</p>
-<p>Ant gives you two ways to create a subset of files in a fileset, both of
+<p>Apache Ant gives you two ways to create a subset of files in a fileset, both of
 which can be used at the same time:</p>
 <ul>
   <li>Only include files and directories that match any
     <code>include</code> patterns and do not match any
     <code>exclude</code> patterns in a given
-    <a href="CoreTypes/patternset.html">PatternSet</a>.</li>
+    <a href="Types/patternset.html">PatternSet</a>.</li>
   <li>Select files based on selection criteria defined by a collection of
-    <a href="CoreTypes/selectors.html">selector</a> nested elements.</li>
+    <a href="Types/selectors.html">selector</a> nested elements.</li>
 </ul>
 <h3><a name="patternset">Patternset</a></h3>
 
 <p>We said that Directory-based tasks can sometimes act as an implicit
-<a href="CoreTypes/fileset.html"><code>&lt;fileset&gt;</code></a>,
+<a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
 but in addition to that, a FileSet acts as an implicit
-<a href="CoreTypes/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
+<a href="Types/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
 
 <p>The inclusion and exclusion elements of the implicit PatternSet can be
 specified inside the directory-based task (or explicit fileset) via
@@ -190,13 +190,13 @@ For example, <code>mypackage/test/</code
 way to select just the files you want.</p>
 
 <h3><a name="selectors">Selectors</a></h3>
-<p>The <a href="CoreTypes/fileset.html"><code>&lt;fileset&gt;</code></a>,
+<p>The <a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
 whether implicit or explicit in the
 directory-based task, also acts as an
-<a href="CoreTypes/selectors.html#andselect"><code>&lt;and&gt;</code></a>
+<a href="Types/selectors.html#andselect"><code>&lt;and&gt;</code></a>
 selector container. This can be used to create arbitrarily complicated
 selection criteria for the files the task should work with. See the
-<a href="CoreTypes/selectors.html">Selector</a> documentation for more
+<a href="Types/selectors.html">Selector</a> documentation for more
 information.</p>
 
 <h3><a name="tasklist">Standard Tasks/Filesets</a></h3>
@@ -204,32 +204,32 @@ information.</p>
 the rules given here. This list, a subset of those, is a list of standard ant
 tasks that can act as an implicit fileset:</p>
 <ul>
-      <li><a href="CoreTasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
-  <li><a href="CoreTasks/copydir.html"><code>&lt;copydir&gt;</code></a> (deprecated)</li>
-  <li><a href="CoreTasks/delete.html"><code>&lt;delete&gt;</code></a></li>
-  <li><a href="CoreTasks/dependset.html"><code>&lt;dependset&gt;</code></a></li>
-  <li><a href="CoreTasks/fixcrlf.html"><code>&lt;fixcrlf&gt;</code></a></li>
-  <li><a href="CoreTasks/javac.html"><code>&lt;javac&gt;</code></a></li>
-  <li><a href="CoreTasks/replace.html"><code>&lt;replace&gt;</code></a></li>
-  <li><a href="CoreTasks/rmic.html"><code>&lt;rmic&gt;</code></a></li>
-  <li><a href="CoreTasks/style.html"><code>&lt;style&gt;</code> (aka <code>&lt;xslt&gt;</code>)</a></li>
-  <li><a href="CoreTasks/tar.html"><code>&lt;tar&gt;</code></a></li>
-  <li><a href="CoreTasks/zip.html"><code>&lt;zip&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ddcreator"><code>&lt;ddcreator&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ejbjar"><code>&lt;ejbjar&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ejbc"><code>&lt;ejbc&gt;</code></a></li>
-  <li><a href="OptionalTasks/cab.html"><code>&lt;cab&gt;</code></a></li>
-  <li><a href="OptionalTasks/native2ascii.html"><code>&lt;native2ascii&gt;</code></a></li>
-  <li><a href="OptionalTasks/netrexxc.html"><code>&lt;netrexxc&gt;</code></a></li>
+      <li><a href="Tasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
+  <li><a href="Tasks/copydir.html"><code>&lt;copydir&gt;</code></a> (deprecated)</li>
+  <li><a href="Tasks/delete.html"><code>&lt;delete&gt;</code></a></li>
+  <li><a href="Tasks/dependset.html"><code>&lt;dependset&gt;</code></a></li>
+  <li><a href="Tasks/fixcrlf.html"><code>&lt;fixcrlf&gt;</code></a></li>
+  <li><a href="Tasks/javac.html"><code>&lt;javac&gt;</code></a></li>
+  <li><a href="Tasks/replace.html"><code>&lt;replace&gt;</code></a></li>
+  <li><a href="Tasks/rmic.html"><code>&lt;rmic&gt;</code></a></li>
+  <li><a href="Tasks/style.html"><code>&lt;style&gt;</code> (aka <code>&lt;xslt&gt;</code>)</a></li>
+  <li><a href="Tasks/tar.html"><code>&lt;tar&gt;</code></a></li>
+  <li><a href="Tasks/zip.html"><code>&lt;zip&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ddcreator"><code>&lt;ddcreator&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ejbjar"><code>&lt;ejbjar&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ejbc"><code>&lt;ejbc&gt;</code></a></li>
+  <li><a href="Tasks/cab.html"><code>&lt;cab&gt;</code></a></li>
+  <li><a href="Tasks/native2ascii.html"><code>&lt;native2ascii&gt;</code></a></li>
+  <li><a href="Tasks/netrexxc.html"><code>&lt;netrexxc&gt;</code></a></li>
   <li>
-    <a href="OptionalTasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a>
+    <a href="Tasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a>
   </li>
-  <li><a href="OptionalTasks/depend.html"><code>&lt;depend&gt;</code></a></li>
-  <li><a href="OptionalTasks/translate.html"><code>&lt;translate&gt;</code></a></li>
-  <li><a href="OptionalTasks/image.html"><code>&lt;image&gt;</code></a></li>
-  <li><a href="OptionalTasks/jlink.html"><code>&lt;jlink&gt;</code></a> (deprecated)</li>
-  <li><a href="OptionalTasks/jspc.html"><code>&lt;jspc&gt;</code></a></li>
-  <li><a href="OptionalTasks/wljspc.html"><code>&lt;wljspc&gt;</code></a></li>
+  <li><a href="Tasks/depend.html"><code>&lt;depend&gt;</code></a></li>
+  <li><a href="Tasks/translate.html"><code>&lt;translate&gt;</code></a></li>
+  <li><a href="Tasks/image.html"><code>&lt;image&gt;</code></a></li>
+  <li><a href="Tasks/jlink.html"><code>&lt;jlink&gt;</code></a> (deprecated)</li>
+  <li><a href="Tasks/jspc.html"><code>&lt;jspc&gt;</code></a></li>
+  <li><a href="Tasks/wljspc.html"><code>&lt;wljspc&gt;</code></a></li>
 </ul>
 
 <h3><a name="examples">Examples</a></h3>
@@ -265,7 +265,7 @@ as an implicit fileset.</p>
 
 <h3><a name="defaultexcludes">Default Excludes</a></h3>
 <p>There are a set of definitions that are excluded by default from all
-directory-based tasks. They are:</p>
+directory-based tasks. As of Ant 1.8.1 they are:</p>
 <pre>
      **/*~
      **/#*#
@@ -282,13 +282,30 @@ directory-based tasks. They are:</p>
      **/.svn/**
      **/.DS_Store
 </pre>
+<p>Ant 1.8.2 adds the folllowing default excludes:</p>
+<pre>
+     **/.git
+     **/.git/**
+     **/.gitattributes
+     **/.gitignore
+     **/.gitmodules
+     **/.hg
+     **/.hg/**
+     **/.hgignore
+     **/.hgsub
+     **/.hgsubstate
+     **/.hgtags
+     **/.bzr
+     **/.bzr/**
+     **/.bzrignore
+</pre>
 <p>If you do not want these default excludes applied, you may disable
 them with the <code>defaultexcludes=&quot;no&quot;</code>
 attribute.</p>
 
 <p>This is the default list; note that you can modify the list of
 default excludes by using the <a
-href="CoreTasks/defaultexcludes.html">defaultexcludes</a> task.</p>
+href="Tasks/defaultexcludes.html">defaultexcludes</a> task.</p>
 
 
 

Modified: ant/core/branches/ANT_SITE/docs/manual/feedback.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/feedback.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/feedback.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/feedback.html Mon Dec 13 18:34:00 2010
@@ -27,7 +27,7 @@
 <h1><a name="feedback">Feedback</a> and Troubleshooting</h1>
 <p>If things do not work, especially simple things like <tt>ant -version</tt>, 
   then something is wrong with your configuration. Before filing bug reports and 
-  emailing all the ant mailing lists</p>
+  emailing all the Apache Ant mailing lists</p>
 <ol>
   <li>Check your environment variables. Are ANT_HOME and JAVA_HOME correct? If 
     they have quotes or trailing slashes, remove them.</li>

Modified: ant/core/branches/ANT_SITE/docs/manual/ide.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/ide.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/ide.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/ide.html Mon Dec 13 18:34:00 2010
@@ -29,7 +29,7 @@
 
 <h3>IDE Integration</h3>
 <p>
-All the modern Java IDEs support Ant almost out of the box.
+All the modern Java IDEs support Apache Ant almost out of the box.
 </p>
 
 <ul>

Modified: ant/core/branches/ANT_SITE/docs/manual/index.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/index.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/index.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/index.html Mon Dec 13 18:34:00 2010
@@ -19,7 +19,7 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant User Manual</title>
+<title>Apache Ant&trade; User Manual</title>
 </head>
 
 <frameset cols="26%,74%">
@@ -27,7 +27,7 @@
 <frame src="cover.html" name="mainFrame">
 </frameset>
 <noframes>
-<H2>Apache Ant User Manual</H2>
+<H2>Apache Ant&trade; User Manual</H2>
 
 <a href="toc.html">Apache Ant User Manual</a></noframes>
 

Modified: ant/core/branches/ANT_SITE/docs/manual/inputhandler.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/inputhandler.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/inputhandler.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/inputhandler.html Mon Dec 13 18:34:00 2010
@@ -29,7 +29,7 @@
 
 <p>When a task wants to prompt a user for input, it doesn't simply
 read the input from the console as this would make it impossible to
-embed Ant in an IDE.  Instead it asks an implementation of the
+embed Apache Ant in an IDE.  Instead it asks an implementation of the
 <code>org.apache.tools.ant.input.InputHandler</code> interface to
 prompt the user and hand the user input back to the task.</p>
 

Modified: ant/core/branches/ANT_SITE/docs/manual/install.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/install.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/install.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/install.html Mon Dec 13 18:34:00 2010
@@ -19,14 +19,125 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Installing Ant</title>
+<title>Installing Apache Ant</title>
 </head>
 
 <body>
-<h1>Installing Ant</h1>
-<h2><a name="getting">Getting Ant</a></h2>
+<h1>Installing Apache Ant</h1>
+<h2><a name="getting">Getting Apache Ant</a></h2>
 
-<h3>Download Area Layout</h3>
+<h3>The Short Story</h3>
+<p>To get up and running with the binary edition of Ant quickly, follow these steps:
+<ol>
+<li>Make sure you have a Java environment installed, See <a href="#sysrequirements">System
+Requirements</a> for details.</li>
+<li>Download Ant. See <a href="#getBinary">Binary Edition</a> for details.</li>
+<li>Uncompress the downloaded file into a directory.</li>
+<li>Set environmental variables <code>JAVA_HOME</code> to your Java environment, <code>ANT_HOME</code> to
+the directory you uncompressed Ant to, and add <code>${ANT_HOME}/bin</code> (Unix) or
+<code>%ANT_HOME%/bin</code> (Windows) to your <code>PATH</code>. See <a href="#setup">Setup</a> for details.</li>
+<li>Optionally, from the <code>ANT_HOME</code> directory run <code>ant -f fetch.xml -Ddest=system</code> to get
+the library dependencies of most of the Ant tasks that require them. If you don't do this, many of the dependent
+Ant tasks will not be available. See <a href="#optionalTasks">Optional Tasks</a> for details and other options
+for the -Ddest parameter.</li>
+<li>Optionally, add any desired Antlibs. See <a href="http://ant.apache.org/antlibs/proper.html" target="_top">Ant Libraries</a> for a list.
+</ol>
+</p>
+<p>
+Note that the links in the list above will give more details about each of the steps,
+should you need them. Or you can just continue reading the rest of this document.
+</p>
+The short story for working with the Ant source code (not needed if you are working with the binary edition) is:
+<ol>
+<li>Get the source code. See <a href="#sourceEdition">Source Edition</a> for details.</li>
+<li> Build Ant. See <a href="#buildingant">Building Ant</a> for details.</li>
+</ol>
+<p>
+</p>
+<p>
+For the full story, continue reading.
+</p>
+
+<h3><a name="getBinary">Binary Edition</a></h3>
+
+<p>The latest stable version of Ant is available from the Ant web page <a
+href="http://ant.apache.org/" target="_top">http://ant.apache.org/</a>
+</p>
+
+<p>The binary edition of Ant is shipped with 3 different compression formats:
+<ol>
+<li><b>.zip</b> - Recommended compression format for Windows, can also be used on other platforms. Supported
+by many programs and some operating systems natively.</li>
+<li><b>.tar.gz</b> - Uses the tar program to gather files together, and gzip to compress and uncompress.</li>
+<li><b>.tar.bz2</b> - Uses the tar program to gather files together, and bzip2 to compress and uncompress..</li>
+</ol>
+Choose the format that is best supported for your platform.
+</p>
+
+<h3>As a binary in an RPM Package</h3>
+
+<p>Consult the <a href="#jpackage">jpackage</a> section below.</p>
+
+<h3>Bundled in IDEs</h3>
+<p>
+    All the main Java IDEs ship with Ant, products such as Eclipse, NetBeans
+    and IntelliJ IDEA. If you install Ant this way you usually get the most recent
+    release of Ant at the time the IDE was released. Some of the IDEs (Eclipse
+    and NetBeans in particular) ship with extra tasks that only work if
+    IDE-specific tools are on Ant's path. To use these on command-line versions
+    of Ant, the relevant JARs need to be added to the command-line Ant as
+    extra libraries/tasks. Note that if it is an IDE task or extension that is
+    not behaving, the Ant team is unable to field bug reports. Try the IDE mailing
+    lists first, who will cross-file bugs if appropriate.
+</p>
+<p>
+    IDE's can invariably be pointed at different Ant installations. This lets
+    developers upgrade to a new release of Ant, and eliminate inconsistencies
+    between command-line and IDE Ant.
+</p>
+
+<h3>Bundled in Java applications</h3>
+
+<p>
+    Many Java applications, most particularly application servers, ship with
+    a version of Ant. These are primarily for internal use by the application,
+    using the Java APIs to delegate tasks such as JSP page compilation to the Ant
+    runtime. Such distributions are usually unsupported by everyone. Particularly
+    troublesome are those products that not only ship with their own Ant release,
+    they add their own version of ANT.BAT or ant.sh to the PATH. If Ant starts
+    behaving wierdly after installing something, try the
+    <a href="#diagnostics">diagnostics</a> advice.
+</p>
+
+<h3><a name="sourceEdition">Source Edition</a></h3>
+
+<p>If you prefer the source edition, you can download the source for the latest
+Ant release from
+<a href="http://ant.apache.org/srcdownload.cgi" target="_top">http://ant.apache.org/srcdownload.cgi</a>.
+
+If you prefer the leading-edge code, you can access
+the code as it is being developed via SVN. The Ant website has details on
+<a href="http://ant.apache.org/svn.html" target="_top">accessing SVN</a>.
+All bug fixes will go in against the HEAD of the source tree, and the first
+response to many bugreps will be "have you tried the latest version".
+Don't be afraid to download and build a prererelease edition, as everything
+other than new features are usually stable.
+    </p>
+<p>
+
+
+See the section <a href="#buildingant">Building Ant</a> on how to
+build Ant from the source code.
+You can also access the
+<a href="http://svn.apache.org/viewcvs.cgi/ant/" target="_top">
+Ant SVN repository</a> on-line. </p>
+
+<h3 name="archives">Archive Download Area Layout</h3>
+<p>
+Older versions of Ant are available in the archives at <a
+href="http://archive.apache.org/dist/ant/" target="_top">http://archive.apache.org/dist/ant/</a>. The
+files are organized as follows.
+</p>
 <table>
 <tr>
   <th>Filename or Path</th>
@@ -46,8 +157,10 @@
 <tr>
   <td>ant-current-bin.zip</td>
   <td>
-    ZIP-Archive containing the compiled version of Ant in the last released version. This is the file
-    most users will want to download.
+    ZIP-Archive containing the compiled version of Ant in the last released version. It is recommended that
+    you do not download the latest version this way, as the standard way of downloading described above will
+    redirect you to a mirror closer to you, thus making the download faster for you and reducing the load
+    on Apache servers.
   </td>
 </tr>
 <tr>
@@ -55,7 +168,8 @@
   <td>
     ZIP-Archive containing the sources of Ant. If you have this you could compile Ant itself.
     If you do not have the <i>required</i> dependencies, the classes depeding on them are just not
-    build.
+    built. Again, it is preferred to use the standard way of getting the source package described above
+    to make your download quicker and to reduce the load on Apache servers.
   </td>
 </tr>
 <tr>
@@ -91,7 +205,7 @@
   <td>binaries/</td>
   <td>
     The binaries directory holds specific Ant releases bundled in both ZIP and tar.gz compression
-    formats. The named releases are in contrast to the ant-current-bin.zip file in the parent 
+    formats. The named releases are in contrast to the ant-current-bin.zip file in the parent
     directory, which is always guaranteed to be the most current release of Ant.
   </td>
 </tr>
@@ -105,76 +219,14 @@
 <tr>
   <td>source/</td>
   <td>
-    The source directory holds the source code for specific Ant releases bundled in both ZIP and 
+    The source directory holds the source code for specific Ant releases bundled in both ZIP and
     tar.gz compression formats. The named releases are in contrast to the ant-current-src.zip file
-    in the parent directory, which is always guaranteed to hold the source code for the most current 
+    in the parent directory, which is always guaranteed to hold the source code for the most current
     release of Ant.
   </td>
 </tr>
 </table>
 
-<h3>Binary Edition</h3>
-<p>The latest stable version of Ant is available from the Ant web page <a
-href="http://ant.apache.org/" target="_top">http://ant.apache.org/</a>.
-
-<h3>As a binary in an RPM Package</h3>
-
-<p>Consult the <a href="#jpackage">jpackage</a> section below.</p>
-
-<h3>Bundled in IDEs</h3>
-<p>
-    All the main Java IDEs ship with Ant, products such as Eclipse, NetBeans
-    and IntelliJ IDEA. If you install Ant this way you usually get the most recent
-    release of Ant at the time the IDE was released. Some of the IDEs (Eclipse
-    and NetBeans in particular) ship with extra tasks that only work if
-    IDE-specific tools are on Ant's path. To use these on command-line versions
-    of Ant, the relevant JARs need to be added to the command-line Ant as
-    extra libraries/tasks. Note that if it is an IDE task or extension that is
-    not behaving, the Ant team is unable to field bug reports. Try the IDE mailing
-    lists first, who will cross-file bugs if appropriate.
-</p>
-<p>
-    IDE's can invariably be pointed at different Ant installations. This lets
-    developers upgrade to a new release of Ant, and eliminate inconsistencies
-    between command-line and IDE Ant.
-</p>
-
-<h3>Bundled in Java applications</h3>
-
-<p>
-    Many Java applications, most particularly application servers, ship with
-    a version of Ant. These are primarily for internal use by the application,
-    using the Java APIs to delegate tasks such as JSP page compilation to the Ant
-    runtime. Such distributions are usually unsupported by everyone. Particularly
-    troublesome are those products that non only ship with their own Ant release,
-    they add their own version of ANT.BAT or ant.sh to the PATH. If Ant starts
-    behaving wierdly after installing something, try the
-    <a href="#diagnostics">diagnostics</a> advice.
-</p>
-
-<h3>Source Edition</h3>
-
-<p>If you prefer the source edition, you can download the source for the latest
-Ant release from
-<a href="http://ant.apache.org/srcdownload.cgi" target="_top">http://ant.apache.org/srcdownload.cgi</a>.
-
-If you prefer the leading-edge code, you can access
-the code as it is being developed via SVN. The Ant website has details on
-<a href="http://ant.apache.org/svn.html" target="_top">accessing SVN</a>.
-All bug fixes will go in against the HEAD of the source tree, and the first
-response to many bugreps will be "have you tried the latest version".
-Don't be afraid to download and build a prererelease edition, as everything
-other than new features are usually stable.
-    </p>
-<p>
-
-
-See the section <a href="#buildingant">Building Ant</a> on how to
-build Ant from the source code.
-You can also access the
-<a href="http://svn.apache.org/viewcvs.cgi/ant/" target="_top">
-Ant SVN repository</a> on-line. </p>
-
 <hr>
 <h2><a name="sysrequirements">System Requirements</a></h2>
 Ant has been used successfully on many platforms, including Linux,
@@ -243,7 +295,8 @@ files there. This directory will be know
 <tr>
   <td width="5%">&nbsp;</td>
   <td><i>
-On these systems, the script used to launch Ant will have
+Note that current releases of Ant no longer support these systems. If you are using an older
+version of Ant,  however, the script used to launch Ant will have
 problems if ANT_HOME is a long filename (i.e. a filename which is not
 of the format known as &quot;8.3&quot;). This is due to
 limitations in the OS's handling of the <code>&quot;for&quot;</code>
@@ -264,7 +317,7 @@ installed in a <b>short</b>, 8.3 path, s
 </tr>
 </table>
 
-<h3>Setup</h3>
+<h3><a name="setup">Setup</a></h3>
 <p>
 Before you can run Ant there is some additional set up you
 will need to do unless you are installing the <a href="#jpackage">RPM
@@ -279,6 +332,10 @@ Windows NT/2000), but it is better to no
 (see the <a href="#advanced">Advanced</a> section below).
 This should be set to the directory where your JDK is installed.</li>
 </ul>
+<p>Operating System-specific instructions for doing this from the command
+line are in the <a href="#windows">Windows</a>, <a href="#bash">Linux/Unix (bash)</a>,
+and <a href="#tcshcsh">Linux/Unix (csh)</a> sections. Note that using this method,
+the settings will only be valid for the command line session you run them in.</p>
 <p><strong>Note:</strong> Do not install Ant's ant.jar file into the lib/ext
 directory of the JDK/JRE. Ant is an application, whilst the extension
 directory is intended for JDK extensions. In particular there are security
@@ -294,9 +351,9 @@ restrictions on the classes which may be
   <td width="5%">&nbsp;</td>
   <td>
     The ant.bat script makes use of three environment variables -
-    ANT_HOME, CLASSPATH and JAVA_HOME. <b>Ensure</b> that ANT_HOME and JAVA_HOME variables are set, 
+    ANT_HOME, CLASSPATH and JAVA_HOME. <b>Ensure</b> that ANT_HOME and JAVA_HOME variables are set,
     and that they do <b><u>not</u></b> have quotes (either
-    ' or &quot;) and they do <b><u>not</u></b> end with \ or with /. CLASSPATH should be unset or 
+    ' or &quot;) and they do <b><u>not</u></b> end with \ or with /. CLASSPATH should be unset or
     empty.
   </td>
 </tr>
@@ -309,11 +366,11 @@ should get a message like this
 Buildfile: build.xml does not exist!
 Build failed
 </pre>
-So Ant works. This message is there because you need to write an individual buildfile for your 
+So Ant works. This message is there because you need to write an individual buildfile for your
 project. With a <tt>ant -version</tt> you should get an output like
 <pre>
 Apache Ant version 1.7.1 compiled on June 27 2008
-</pre> 
+</pre>
 </p>
 <p>If this does not work ensure your environment variables are set right. They must resolve to:
 <ul>
@@ -322,7 +379,7 @@ Apache Ant version 1.7.1 compiled on Jun
   <li>required: %PATH%=...<i>maybe-other-entries</i>...;%ANT_HOME%\bin;...<i>maybe-other-entries</i>...</li>
 </ul>
 <b>ANT_HOME</b> is used by the launcher script for finding the libraries.
-<b>JAVA_HOME</b> is used by the launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks 
+<b>JAVA_HOME</b> is used by the launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks
 require the java tools.) If not set, the launcher tries to find one via the %PATH% environment variable.
 <b>PATH</b> is set for user convinience. With that set you can just start <i>ant</i> instead of always typing
 <i>the/complete/path/to/your/ant/installation/bin/ant</i>.
@@ -378,6 +435,50 @@ libraries must be added to Ant's classpa
 </ul>
 
 <p>
+    If you are using the binary version of Ant, or if you are working from source
+    code, you can easily gather most of the dependencies and install them for use
+    with your Ant tasks. In your <code>ANT_HOME</code> directory you should see a
+    file called <code>fetch.xml</code>. This is an Ant script that you can run to
+    install almost all the dependencies the optional Ant tasks need.
+</p>
+
+<p>
+    To do so, change to the <code>ANT_HOME</code> directory and execute the command:
+</p>
+
+<blockquote>
+  <pre>ant -f fetch.xml -Ddest=<i>[option]</i></pre>
+</blockquote
+
+<p>
+    where option is one of the following, as described above:
+    <ul>
+        <li><code>system</code> - store in Ant's lib directory <i>(Recommended)</i></li>
+        <li><code>user</code> - store in the user's home directory</li>
+        <li><code>optional</code> - store in Ant's source code lib/optional directory, used if building Ant source code</li>
+    </ul>
+</p>
+
+<p>
+  You may also need to set proxy settings. See the <a href="#proxy">Proxy Settings</a> section for details.
+</p>
+
+<p>
+Note that not all dependencies are gathered using <code>fetch.xml</code>. Tasks that depend on
+commercial software, in particular, will require you to have the commercial software installed
+in order to be used.
+</p>
+
+<p>The Apache Ant Project also provides additional tasks and types that are available as separately
+downloaded Ant Libraries. You can see the the list of available Antlibs at
+the <a href="http://ant.apache.org/antlibs/proper.html" target="_top">Ant Libraries</a> page.
+</p>
+
+<p>You can also find tasks and types provided by third-party projects at the
+<a href="http://ant.apache.org/external.html" target="_top">External Tools and Tasks</a> page.
+</p>
+
+<p>
     IDEs have different ways of adding external JAR files and third-party tasks
     to Ant. Usually it is done by some configuration dialog. Sometimes JAR files
     added to a project are automatically added to ant's classpath.
@@ -453,29 +554,55 @@ this. </p>
 
 <li><b>With Java1.5</b><br>
 
+<p>
 When you run Ant on Java1.5, you could try to use the automatic proxy setup
-mechanism with <code>-autoproxy</code>. 
+mechanism with <code>-autoproxy</code>.
+</p>
 
 </li>
 
 <li><b>With explicit JVM properties.</b><br>
-
+<p>
 These are documented <a
-href="http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html" target="_top">by Sun</a>,
+href="http://download.oracle.com/javase/1.5.0/docs/guide/net/properties.html" target="_top">by Oracle</a>,
 and control the proxy behaviour of the entire JVM. To set them in Ant, declare
 them in the <code>ANT_OPTS</code> environment variable. This is the best option
 for a non-mobile system. For a laptop, you have to change these settings as you
-roam.
-
+roam. To set ANT_OPTS:
+</p>
+<blockquote>
+<p>
+  For csh/tcsh:
+</p>
+<pre>
+    setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+</pre>
+<p>
+  For bash:
+</p>
+<pre>
+    export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+</pre>
+<p>
+  For Windows, set the environment variable in the appropriate dialog box
+  and open a new console. or, by hand
+</p>
+<pre>
+    set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080
+</pre>
+</p>
+</blockquote>
 </li>
 
 <li><b>In the build file itself</b><br>
 
-If you are writing an build file that is always to be used behind the firewall,
+<p>
+If you are writing a build file that is always to be used behind the firewall,
 the &lt;setproxy&gt; task lets you configure the proxy (which it does by setting
 the JVM properties). If you do this, we strongly recommend using ant properties
 to define the proxy host, port, etc, so that individuals can override the
 defaults.</li>
+</p>
 
 </ul>
 
@@ -505,14 +632,14 @@ environment:</p>
 set JAVA_HOME=c:\jdk-1.5.0.05
 set PATH=%PATH%;%ANT_HOME%\bin</pre>
 
-<h3>Linux/Unix (bash)</h3>
+<h3><a name="bash">Linux/Unix (bash)</a></h3>
 <p>Assume Ant is installed in <code>/usr/local/ant</code>. The following sets up
 the environment:</p>
 <pre>export ANT_HOME=/usr/local/ant
 export JAVA_HOME=/usr/local/jdk-1.5.0.05
 export PATH=${PATH}:${ANT_HOME}/bin</pre>
 
-<h3>Linux/Unix (csh)</h3>
+<h3><a name="tcshcsh">Linux/Unix (csh)</a></h3>
 <pre>setenv ANT_HOME /usr/local/ant
 setenv JAVA_HOME /usr/local/jdk/jdk-1.5.0.05
 set path=( $path $ANT_HOME/bin )</pre>
@@ -542,20 +669,20 @@ ant and the external package (e.g. <code
 However, JPackage does not package proprietary software, and since some of the
 optional packages depend on proprietary jars, they must be handled as follows.
 This may violate the spirit of JPackage, but it is necessary if you need these proprietary packages.
-For example, suppose you want to install support for starteam, which jpackage does not
+For example, suppose you want to install support for netrexx, which jpackage does not
 support:
 <ol>
 <li>Decide where you want to deploy the extra jars.  One option is in <code>$ANT_HOME/lib</code>,
 which, for JPackage is usually <code>/usr/share/ant/lib</code>.  Another, less messy option
 is to create an <code>.ant/lib</code> subdirectory of your home directory and place your
 non-jpackage ant jars there, thereby avoiding mixing jpackage
-libraries with non-jpacakge stuff in the same folder.
+libraries with non-jpackage stuff in the same folder.
 More information on where Ant finds its libraries is available
 <a href="http://ant.apache.org/manual/running.html#libs">here</a></li>
 <li>Download a non-jpackage binary distribution from the regular
     <a href="http://ant.apache.org/bindownload.cgi" target="_top">Apache Ant site</a></li>
 <li>Unzip or untar the distribution into a temporary directory</li>
-<li>Copy the linking jar, in this case <code>ant-starteam.jar</code>, into the library directory you
+<li>Copy the linking jar, in this case <code>ant-jai.jar</code>, into the library directory you
 chose in step 1 above.</li>
 <li>Copy the proprietary jar itself into the same directory.</li>
 </ol>
@@ -572,16 +699,16 @@ least the following:</p>
 <li>The classpath for Ant must contain <code>ant.jar</code> and any jars/classes
 needed for your chosen JAXP-compliant XML parser.</li>
 <li>When you need JDK functionality
-(such as for the <a href="CoreTasks/javac.html">javac</a> task or the
-<a href="CoreTasks/rmic.html">rmic</a> task), then <code>tools.jar</code>
+(such as for the <a href="Tasks/javac.html">javac</a> task or the
+<a href="Tasks/rmic.html">rmic</a> task), then <code>tools.jar</code>
 must be added. The scripts supplied with Ant,
 in the <code>bin</code> directory, will add
 the required JDK classes automatically, if the <code>JAVA_HOME</code>
 environment variable is set.</li>
 
 <li>When you are executing platform-specific applications, such as the
-<a href="CoreTasks/exec.html">exec</a> task or the
-<a href="CoreTasks/cvs.html">cvs</a> task, the property <code>ant.home</code>
+<a href="Tasks/exec.html">exec</a> task or the
+<a href="Tasks/cvs.html">cvs</a> task, the property <code>ant.home</code>
 must be set to the directory containing where you installed Ant. Again
 this is set by the Ant scripts to the value of the ANT_HOME environment
 variable.</li>
@@ -595,7 +722,7 @@ at the source for your platform's invoca
 <hr>
 <h2><a name="buildingant">Building Ant</a></h2>
 <p>To build Ant from source, you can either install the Ant source distribution
-or checkout the ant module from SVN.</p>
+or checkout the ant module from SVN. See <a href="#sourceEdition">Source Edition</a> for details.</p>
 <p>Once you have installed the source, change into the installation
 directory.</p>
 
@@ -620,7 +747,14 @@ still need to
 make the JARs available as described under
 <a href="#installing">Installing Ant</a>.</p>
 
-<p>As of version 1.7.0 Ant has a hard dependency on JUnit and you must
+<p>You can also get most of the auxiliary jar files (ie. the jar files
+that various optional Ant tasks depend on) by running Ant on the
+<code>fetch.xml</code> build file. See <a href="#optionalTasks">Optional
+Tasks</a> for instructions on how to do this.
+</p>
+
+<p>As of version 1.7.0 Ant has a hard dependency on JUnit. The <code>fetch.xml</code> build
+  script will download JUnit automatically, but if you don't use this you must
   install it manually into <code>lib/optional</code> (download it from
   <a href="http://junit.org/" target="_top">JUnit.org</a>) if you are
   using a source distribution of Ant.</p>
@@ -816,7 +950,7 @@ you need jakarta-oro 2.0.8 or later, and
   <tr>
     <td>judo.jar</td>
     <td>Judoscript with script task</td>
-    <td><a href="http://www.judoscript.com/index.html" target="_top">http://www.judoscript.com/index.html</a></td>
+    <td><a href="http://www.judoscript.org/" target="_top">http://www.judoscript.org/</a></td>
   </tr>
   <tr>
     <td>commons-logging.jar</td>
@@ -852,23 +986,14 @@ you need jakarta-oro 2.0.8 or later, and
   <tr>
     <td>mail.jar</td>
     <td>Mail task with Mime encoding, and the MimeMail task</td>
-    <td><a href="http://java.sun.com/products/javamail/"
-        target="_top">http://java.sun.com/products/javamail/</a></td>
-  </tr>
-  <tr>
-    <td>jsse.jar</td>
-    <td>
-Support for SMTP over TLS/SSL <br>
-in the Mail task<br>
-Already included Java 1.4+</td>
-    <td><a href="http://java.sun.com/products/jsse/"
-        target="_top">http://java.sun.com/products/jsse/</a></td>
+    <td><a href="http://www.oracle.com/technetwork/java/index-jsp-139225.html"
+        target="_top">http://www.oracle.com/technetwork/java/index-jsp-139225.html</a></td>
   </tr>
   <tr>
     <td>activation.jar</td>
     <td>Mail task with Mime encoding, and the MimeMail task</td>
-    <td><a href="http://java.sun.com/products/javabeans/glasgow/jaf.html"
-        target="_top">http://java.sun.com/products/javabeans/glasgow/jaf.html</a></td>
+    <td><a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html"
+        target="_top">http://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
   </tr>
   <tr>
     <td>jdepend.jar</td>
@@ -894,12 +1019,6 @@ Already included Java 1.4+</td>
     <td><a href="https://jai.dev.java.net/"
         target="_top">https://jai.dev.java.net/</a></td>
   </tr>
-  <tr>
-    <td>Starteam SDK</td>
-    <td>Starteam version management tasks</td>
-    <td><a href="http://www.borland.com/downloads/download_starteam.html"
-        target="_top">http://www.borland.com/downloads/download_starteam.html</a></td>
-  </tr>
 </table>
 <br>
 <h2><a name="Troubleshooting">Troubleshooting</a></h2>

Modified: ant/core/branches/ANT_SITE/docs/manual/installlist.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/installlist.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/installlist.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/installlist.html Mon Dec 13 18:34:00 2010
@@ -27,12 +27,13 @@
 
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
-<h3>Installing Ant</h3>
+<h3>Installing Apache Ant</h3>
 <ul class="inlinelist">
 <li><a href="install.html#getting">Getting Ant</a></li>
 <li><a href="install.html#sysrequirements">System Requirements</a></li>
 <li><a href="install.html#installing">Installing Ant</a></li>
 <li><a href="install.html#checkInstallation">Check Installation</a></li>
+<li><a href="install.html#optionalTasks">Optional Tasks</a></li>
 <li><a href="install.html#buildingant">Building Ant</a></li>
 <li><a href="install.html#librarydependencies">Library Dependencies</a></li>
 <li><a href="platform.html">Platform Specific Issues</a></li>

Modified: ant/core/branches/ANT_SITE/docs/manual/javacprops.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/javacprops.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/javacprops.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/javacprops.html Mon Dec 13 18:34:00 2010
@@ -29,7 +29,7 @@ don't have any default values for histor
 underlying javac compiler's default depends on the JDK you use, you
 may encounter build files that don't explicitly set those attributes
 and that will no longer compile using a newer JDK.  If you cannot
-change the build file, Ant provides two properties that help you
+change the build file, Apache Ant provides two properties that help you
 setting default values for these attributes.  If the attributes have
 been set explicitly, the properties listed here will be ignored.</p>
 

Modified: ant/core/branches/ANT_SITE/docs/manual/listeners.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/listeners.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/listeners.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/listeners.html Mon Dec 13 18:34:00 2010
@@ -27,7 +27,7 @@
 
 <h2><a name="Overview">Overview</a></h2>
 
-<p>Ant has two related features to allow the build process to be monitored:
+<p>Apache Ant has two related features to allow the build process to be monitored:
 listeners and loggers.</p>
 
 <h3><a name="Listeners">Listeners</a></h3>

Modified: ant/core/branches/ANT_SITE/docs/manual/platform.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/platform.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/platform.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/platform.html Mon Dec 13 18:34:00 2010
@@ -31,31 +31,6 @@ You may need a bigger stack than default
 XSLT engine. We recommend you use Apache Xalan; indeed, some tasks (JUnit report in XML,
 for example) may not work against the shipping XSL engine.
 
-<h3>Java 1.2</h3>
-
-
-You may sometimes see messages like
-<pre>
-A nonfatal internal JIT (3.10.107(x)) error 'chgTarg: Conditional' has
-occurred in :
-  'org/apache/tools/ant/Project.addReference
-(Ljava/lang/String;Ljava/lang/Object;)V': Interpreting method.
-  Please report this error in detail to
-  http://java.sun.com/cgi-bin/bugreport.cgi
-</pre>
-These are caused by subtle incompatibilities between the Java1.4+ compiled
-release; bugs in the Java runtime that Sun won't fix. Possible solutions:-
-<ol>
-<li>Upgrade your JVM.
-<li>Recompile Ant on a Java1.2 machine
-<li>Add <tt>-Djava.compiler=NONE</tt> to
-the value of your ANT_OPTS environment variable. This turns the JIT off.
-<li>Ignore the messages.
-</ol>
-
-
-
-
 <h2>Unix and Linux</h2>
 
 <ul>

Modified: ant/core/branches/ANT_SITE/docs/manual/projecthelper.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/projecthelper.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/projecthelper.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/projecthelper.html Mon Dec 13 18:34:00 2010
@@ -19,16 +19,16 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>The Ant frontend: ProjectHelper</title>
+<title>The Apache Ant frontend: ProjectHelper</title>
 </head>
 
 <body>
-<h1>The Ant frontend: ProjectHelper</h1>
+<h1>The Apache Ant frontend: ProjectHelper</h1>
 
 <h2><a name="definition">What is a ProjectHelper?</a></h2>
 
 <p>
-The <code>ProjectHelper</code> in Ant is responsible for parsing the build file
+The <code>ProjectHelper</code> in Apache Ant is responsible for parsing the build file
 and creating java instances representing the build workflow. It also signals which
 kind of file it can parse, and which file name it expects as default input file.
 </p>
@@ -47,6 +47,12 @@ been done around a pure java frontend, a
 list for further info about these).
 </p>
 
+<p>Since Ant 1.8.2, the <a href="Tasks/import.html">import</a> task will also
+try to use the proper helper to parse the imported file. So it is possible to
+write different build files in different languages and have them import each
+other.
+</p>
+
 <h2><a name="repository">How is Ant is selecting the proper ProjectHelper</a></h2>
 
 <p>
@@ -122,7 +128,7 @@ capable of and what is is expecting:
 </p>
 
 <p>
-Now that you have your implementation ready, you have to declare it to Ant. Two
+Now that you have your implementation ready, you have to declare it to Ant. Three
 solutions here:
 <ul>
     <li>use the system property <code>org.apache.tools.ant.ProjectHelper</code>
@@ -132,6 +138,10 @@ solutions here:
         <code>META-INF/services/org.apache.tools.ant.ProjectHelper</code>.
         And then in this file just put the fully qualified name of your
         implementation</li>
+    <li>use the <a href="Tasks/projecthelper.html">projecthelper</a> task (since
+        Ant 1.8.2) which will install dynamically an helper in the internal helper
+        'repository'. Then your helper can be used on the next call to the
+        <a href="Tasks/import.html">import</a> task.</li>
 </ul>
 </p>
 

Modified: ant/core/branches/ANT_SITE/docs/manual/properties.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/properties.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/properties.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/properties.html Mon Dec 13 18:34:00 2010
@@ -25,11 +25,11 @@
 <body>
   <h1>Properties</h1>
 
-  <p>Properties are key-value-pairs where Ant tries to
+  <p>Properties are key-value-pairs where Apache Ant tries to
     expand <code>${key}</code> to <code>value</code> at runtime.</p>
 
   <p>There are many tasks that can set properties, the most common one
-    is the <a href="CoreTasks/property.html">property</a> task.  In
+    is the <a href="Tasks/property.html">property</a> task.  In
     addition properties can be defined
     via <a href="running.html">command line arguments</a> or similar
     mechanisms from outside of Ant.</p>
@@ -40,14 +40,14 @@
     defined they are available for any task or target invoked
     subsequently - it is not possible to set a property in a child
     build process created via
-    the <a href="CoreTasks/ant.html">ant</a>, antcall or subant tasks
+    the <a href="Tasks/ant.html">ant</a>, antcall or subant tasks
     and make it available to the calling build process, though.</p>
 
   <p>Starting with Ant 1.8.0
-    the <a href="CoreTasks/local.html">local</a> task can be used to
+    the <a href="Tasks/local.html">local</a> task can be used to
     create properties that are locally scoped to a target or
-    a <a href="CoreTasks/sequential.html">sequential</a> element like
-    the one of the <a href="CoreTasks/macrodef.html">macrodef</a>
+    a <a href="Tasks/sequential.html">sequential</a> element like
+    the one of the <a href="Tasks/macrodef.html">macrodef</a>
     task.</p>
 
   <h2><a name="built-in-props">Built-in Properties</a></h2>
@@ -57,7 +57,7 @@
     example, <code>${os.name}</code> expands to the name of the
     operating system.</p>
   <p>For a list of system properties see
-    <a href="http://java.sun.com/j2se/1.3/docs/api/java/lang/System.html#getProperties()">the Javadoc of System.getProperties</a>.
+    <a href="http://download.oracle.com/javase/6/docs/api/java/lang/System.html#getProperties%28%29">the Javadoc of System.getProperties</a>.
   </p>
 
   <p>In addition, Ant has some built-in properties:</p>
@@ -109,7 +109,7 @@ ant.library.dir     the directory that h
     marker interface) to take care of discrete tasks such as property
     setting, retrieval, parsing, etc. This makes Ant's property
     handling highly extensible; also of interest is the
-    new <a href="CoreTasks/propertyhelper.html">propertyhelper</a>
+    new <a href="Tasks/propertyhelper.html">propertyhelper</a>
     task used to manipulate the PropertyHelper and its delegates from
     the context of the Ant buildfile.
 
@@ -139,7 +139,7 @@ ant.library.dir     the directory that h
         would
         be <code>org.apache.tools.ant.property.LocalProperties</code>
         which implements storage
-        for <a href="CoreTasks/local.html">local properties</a>.</p>
+        for <a href="Tasks/local.html">local properties</a>.</p>
 
       <p>Another reason to implement this interface is if you wanted
         to provide your own "property protocol" like
@@ -157,7 +157,7 @@ ant.library.dir     the directory that h
         would
         be <code>org.apache.tools.ant.property.LocalProperties</code>
         which implements storage
-        for <a href="CoreTasks/local.html">local properties</a>.</p>
+        for <a href="Tasks/local.html">local properties</a>.</p>
     </li>
 
   </ul>

Modified: ant/core/branches/ANT_SITE/docs/manual/proxy.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/proxy.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/proxy.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/proxy.html Mon Dec 13 18:34:00 2010
@@ -26,7 +26,7 @@
 <h2>Proxy Configuration</h2>
 
 <p>
-This page discussing proxy issues on command-line ant.
+This page discussing proxy issues on command-line Apache Ant.
 Consult your IDE documentation for IDE-specific information upon proxy setup.
 </p>
 
@@ -174,7 +174,7 @@ command line.
 
 <h3>SetProxy Task</h3>
 <p>
-    The <a href="OptionalTasks/setproxy.html">setproxy task</a> can be used to
+    The <a href="Tasks/setproxy.html">setproxy task</a> can be used to
     explicitly set a proxy in a build file. This manipulates the many proxy 
     configuration properties of a JVM, and controls the proxy settings for all 
     network operations in the same JVM from that moment. 
@@ -243,7 +243,7 @@ command line.
 </p>    
     If you wish to have
     a forked process pick up the Ant's settings, use the 
-    <a href="CoreTypes/propertyset.html"><code>&lt;syspropertyset&gt;</code></a>
+    <a href="Types/propertyset.html"><code>&lt;syspropertyset&gt;</code></a>
     element to propagate the normal proxy settings. The following propertyset
     is a datatype which can be referenced in a <code>&lt;java&gt;</code> task to
     pass down the current values.
@@ -284,7 +284,7 @@ use one of the alternate mechanisms to c
 <h4>Further reading</h4>
 
 <ul>
-<li><a href="http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html">
+<li><a href="http://download.oracle.com/javase/1.5.0/docs/guide/net/properties.html">
 Java Networking Properties</a>. Notice how not all proxy settings are documented
 there.
 <li><a href="http://blogs.sun.com/roller/resources/jcc/Proxies.pdf">Proxies</a>

Modified: ant/core/branches/ANT_SITE/docs/manual/running.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/running.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/running.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/running.html Mon Dec 13 18:34:00 2010
@@ -24,9 +24,9 @@
 
 <body>
 
-<h1>Running Ant</h1>
+<h1>Running Apache Ant</h1>
 <h2><a name="commandline">Command Line</a></h2>
-<p> If you've installed Ant as described in the
+<p> If you've installed Apache Ant as described in the
 <a href="install.html"> Installing Ant</a> section,
 running Ant from the command-line is simple: just type
 <code>ant</code>.</p>
@@ -56,7 +56,7 @@ the <nobr><code>-D<i>property</i>=<i>val
 where <i>property</i> is the name of the property,
 and <i>value</i> is the value for that property. If you specify a
 property that is also set in the build file
-(see the <a href="CoreTasks/property.html">property</a> task),
+(see the <a href="Tasks/property.html">property</a> task),
 the value specified on the
 command line will override the value specified in the
 build file.
@@ -67,7 +67,7 @@ the value of environment variables; just
 to Ant. You can then access
 these variables inside your build file as <code>${MYVAR}</code>.
 You can also access environment variables using the
-<a href="CoreTasks/property.html"> property</a> task's
+<a href="Tasks/property.html"> property</a> task's
 <code>environment</code> attribute.
 </p>
 
@@ -296,7 +296,7 @@ org.apache.tools.ant.Executor implementa
   <td><code>ant.file</code></td>
   <td>read only: full filename of the build file</td>
   <td>This is set to the name of the build file. In
-  <a href="CoreTasks/import.html">
+  <a href="Tasks/import.html">
   &lt;import&gt;-ed</a> files, this is set to the containing build file.
   </td>
 </tr>
@@ -306,7 +306,7 @@ org.apache.tools.ant.Executor implementa
   <td>read only: full filename of the build file of Ant projects
   </td>
   <td>This is set to the name of a file by project;
-  this lets you determine the location of <a href="CoreTasks/import.html">
+  this lets you determine the location of <a href="Tasks/import.html">
   &lt;import&gt;-ed</a> files,
   </td>
 </tr>
@@ -329,7 +329,7 @@ org.apache.tools.ant.Executor implementa
 <tr>
   <td><code>ant.netrexxc.*</code></td>
   <td>several formats</td>
-  <td>Use specified values as defaults for <a href="OptionalTasks/netrexxc.html">netrexxc</a>.
+  <td>Use specified values as defaults for <a href="Tasks/netrexxc.html">netrexxc</a>.
   </td>
 </tr>
 <tr>
@@ -344,7 +344,7 @@ org.apache.tools.ant.Executor implementa
   <td><code>ant.regexp.regexpimpl</code></td>
   <td>classname</td>
   <td>classname for a RegExp implementation; if not set Ant uses JDK 1.4's implementation;
-      <a href="CoreTypes/mapper.html#regexp-mapper">RegExp-Mapper</a>
+      <a href="Types/mapper.html#regexp-mapper">RegExp-Mapper</a>
       "Choice of regular expression implementation"
   </td>
 </tr>
@@ -366,49 +366,49 @@ org.apache.tools.ant.Executor implementa
   <td><code>build.compiler</code></td>
   <td>name</td>
   <td>Specify the default compiler to use.
-      see <a href="CoreTasks/javac.html">javac</a>,
-      <a href="OptionalTasks/ejb.html#ejbjar_weblogic">EJB Tasks</a>
+      see <a href="Tasks/javac.html">javac</a>,
+      <a href="Tasks/ejb.html#ejbjar_weblogic">EJB Tasks</a>
       (compiler attribute),
-      <a href="OptionalTasks/javah.html">javah</a>
+      <a href="Tasks/javah.html">javah</a>
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.emacs</code></td>
   <td>boolean (default false)</td>
   <td>Enable emacs-compatible error messages.
-      see <a href="CoreTasks/javac.html">javac</a> "Jikes Notes"
+      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.fulldepend</code></td>
   <td>boolean (default false)</td>
   <td>Enable full dependency checking
-      see <a href="CoreTasks/javac.html">javac</a> "Jikes Notes"
+      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.jvc.extensions</code></td>
   <td>boolean (default true)</td>
   <td>enable Microsoft extensions of their java compiler
-      see <a href="CoreTasks/javac.html">javac</a> "Jvc Notes"
+      see <a href="Tasks/javac.html">javac</a> "Jvc Notes"
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.pedantic</code></td>
   <td>boolean (default false)</td>
   <td>Enable pedantic warnings.
-      see <a href="CoreTasks/javac.html">javac</a> "Jikes Notes"
+      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
   </td>
 </tr>
 <tr>
   <td><code>build.compiler.warnings</code></td>
   <td>Deprecated flag</td>
-  <td> see <a href="CoreTasks/javac.html">javac</a> "Jikes Notes" </td>
+  <td> see <a href="Tasks/javac.html">javac</a> "Jikes Notes" </td>
 </tr>
 <tr>
   <td><code>build.rmic</code></td>
   <td>name</td>
-  <td>control the <a href="CoreTasks/rmic.html">rmic</a> compiler </td>
+  <td>control the <a href="Tasks/rmic.html">rmic</a> compiler </td>
 </tr>
 <tr>
   <td><code>build.sysclasspath</code></td>
@@ -420,8 +420,8 @@ org.apache.tools.ant.Executor implementa
   <td><code>file.encoding</code></td>
   <td>name of a supported character set (e.g. UTF-8, ISO-8859-1, US-ASCII)</td>
   <td>use as default character set of email messages; use as default for source-, dest- and bundleencoding
-      in <a href="OptionalTasks/translate.html">translate</a> <br>
-      see JavaDoc of <a target="_blank" href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">java.nio.charset.Charset</a>
+      in <a href="Tasks/translate.html">translate</a> <br>
+      see JavaDoc of <a target="_blank" href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">java.nio.charset.Charset</a>
       for more information about character sets (not used in Ant, but has nice docs).
   </td>
 </tr>
@@ -450,14 +450,14 @@ org.apache.tools.ant.Executor implementa
   <td><code>p4.port, p4.client, p4.user</code></td>
   <td>several formats</td>
   <td>Specify defaults for port-, client- and user-setting of the
-      <a href="OptionalTasks/perforce.html">perforce</a> tasks.
+      <a href="Tasks/perforce.html">perforce</a> tasks.
   </td>
 </tr>
 <tr>
   <td><code>websphere.home</code></td>
   <td>path</td>
   <td>Points to home directory of websphere.
-      see <a href="OptionalTasks/ejb.html#ejbjar_websphere">EJB Tasks</a>
+      see <a href="Tasks/ejb.html#ejbjar_websphere">EJB Tasks</a>
   </td>
 </tr>
 <tr>

Modified: ant/core/branches/ANT_SITE/docs/manual/runninglist.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/runninglist.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/runninglist.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/runninglist.html Mon Dec 13 18:34:00 2010
@@ -27,7 +27,7 @@
 
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
-<h3>Running Ant</h3>
+<h3>Running Apache Ant</h3>
 <ul class="inlinelist">
 <li><a href="running.html#commandline">Command Line</a></li>
 <div style="padding-left:1em">

Modified: ant/core/branches/ANT_SITE/docs/manual/sysclasspath.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/sysclasspath.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/sysclasspath.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/sysclasspath.html Mon Dec 13 18:34:00 2010
@@ -27,7 +27,7 @@
 <h2><a name="sysclasspath">build.sysclasspath</a></h2>
 <p>The value of the build.sysclasspath property
 controls how the system classpath, i.e. the classpath in effect when
-Ant is run, affects the behavior of classpaths in Ant.
+Apache Ant is run, affects the behavior of classpaths in Ant.
 The default behavior varies from task to task.</p>
 
 The values and their meanings are:

Modified: ant/core/branches/ANT_SITE/docs/manual/targets.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/docs/manual/targets.html?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/docs/manual/targets.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/targets.html Mon Dec 13 18:34:00 2010
@@ -28,7 +28,7 @@
   <p>A target is a container of tasks that cooperate to reach a
     desired state during the build process.</p>
 
-  <p>Targets can depend on other targets and Ant ensures that these
+  <p>Targets can depend on other targets and Apache Ant ensures that these
     other targets have been executed before the current target. For
     example you might have a target for compiling and a
     target for creating a distributable. You can only build a
@@ -131,7 +131,7 @@
     option is used.</p>
 
   <p>It is a good practice to place
-    your <a href="CoreTasks/tstamp.html">tstamp</a> tasks in a
+    your <a href="Tasks/tstamp.html">tstamp</a> tasks in a
     so-called <i>initialization</i> target, on which all other targets
     depend. Make sure that target is always the first one in the
     depends list of the other targets. In this manual, most
@@ -205,6 +205,17 @@
         <em>since Ant 1.8.0.</em></td>
       <td align="center" valign="top">No</td>
     </tr>
+    <tr>
+      <td valign="top">onMissingExtensionPoint</td>
+      <td valign="top">What to do if this target tries to extend a
+        missing
+        <a href="#extension-points">extension-point</a>. ("fail",
+        "warn", "ignore").
+        <em>since Ant 1.8.2.</em></td>
+      <td align="center" valign="top">No. Not allowed unless
+        <code>extensionOf</code> is present. Defaults to <code>fail</code>. 
+      </td>
+    </tr>
   </table>
 
   <p>A target name can be any alphanumeric string valid in the
@@ -245,7 +256,7 @@
 
   <p>The main purpose of an extension-point is to act as an extension
     point for build files designed to
-    be <a href="CoreTasks/import.html">imported</a>.  In the imported
+    be <a href="Tasks/import.html">imported</a>.  In the imported
     file an extension-point defines a state that must be reached and
     targets from other build files can join the depends list of said
     extension-point in order to contribute to that state.</p>



Mime
View raw message