ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1045279 [5/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/manual/tasksoverview.html
--- ant/core/branches/ANT_SITE/docs/manual/tasksoverview.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/tasksoverview.html Mon Dec 13 18:34:00 2010
@@ -18,13 +18,13 @@
   <meta http-equiv="Content-Language" content="en-us">
   <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Overview of Ant Tasks</title>
+<title>Overview of Apache Ant Tasks</title>
   <base target="mainFrame">
 <a name="top"></a>
-<h2>Overview of Ant Tasks</h2>
+<h2>Overview of Apache Ant Tasks</h2>
 <p>Given the large number of tasks available with Ant, it may be
 difficult to get an overall view of what each task can do.  The following
 tables provide a short description of each task and a link to the complete
@@ -67,109 +67,109 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/unpack.html">BUnzip2</a></td>
+    <td nowrap><a href="Tasks/unpack.html">BUnzip2</a></td>
     <td><p>Expands a file packed using GZip or BZip2.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/pack.html">BZip2</a></td>
+    <td nowrap><a href="Tasks/pack.html">BZip2</a></td>
     <td><p>Packs a file using the GZip or BZip2 algorithm. This task
      does not do any dependency checking; the output file is always
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/cab.html">Cab</a></td>
+    <td nowrap><a href="Tasks/cab.html">Cab</a></td>
     <td><p>Creates Microsoft CAB archive files. It is invoked
-     similar to the <a href="CoreTasks/jar.html">Jar</a> or
-     <a href="CoreTasks/zip.html">Zip</a> tasks. This task will work on
+     similar to the <a href="Tasks/jar.html">Jar</a> or
+     <a href="Tasks/zip.html">Zip</a> tasks. This task will work on
      Windows using the external <i>cabarc</i> tool (provided by Microsoft),
      which must be located in your executable path.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/ear.html">Ear</a></td>
-    <td><p>An extension of the <a href="CoreTasks/jar.html">Jar</a> task with
+    <td nowrap><a href="Tasks/ear.html">Ear</a></td>
+    <td><p>An extension of the <a href="Tasks/jar.html">Jar</a> task with
      special treatment for files that should end up in an
      Enterprise Application archive.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/gunzip.html">GUnzip</a></td>
+    <td nowrap><a href="Tasks/gunzip.html">GUnzip</a></td>
     <td><p>Expands a GZip file.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/gzip.html">GZip</a></td>
+    <td nowrap><a href="Tasks/gzip.html">GZip</a></td>
     <td><p>GZips a set of files.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/jar.html">Jar</a></td>
+    <td nowrap><a href="Tasks/jar.html">Jar</a></td>
     <td><p>Jars a set of files.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jlink.html">Jlink</a></td>
+    <td nowrap><a href="Tasks/jlink.html">Jlink</a></td>
     <td><p><i>Deprecated.</i> Use the <code>zipfileset</code>
      and <code>zipgroupfileset</code> attributes of the
-     <a href="CoreTasks/jar.html">Jar</a> or
-     <a href="CoreTasks/zip.html">Zip</a> tasks instead.</p></td>
+     <a href="Tasks/jar.html">Jar</a> or
+     <a href="Tasks/zip.html">Zip</a> tasks instead.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/manifest.html">Manifest</a></td>
+    <td nowrap><a href="Tasks/manifest.html">Manifest</a></td>
     <td><p>Creates a manifest file.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/rpm.html">Rpm</a></td>
+    <td nowrap><a href="Tasks/rpm.html">Rpm</a></td>
     <td><p>Invokes the <i>rpm</i> executable to build a Linux installation
      file. This task currently only works on Linux or other Unix platforms
      with RPM support.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/signjar.html">SignJar</a></td>
+    <td nowrap><a href="Tasks/signjar.html">SignJar</a></td>
     <td><p>Signs a jar or zip file with the <i>javasign</i>
      command-line tool.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/tar.html">Tar</a></td>
+    <td nowrap><a href="Tasks/tar.html">Tar</a></td>
     <td><p>Creates a tar archive.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/unzip.html">Unjar</a></td>
+    <td nowrap><a href="Tasks/unzip.html">Unjar</a></td>
     <td><p>Unzips a jarfile.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/untar.html">Untar</a></td>
+    <td nowrap><a href="Tasks/untar.html">Untar</a></td>
     <td><p>Untars a tarfile.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/unzip.html">Unwar</a></td>
+    <td nowrap><a href="Tasks/unzip.html">Unwar</a></td>
     <td><p>Unzips a warfile.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/unzip.html">Unzip</a></td>
+    <td nowrap><a href="Tasks/unzip.html">Unzip</a></td>
     <td><p>Unzips a zipfile.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/war.html">War</a></td>
-    <td><p>An extension of the <a href="CoreTasks/jar.html">Jar</a> task
+    <td nowrap><a href="Tasks/war.html">War</a></td>
+    <td><p>An extension of the <a href="Tasks/jar.html">Jar</a> task
      with special treatment for files that should end up in the
      <code>WEB-INF/lib</code>, <code>WEB-INF/classes</code>, or
      <code>WEB-INF</code> directories of the Web Application Archive.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/zip.html">Zip</a></td>
+    <td nowrap><a href="Tasks/zip.html">Zip</a></td>
     <td><p>Creates a zipfile.</p></td>
@@ -191,7 +191,7 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jdepend.html">JDepend</a></td>
+    <td nowrap><a href="Tasks/jdepend.html">JDepend</a></td>
     <td><p>Invokes the <a href="">
      JDepend</a> parser. This parser &quot;traverses a set of Java source-file
      directories and generates design-quality metrics for each Java
@@ -217,54 +217,54 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/depend.html">Depend</a></td>
+    <td nowrap><a href="Tasks/depend.html">Depend</a></td>
     <td><p>Determines which classfiles are out-of-date with respect to their
      source, removing the classfiles of any other classes that depend on the
      out-of-date classes, forcing the re-compile of the removed classfiles.
      Typically used in conjunction with the
-     <a href="CoreTasks/javac.html">Javac</a> task.</p></td>
+     <a href="Tasks/javac.html">Javac</a> task.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/javac.html">Javac</a></td>
+    <td nowrap><a href="Tasks/javac.html">Javac</a></td>
     <td><p>Compiles the specified source file(s) within the running
      (Ant) VM, or in another VM if the <code>fork</code> attribute is
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/apt.html">Apt</a></td>
+    <td nowrap><a href="Tasks/apt.html">Apt</a></td>
     <td><p>Runs the annotation processor tool (apt), and then optionally compiles
    the original code, and any generated source code.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jspc.html">JspC</a></td>
+    <td nowrap><a href="Tasks/jspc.html">JspC</a></td>
     <td><p>Runs the JSP compiler. It can be used to precompile JSP pages
      for fast initial invocation of JSP pages, deployment on a server without
      the full JDK installed, or simply to syntax-check the pages without
-     deploying them. The <a href="CoreTasks/javac.html">Javac</a> task
+     deploying them. The <a href="Tasks/javac.html">Javac</a> task
      can be used to compile the generated Java source.
      (For Weblogic JSP compiles,
-     see the <a href="OptionalTasks/wljspc.html">Wljspc</a> task.)</p></td>
+     see the <a href="Tasks/wljspc.html">Wljspc</a> task.)</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/netrexxc.html">NetRexxC</a></td>
+    <td nowrap><a href="Tasks/netrexxc.html">NetRexxC</a></td>
     <td><p>Compiles a
      <a href="" target="_top">NetRexx</a>
      source tree within the running (Ant) VM.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/rmic.html">Rmic</a></td>
+    <td nowrap><a href="Tasks/rmic.html">Rmic</a></td>
     <td><p>Runs the <i>rmic</i> compiler on the specified file(s).</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/wljspc.html">Wljspc</a></td>
+    <td nowrap><a href="Tasks/wljspc.html">Wljspc</a></td>
     <td><p>Compiles JSP pages using Weblogic's JSP compiler,
      <i>weblogic.jspc</i>. (For non-Weblogic JSP compiles, see the
-     <a href="OptionalTasks/jspc.html">JspC</a> task.</p></td>
+     <a href="Tasks/jspc.html">JspC</a> task.</p></td>
@@ -286,7 +286,7 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/serverdeploy.html">ServerDeploy</a></td>
+    <td nowrap><a href="Tasks/serverdeploy.html">ServerDeploy</a></td>
     <td><p>Task to run a &quot;hot&quot; deployment tool for vendor-specific
      J2EE server.
@@ -310,7 +310,7 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/javadoc.html">Javadoc/<i>Javadoc2</i></a></td>
+    <td nowrap><a href="Tasks/javadoc.html">Javadoc/<i>Javadoc2</i></a></td>
     <td><p>Generates code documentation using the <i>javadoc</i> tool.
      The Javadoc2 task is deprecated; use the Javadoc task instead.</p></td>
@@ -334,7 +334,7 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/ejb.html">EJB Tasks</a></td>
+    <td nowrap><a href="Tasks/ejb.html">EJB Tasks</a></td>
     <td><p>(See the documentation describing the EJB tasks.)</p></td>
@@ -356,54 +356,54 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/ant.html">Ant</a></td>
+    <td nowrap><a href="Tasks/ant.html">Ant</a></td>
     <td><p>Runs Ant on a supplied buildfile, optionally
      passing properties (with possibly new values).
      This task can be used to build sub-projects.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/antcall.html">AntCall</a></td>
+    <td nowrap><a href="Tasks/antcall.html">AntCall</a></td>
     <td><p>Runs another target within the same buildfile, optionally
      passing properties (with possibly new values).</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/apply.html">Apply/<i>ExecOn</i></a></td>
+    <td nowrap><a href="Tasks/apply.html">Apply/<i>ExecOn</i></a></td>
     <td><p>Executes a system command. When the <code>os</code> attribute is
      specified, the command is only executed when Ant is run on one
      of the specified operating systems.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/dependset.html">Dependset</a></td>
+    <td nowrap><a href="Tasks/dependset.html">Dependset</a></td>
     <td><p>This task compares a set of source files with a set of target
      files.  If any of the source files is newer than any of
      the target files, all the target files are removed. </p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/exec.html">Exec</a></td>
+    <td nowrap><a href="Tasks/exec.html">Exec</a></td>
     <td><p>Executes a system command. When the <code>os</code> attribute
      is specified, the command is only executed when Ant is run on one of
      the specified operating systems.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/java.html">Java</a></td>
+    <td nowrap><a href="Tasks/java.html">Java</a></td>
     <td><p>Executes a Java class within the running (Ant) VM, or in
      another VM if the <code>fork</code> attribute is specified.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/parallel.html">Parallel</a></td>
+    <td nowrap><a href="Tasks/parallel.html">Parallel</a></td>
     <td><p>A container task that can contain other Ant tasks.
      Each nested task specified within the <code>&lt;parallel&gt;</code>
      tag will be executed in its own thread.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/sequential.html">Sequential</a></td>
+    <td nowrap><a href="Tasks/sequential.html">Sequential</a></td>
     <td><p>A container task that can contain other Ant tasks.
      The nested tasks are simply executed in sequence. Its primary use is
      to support the sequential execution of a subset of tasks within
@@ -411,22 +411,22 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/sleep.html">Sleep</a></td>
+    <td nowrap><a href="Tasks/sleep.html">Sleep</a></td>
     <td><p> A task for suspending execution for a specified period of time.
      Useful when a build or deployment process requires an interval between
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/subant.html">Subant</a></td>
+    <td nowrap><a href="Tasks/subant.html">Subant</a></td>
     <td><p> Calls a given target for all defined sub-builds. This is an extension of ant for bulk project execution.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/waitfor.html">Waitfor</a></td>
+    <td nowrap><a href="Tasks/waitfor.html">Waitfor</a></td>
     <td><p>Blocks execution until a set of specified conditions become true.
      This task is intended to be used with the
-     <a href="CoreTasks/parallel.html">Parallel</a> task to synchronize
+     <a href="Tasks/parallel.html">Parallel</a> task to synchronize
      a set of processes.</p></td>
@@ -448,27 +448,27 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/attrib.html">Attrib</a></td>
+    <td nowrap><a href="Tasks/attrib.html">Attrib</a></td>
     <td><p>Changes the permissions and/or attributes of a file or all
     files inside the specified directories. Currently, it has effect
     only under Windows.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/checksum.html">Checksum</a></td>
+    <td nowrap><a href="Tasks/checksum.html">Checksum</a></td>
     <td><p>Generates a checksum for a file or set of files. This task can
      also be used to perform checksum verifications.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/chgrp.html">Chgrp</a></td>
+    <td nowrap><a href="Tasks/chgrp.html">Chgrp</a></td>
     <td><p>Changes the group ownership of a file or all files inside
     the specified directories. Currently, it has effect only under
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/chmod.html">Chmod</a></td>
+    <td nowrap><a href="Tasks/chmod.html">Chmod</a></td>
     <td><p>Changes the permissions of a file or all files inside the
      specified directories. Currently, it has effect only under Unix.
      The permissions are also UNIX style, like the arguments for the
@@ -476,105 +476,105 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/chown.html">Chown</a></td>
+    <td nowrap><a href="Tasks/chown.html">Chown</a></td>
     <td><p>Changes the owner of a file or all files inside the
     specified directories. Currently, it has effect only under
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/concat.html">Concat</a></td>
+    <td nowrap><a href="Tasks/concat.html">Concat</a></td>
     <td><p>Concatenates multiple files into a single one or to Ant's
      logging system.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/copy.html">Copy</a></td>
+    <td nowrap><a href="Tasks/copy.html">Copy</a></td>
     <td><p>Copies a file or Fileset to a new file or directory.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/copydir.html"><i>Copydir</i></a></td>
+    <td nowrap><a href="Tasks/copydir.html"><i>Copydir</i></a></td>
     <td><p><i>Deprecated.</i>  Use the
-     <a href="CoreTasks/copy.html">Copy</a> task instead.</p></td>
+     <a href="Tasks/copy.html">Copy</a> task instead.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/copyfile.html"><i>Copyfile</i></a></td>
+    <td nowrap><a href="Tasks/copyfile.html"><i>Copyfile</i></a></td>
     <td><p><i>Deprecated.</i>  Use the
-     <a href="CoreTasks/copy.html">Copy</a> task instead.</p></td>
+     <a href="Tasks/copy.html">Copy</a> task instead.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/delete.html">Delete</a></td>
+    <td nowrap><a href="Tasks/delete.html">Delete</a></td>
     <td><p>Deletes either a single file, all files and sub-directories
      in a specified directory, or a set of files specified by one or more
-     <a href="CoreTypes/fileset.html">FileSet</a>s.</p></td>
+     <a href="Types/fileset.html">FileSet</a>s.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/deltree.html"><i>Deltree</i></a></td>
+    <td nowrap><a href="Tasks/deltree.html"><i>Deltree</i></a></td>
     <td><p><i>Deprecated.</i>  Use the
-     <a href="CoreTasks/delete.html">Delete</a> task instead.</p></td>
+     <a href="Tasks/delete.html">Delete</a> task instead.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/filter.html">Filter</a></td>
+    <td nowrap><a href="Tasks/filter.html">Filter</a></td>
     <td><p>Sets a token filter for this project, or reads multiple token
      filters from a specified file and sets these as filters. Token filters
      are used by all tasks that perform file-copying operations.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/fixcrlf.html">FixCRLF</a></td>
+    <td nowrap><a href="Tasks/fixcrlf.html">FixCRLF</a></td>
     <td><p>Modifies a file to add or remove tabs, carriage returns, linefeeds,
      and EOF characters.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/get.html">Get</a></td>
+    <td nowrap><a href="Tasks/get.html">Get</a></td>
     <td><p>Gets a file from a URL.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/mkdir.html">Mkdir</a></td>
+    <td nowrap><a href="Tasks/mkdir.html">Mkdir</a></td>
     <td><p>Creates a directory. Non-existent parent directories are created,
      when necessary.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/move.html">Move</a></td>
+    <td nowrap><a href="Tasks/move.html">Move</a></td>
     <td><p>Moves a file to a new file or directory, or a set(s) of file(s) to
      a new directory.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/patch.html">Patch</a></td>
+    <td nowrap><a href="Tasks/patch.html">Patch</a></td>
     <td><p>Applies a &quot;diff&quot; file to originals.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/rename.html"><i>Rename</i></a></td>
-    <td><p><i>Deprecated.</i>  Use the <a href="CoreTasks/move.html">Move</a>
+    <td nowrap><a href="Tasks/rename.html"><i>Rename</i></a></td>
+    <td><p><i>Deprecated.</i>  Use the <a href="Tasks/move.html">Move</a>
     task instead.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/renameextensions.html">
+    <td nowrap><a href="Tasks/renameextensions.html">
-    <td><p><i>Deprecated</i>. Use the <a href="CoreTasks/move.html">Move</a>
-     task with a <a href="CoreTypes/mapper.html#glob-mapper">glob mapper</a>
+    <td><p><i>Deprecated</i>. Use the <a href="Tasks/move.html">Move</a>
+     task with a <a href="Types/mapper.html#glob-mapper">glob mapper</a>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/replace.html">Replace</a></td>
+    <td nowrap><a href="Tasks/replace.html">Replace</a></td>
     <td><p>Replace is a directory-based task for replacing the occurrence
      of a given string with another string in selected file.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/replaceregexp.html">
+    <td nowrap><a href="Tasks/replaceregexp.html">
     <td><p>Directory-based task for replacing the occurrence of a given
      regular expression with a substitution pattern in a file or set of
@@ -582,18 +582,18 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/sync.html">Sync</a></td>
+    <td nowrap><a href="Tasks/sync.html">Sync</a></td>
     <td><p>Synchronize two directory trees.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/tempfile.html">Tempfile</a></td>
+    <td nowrap><a href="Tasks/tempfile.html">Tempfile</a></td>
     <td><p>Generates a name for a new temporary file and sets the specified
      property to that name.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/touch.html">Touch</a></td>
+    <td nowrap><a href="Tasks/touch.html">Touch</a></td>
     <td><p>Changes the modification time of a file and possibly creates it at
      the same time.</p></td>
@@ -617,7 +617,7 @@ documentation.</p>
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/jarlib-available.html">Jarlib-available</a></td>
+    <a href="Tasks/jarlib-available.html">Jarlib-available</a></td>
     <td><p>Check whether an extension is present in a FileSet or an
       ExtensionSet. If the extension is present, the specified property is
@@ -626,7 +626,7 @@ documentation.</p>
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/jarlib-display.html">Jarlib-display</a></td>
+    <a href="Tasks/jarlib-display.html">Jarlib-display</a></td>
     <td><p>Display the &quot;Optional Package&quot; and
       &quot;Package Specification&quot; information contained within the
       specified jars.</p>
@@ -635,7 +635,7 @@ documentation.</p>
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/jarlib-manifest.html">Jarlib-manifest</a></td>
+    <a href="Tasks/jarlib-manifest.html">Jarlib-manifest</a></td>
     <td><p>Task to generate a manifest that declares all the dependencies
       in manifest. The dependencies are determined by looking in the
       specified path and searching for Extension/&quot;Optional Package&quot;
@@ -645,7 +645,7 @@ documentation.</p>
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/jarlib-resolve.html">Jarlib-resolve</a></td>
+    <a href="Tasks/jarlib-resolve.html">Jarlib-resolve</a></td>
     <td><p>Try to locate a jar to satisfy an extension, and place the
       location of the jar into the specified property.</p>
@@ -670,7 +670,7 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/recorder.html">Record</a></td>
+    <td nowrap><a href="Tasks/recorder.html">Record</a></td>
     <td><p>Runs a listener that records the logging output of the
      build-process events to a file. Several recorders can exist
      at the same time. Each recorder is associated with a file.</p></td>
@@ -694,13 +694,13 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/mail.html">Mail</a></td>
+    <td nowrap><a href="Tasks/mail.html">Mail</a></td>
     <td><p>A task to send SMTP email.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/mimemail.html">MimeMail</a></td>
-    <td><p><i>Deprecated</i>. Use the <a href="CoreTasks/mail.html">Mail</a>
+    <td nowrap><a href="Tasks/mimemail.html">MimeMail</a></td>
+    <td><p><i>Deprecated</i>. Use the <a href="Tasks/mail.html">Mail</a>
      task instead.</p></td>
@@ -723,60 +723,60 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/defaultexcludes.html">Defaultexcludes</a></td>
+    <td nowrap><a href="Tasks/defaultexcludes.html">Defaultexcludes</a></td>
     <td><p>Modify the list of default exclude patterns from within
     your build file.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/echo.html">Echo</a></td>
+    <td nowrap><a href="Tasks/echo.html">Echo</a></td>
     <td><p>Echoes text to <code>System.out</code> or to a file.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/fail.html">Fail</a></td>
+    <td nowrap><a href="Tasks/fail.html">Fail</a></td>
     <td><p>Exits the current build by throwing a BuildException,
      optionally printing additional information.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/genkey.html">GenKey</a></td>
+    <td nowrap><a href="Tasks/genkey.html">GenKey</a></td>
     <td><p>Generates a key in keystore.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/hostinfo.html">HostInfo</a></td>
+    <td nowrap><a href="Tasks/hostinfo.html">HostInfo</a></td>
     <td><p>Sets properties related to the provided host, or to
     the host the process is run on.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/input.html">Input</a></td>
+    <td nowrap><a href="Tasks/input.html">Input</a></td>
     <td><p>Allows user interaction during the build process by displaying a
      message and reading a line of input from the console.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/script.html">Script</a></td>
+    <td nowrap><a href="Tasks/script.html">Script</a></td>
     <td><p>Executes a script in a
      <a href=""
       target="_top">Apache BSF</a>-supported language.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/sound.html">Sound</a></td>
+    <td nowrap><a href="Tasks/sound.html">Sound</a></td>
     <td><p>Plays a sound file at the end of the build, according to whether
      the build failed or succeeded.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/splash.html">Splash</a></td>
+    <td nowrap><a href="Tasks/splash.html">Splash</a></td>
     <td><p>Displays a splash screen.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/sql.html">Sql</a></td>
+    <td nowrap><a href="Tasks/sql.html">Sql</a></td>
     <td><p>Executes a series of SQL statements via JDBC to a database.
      Statements can either be read in from a text file using the
      <code>src</code> attribute, or from between the enclosing SQL
@@ -784,26 +784,26 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/taskdef.html">Taskdef</a></td>
+    <td nowrap><a href="Tasks/taskdef.html">Taskdef</a></td>
     <td><p>Adds a task definition to the current project, such that this
      new task can be used in the current project.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/tstamp.html">TStamp</a></td>
+    <td nowrap><a href="Tasks/tstamp.html">TStamp</a></td>
     <td><p>Sets the <code>DSTAMP</code>, <code>TSTAMP</code>, and
      <code>TODAY</code> properties in the current project, based on
      the current date and time.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/typedef.html">Typedef</a></td>
+    <td nowrap><a href="Tasks/typedef.html">Typedef</a></td>
     <td><p>Adds a data-type definition to the current project, such that this
      new type can be used in the current project.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/xmlvalidate.html">XmlValidate</a></td>
+    <td nowrap><a href="Tasks/xmlvalidate.html">XmlValidate</a></td>
     <td><p>Checks that XML files are valid (or only well-formed). This task
      uses the XML parser that is currently used by Ant by default, but any SAX1/2
      parser can be specified, if needed.</p></td>
@@ -827,42 +827,42 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/antlr.html">ANTLR</a></td>
+    <td nowrap><a href="Tasks/antlr.html">ANTLR</a></td>
     <td><p>Invokes the <a HREF="" target="_top">ANTLR</a>
      Translator generator on a grammar file.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/antstructure.html">AntStructure</a></td>
+    <td nowrap><a href="Tasks/antstructure.html">AntStructure</a></td>
     <td><p>Generates a DTD for Ant buildfiles that contains information
      about all tasks currently known to Ant.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/import.html">Import</a></td>
+    <td nowrap><a href="Tasks/import.html">Import</a></td>
     <td><p>Import another build file and potentially override targets
     in it with targets of your own.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/include.html">Include</a></td>
+    <td nowrap><a href="Tasks/include.html">Include</a></td>
     <td><p>Include another build file.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/javacc.html">JavaCC</a></td>
+    <td nowrap><a href="Tasks/javacc.html">JavaCC</a></td>
     <td><p>Invokes the
      <a HREF="" target="_top">
      JavaCC</a> compiler-compiler on a grammar file.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/javah.html">Javah</a></td>
+    <td nowrap><a href="Tasks/javah.html">Javah</a></td>
     <td><p>Generates JNI headers from a Java class.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jjdoc.html">JJDoc</a></td>
+    <td nowrap><a href="Tasks/jjdoc.html">JJDoc</a></td>
     <td><p>Invokes the <a href="">
      JJDoc</a> documentation generator for the JavaCC compiler-compiler.
      JJDoc takes a JavaCC parser specification and produces documentation
@@ -872,7 +872,7 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/jjtree.html">JJTree</a></td>
+    <td nowrap><a href="Tasks/jjtree.html">JJTree</a></td>
     <td><p>Invokes the <a href="">
      JJTree</a> preprocessor for the JavaCC compiler-compiler. It inserts
      parse-tree building actions at various places in the JavaCC source that
@@ -882,12 +882,12 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/macrodef.html">Macrodef</a></td>
+    <td nowrap><a href="Tasks/macrodef.html">Macrodef</a></td>
     <td><p>Define a new task as a macro built-up upon other tasks.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/native2ascii.html">
+    <td nowrap><a href="Tasks/native2ascii.html">
     <td><p>Converts files from native encodings to ASCII with escaped Unicode.
       A common usage is to convert source files maintained in a native
@@ -895,19 +895,19 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/presetdef.html">Presetdef</a></td>
+    <td nowrap><a href="Tasks/presetdef.html">Presetdef</a></td>
     <td><p>Define a new task by instrumenting an existing task with
     default values for attributes or child elements.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/translate.html">Translate</a></td>
+    <td nowrap><a href="Tasks/translate.html">Translate</a></td>
     <td><p>Identifies keys in files, delimited by special tokens, and
      translates them with values read from resource bundles.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/style.html">XSLT</a></td>
+    <td nowrap><a href="Tasks/style.html">XSLT</a></td>
     <td><p>Processes a set of documents via XSLT.</p></td>
@@ -930,49 +930,49 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/available.html">Available</a></td>
+    <td nowrap><a href="Tasks/available.html">Available</a></td>
     <td><p>Sets a property if a specified file, directory, class in the
      classpath, or JVM system resource is available at runtime.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/basename.html">Basename</a></td>
+    <td nowrap><a href="Tasks/basename.html">Basename</a></td>
     <td><p>Sets a property to the last element of a specified path.
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/buildnumber.html">BuildNumber</a></td>
+    <td nowrap><a href="Tasks/buildnumber.html">BuildNumber</a></td>
     <td><p>Task that can be used to track build numbers.
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/condition.html">Condition</a></td>
+    <td nowrap><a href="Tasks/condition.html">Condition</a></td>
     <td><p>Sets a property if a certain condition holds true; this is a
-     generalization of <a href="CoreTasks/available.html">Available</a> and
-     <a href="CoreTasks/uptodate.html">Uptodate</a>.</p></td>
+     generalization of <a href="Tasks/available.html">Available</a> and
+     <a href="Tasks/uptodate.html">Uptodate</a>.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/dirname.html">Dirname</a></td>
+    <td nowrap><a href="Tasks/dirname.html">Dirname</a></td>
     <td><p>Sets a property to the value of the specified file up to,
      but not including, the last path element.
   <tr valign="top">
     <td nowrap>
-    <a href="OptionalTasks/echoproperties.html">Echoproperties</a><br>
+    <a href="Tasks/echoproperties.html">Echoproperties</a><br>
     <td><p>Lists the current properties.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/loadfile.html">LoadFile</a></td>
+    <td nowrap><a href="Tasks/loadfile.html">LoadFile</a></td>
     <td><p>Loads a file into a property.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/loadproperties.html">LoadProperties</a></td>
+    <td nowrap><a href="Tasks/loadproperties.html">LoadProperties</a></td>
     <td><p>Load a file's contents as Ant properties. This task is
      equivalent to using <code>&lt;property file=&quot;...&quot;/&gt;</code>
      except that it supports nested <code>&lt;filterchain&gt;</code> elements,
@@ -980,12 +980,12 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/makeurl.html">MakeURL</a></td>
+    <td nowrap><a href="Tasks/makeurl.html">MakeURL</a></td>
     <td><p>Creates a URL (list) from a file/fileset or path</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/pathconvert.html">PathConvert</a></td>
+    <td nowrap><a href="Tasks/pathconvert.html">PathConvert</a></td>
     <td><p>Converts a nested path, path reference, filelist reference, or
      fileset reference to the form usable on a specified platform and/or
      to a list of items separated by the specified separator and stores
@@ -993,13 +993,13 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/property.html">Property</a></td>
+    <td nowrap><a href="Tasks/property.html">Property</a></td>
     <td><p>Sets a property (by name and value), or set of properties
      (from a file or resource) in the project.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/propertyfile.html">
+    <td nowrap><a href="Tasks/propertyfile.html">
     <td><p>Creates or modifies property files. Useful when wanting to make
      unattended modifications to configuration files for application
@@ -1009,18 +1009,18 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/uptodate.html">Uptodate</a></td>
+    <td nowrap><a href="Tasks/uptodate.html">Uptodate</a></td>
     <td><p>Sets a property if a given target file is newer than a set of
      source files.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/whichresource.html">Whichresource</a></td>
+    <td nowrap><a href="Tasks/whichresource.html">Whichresource</a></td>
     <td><p>Find a class or resource.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/xmlproperty.html">XmlProperty</a></td>
+    <td nowrap><a href="Tasks/xmlproperty.html">XmlProperty</a></td>
     <td><p>Loads property values from a well-formed XML file.</p></td>
@@ -1042,34 +1042,34 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/ftp.html">FTP</a></td>
+    <td nowrap><a href="Tasks/ftp.html">FTP</a></td>
     <td><p>Implements a basic FTP client that can send, receive,
      list, and delete files, and create directories.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/rexec.html">Rexec</a></td>
+    <td nowrap><a href="Tasks/rexec.html">Rexec</a></td>
     <td><p>Task to automate a remote rexec session.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/scp.html">Scp</a></td>
+    <td nowrap><a href="Tasks/scp.html">Scp</a></td>
     <td><p>Copy files to or from a remote server using SSH.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/setproxy.html">setproxy</a></td>
+    <td nowrap><a href="Tasks/setproxy.html">setproxy</a></td>
     <td><p>Sets Java's web proxy properties, so that tasks and code run
  in the same JVM can have through-the-firewall access to remote web sites.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/sshexec.html">Sshexec</a></td>
+    <td nowrap><a href="Tasks/sshexec.html">Sshexec</a></td>
     <td><p>Execute a command on a remote server using SSH.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/telnet.html">Telnet</a></td>
+    <td nowrap><a href="Tasks/telnet.html">Telnet</a></td>
     <td><p>Task to automate a remote <i>telnet</i> session. This task uses
      nested <code>&lt;read&gt;</code> and <code>&lt;write&gt;</code> tags
      to indicate strings to wait for and specify text to send.</p></td>
@@ -1094,47 +1094,47 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/cvs.html">Cvs</a></td>
+    <td nowrap><a href="Tasks/cvs.html">Cvs</a></td>
     <td><p>Handles packages/modules retrieved from a
      <a href="" target="_top">CVS</a>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/changelog.html">CvsChangeLog</a></td>
+    <td nowrap><a href="Tasks/changelog.html">CvsChangeLog</a></td>
     <td><p>Generates an XML report of the changes recorded in a
      <a href="" target="_top">CVS</a>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/cvspass.html">CVSPass</a></td>
+    <td nowrap><a href="Tasks/cvspass.html">CVSPass</a></td>
     <td><p>Adds entries to a .cvspass file. Adding entries to this file
      has the same affect as a <i>cvs login</i> command.</p></td>
   <tr valign="top">
-    <td nowrap><a href="CoreTasks/cvstagdiff.html">CvsTagDiff</a></td>
+    <td nowrap><a href="Tasks/cvstagdiff.html">CvsTagDiff</a></td>
     <td><p>Generates an XML-formatted report file of the changes between
     two tags or dates recorded in a <a href=""
     target="_top">CVS</a> repository.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/clearcase.html">ClearCase</a></td>
+    <td nowrap><a href="Tasks/clearcase.html">ClearCase</a></td>
     <td><p>Tasks to perform the ClearCase cleartool <i>checkin</i>, <i>checkout</i>,
      <i>uncheckout</i>, <i>update</i>, <i>lock</i>, <i>unlock</i>, <i>mklbtype</i>, <i>rmtype</i>, <i>mklabel</i>, <i>mkattr</i>, <i>mkdir</i>, <i>mkelem</i>, and <i>mkbl</i> commands.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/ccm.html">Continuus/Synergy</a></td>
+    <td nowrap><a href="Tasks/ccm.html">Continuus/Synergy</a></td>
     <td><p>Tasks to perform the Continuus <i>ccmcheckin</i>,
      <i>ccmcheckout</i>, <i>ccmcheckintask</i>, <i>ccmreconfigure</i>, and
      <i>ccmcreateTask</i> commands.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/vss.html">
+    <td nowrap><a href="Tasks/vss.html">
      Microsoft Visual SourceSafe</a></td>
     <td><p>Tasks to perform the Visual SourceSafe <i>vssget</i>,
      <i>vsslabel</i>, <i>vsshistory</i>, <i>vsscheckin</i>,
@@ -1143,7 +1143,7 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/perforce.html">Perforce</a></td>
+    <td nowrap><a href="Tasks/perforce.html">Perforce</a></td>
     <td><p>Tasks to perform the Perforce <i>p4sync</i>, <i>p4change</i>,
      <i>p4edit</i>, <i>p4submit</i>, <i>p4have</i>, <i>p4label</i>,
      <i>p4counter</i>, <i>p4reopen</i>, <i>p4revert</i>, and <i>p4add</i>
@@ -1151,26 +1151,17 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/pvcstask.html">Pvcs</a></td>
+    <td nowrap><a href="Tasks/pvcstask.html">Pvcs</a></td>
     <td><p>Allows the user extract the latest edition of the source code
      from a PVCS repository.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/sos.html">SourceOffSite</a></td>
+    <td nowrap><a href="Tasks/sos.html">SourceOffSite</a></td>
     <td><p>Tasks to perform the SourceOffSite <i>sosget</i>, <i>soslabel</i>,
      <i>soscheckin</i>, and <i>soscheckout</i> commands.</p></td>
-  <tr valign="top">
-    <td nowrap><a href="OptionalTasks/starteam.html">StarTeam</a></td>
-    <td><p>Tasks to perform the StarTeam <i>stcheckout</i>, <i>stcheckin</i>,
-     <i>stlabel</i>, and <i>stlist</i> commands. The
-     <a href="OptionalTasks/starteam.html#starteam">Starteam</a> task
-     is deprecated; use
-     <a href="OptionalTasks/starteam.html#stcheckout">STCheckout</a>
-     instead.</p></td>
-  </tr>
@@ -1190,16 +1181,16 @@ documentation.</p>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/junit.html">Junit</a></td>
+    <td nowrap><a href="Tasks/junit.html">Junit</a></td>
     <td><p>Runs tests from the <a href="">Junit</a>
      testing framework. This task has been tested with JUnit 3.0 up to
      JUnit 3.7; it won't work with versions prior to JUnit 3.0.</p></td>
   <tr valign="top">
-    <td nowrap><a href="OptionalTasks/junitreport.html">JunitReport</a></td>
+    <td nowrap><a href="Tasks/junitreport.html">JunitReport</a></td>
     <td><p>Merges the individual XML files generated by the
-     <a href="OptionalTasks/junit.html">Junit</a> task and applies a
+     <a href="Tasks/junit.html">Junit</a> task and applies a
      stylesheet on the resulting merged document to provide a browsable
      report of the testcases results.</p></td>

Modified: ant/core/branches/ANT_SITE/docs/manual/toc.html
--- ant/core/branches/ANT_SITE/docs/manual/toc.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/toc.html Mon Dec 13 18:34:00 2010
@@ -28,9 +28,9 @@
 <h2>Table of Contents</h2>
 <ul class="inlinelist">
 <li><a href="intro.html">Introduction</a></li>
-<li><a href="installlist.html" target="navFrame">Installing Ant</a></li>
-<li><a href="usinglist.html" target="navFrame">Using Ant</a></li>
-<li><a href="runninglist.html" target="navFrame">Running Ant</a></li>
+<li><a href="installlist.html" target="navFrame">Installing Apache Ant</a></li>
+<li><a href="usinglist.html" target="navFrame">Using Apache Ant</a></li>
+<li><a href="runninglist.html" target="navFrame">Running Apache Ant</a></li>
 <li><a href="anttaskslist.html" target="navFrame">Ant Tasks</a></li>
 <li><a href="conceptstypeslist.html" target="navFrame">Concepts and Types</a></li>
 <li><a href="listeners.html" target="mainFrame">Loggers &amp; Listeners</a></li>

Modified: ant/core/branches/ANT_SITE/docs/manual/tutorial-HelloWorldWithAnt.html
--- ant/core/branches/ANT_SITE/docs/manual/tutorial-HelloWorldWithAnt.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/tutorial-HelloWorldWithAnt.html Mon Dec 13 18:34:00 2010
@@ -16,13 +16,13 @@
-  <title>Tutorial: Hello World with Ant</title>
+  <title>Tutorial: Hello World with Apache Ant</title>
   <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<h1>Tutorial: Hello World with Ant</h1>
+<h1>Tutorial: Hello World with Apache Ant</h1>
-<p>This document provides a step by step tutorial for starting java programming with Ant.
+<p>This document provides a step by step tutorial for starting java programming with Apache Ant.
 It does <b>not</b> contain deeper knowledge about Java or Ant. This tutorial has the goal
 to let you see, how to do the easiest steps in Ant.</p>
@@ -408,7 +408,7 @@ public class HelloWorldTest extends juni
 <p>Because we dont have real business logic to test, this test class is very small: just show how to start. For 
-further information see the JUnit documentation [3] and the manual of <a href="OptionalTasks/junit.html">junit</a> task.
+further information see the JUnit documentation [3] and the manual of <a href="Tasks/junit.html">junit</a> task.
 Now we add a junit instruction to our buildfile:</p>
 <pre class="code">

Modified: ant/core/branches/ANT_SITE/docs/manual/tutorial-tasks-filesets-properties.html
--- ant/core/branches/ANT_SITE/docs/manual/tutorial-tasks-filesets-properties.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/tutorial-tasks-filesets-properties.html Mon Dec 13 18:34:00 2010
@@ -24,7 +24,7 @@
 <p>After reading the tutorial about <a href="tutorial-writing-tasks.html">writing
 tasks [1]</a> this tutorial explains how to get and set properties and how to use
-nested filesets and paths. Finally it explains how to contribute tasks to Ant.</p>
+nested filesets and paths. Finally it explains how to contribute tasks to Apache Ant.</p>
@@ -551,7 +551,7 @@ form you do that depends on your favouri
 it has advantages if you use that: all task users know that form, this form is requested if
 you decide to contribute your task. So we will doc our task in that form.</p>
-<p>If you have a look at the manual page of the <a href="CoreTasks/java.html">Java task [5]</a>
+<p>If you have a look at the manual page of the <a href="Tasks/java.html">Java task [5]</a>
    you will see that it:<ul>
 <li>is plain html</li>
 <li>starts with the name</li>
@@ -715,8 +715,7 @@ information on that.</p>
 <li>Patch files generated using cvs diff -u <b><i>to do</i></b></li>
 <li>patch files include a patch to to register the
 tasks <b><i>to do</i></b></li>
-<li>patch files include a patch to coretasklist.html or
-optionaltasklist.html to link to the new task page <b><i>to do</i></b></li>
+<li>patch files include a patch to tasklist.html to link to the new task page <b><i>to do</i></b></li>
 <li>Message to dev contains [SUBMIT] and task name in subject <b><i>to do</i></b></li>
 <li>Message body contains a rationale for the task <b><i>to do</i></b></li>
 <li>Message attachments contain the required files -source, documentation,
@@ -783,9 +782,9 @@ necessary and saves a lot of work if you
 <li>delete the dependency to "use.init" in the find.xml </li>
 <li>in change the line <tt>configureProject("build.xml");</tt> to
     <tt>configureProject("src/etc/testcases/taskdefs/find.xml");</tt> </li>
-<li>move the find.html to ANTHOME/docs/manual/CoreTasks/find.html </li>
-<li>add a <tt>&lt;a href="CoreTasks/find.html"&gt;Find&lt;/a&gt;&lt;br&gt;</tt>
-    in the ANTHOME/docs/manual/coretasklist.html </li>
+<li>move the find.html to ANTHOME/docs/manual/Tasks/find.html </li>
+<li>add a <tt>&lt;a href="Tasks/find.html"&gt;Find&lt;/a&gt;&lt;br&gt;</tt>
+    in the ANTHOME/docs/manual/tasklist.html </li>
 Now our modifications are done and we will retest it:
@@ -837,7 +836,7 @@ is the same as directly after the cvs up
 <h3>Test on JDK 1.2</h3>
 <p>Until version 1.5 Ant must be able to run on a JDK 1.1. With version 1.6 this is not a
 requisite any more. But JDK 1.2 is a must-to-work-with. So we have to test that. You can download older
-JDKs from <a href="">Sun [8]</a>.</p>
+JDKs from <a href="">Oracle [8]</a>.</p>
 <p>Clean the ANT_HOME variable, delete the <i>build, bootstrap</i> and <i>dist</i> directory
 and point JAVA_HOME to the JDK 1.2 home directory. Then do the <tt>build</tt>, set ANT_HOME
@@ -850,7 +849,7 @@ and run <tt>ant test</tt> (like above).<
 <p>There are many things we have to ensure. Indentation with 4 spaces, blanks here and there, ...
 (all described in the <a href="../ant_task_guidelines.html">Ant Task Guidelines [6]</a> which
-includes the <a href="">Sun code style
+includes the <a href="">Sun code style
 [9]</a>). Because there are so many things we would be happy to have a tool for do the checks.
 There is one: checkstyle. Checkstyle is available at <a href="">
 Sourceforge [10]</a> and Ant provides with the <tt>check.xml</tt> a buildfile which will do the job
@@ -954,11 +953,11 @@ Now the new task is uploaded into the bu
 &nbsp;&nbsp;[2] <a href=""></a><br>
 &nbsp;&nbsp;[3] <a href="properties.html#built-in-props">properties.html#built-in-props</a><br>
 &nbsp;&nbsp;[4] <a href=""></a><br>
-&nbsp;&nbsp;[5] <a href="CoreTasks/java.html">CoreTasks/java.html</a><br>
+&nbsp;&nbsp;[5] <a href="Tasks/java.html">Tasks/java.html</a><br>
 &nbsp;&nbsp;[6] <a href=""></a><br>
 &nbsp;&nbsp;[7] <a href=""></a><br>
-&nbsp;&nbsp;[8] <a href=""></a><br>
-&nbsp;&nbsp;[9] <a href=""></a><br>
+&nbsp;&nbsp;[8] <a href=""></a><br>
+&nbsp;&nbsp;[9] <a href=""></a><br>
 &nbsp;&nbsp;[10] <a href=""></a><br>
 &nbsp;&nbsp;[11] <a href=""></a><br>
 &nbsp;&nbsp;[12] <a href=""></a><br>

Modified: ant/core/branches/ANT_SITE/docs/manual/tutorial-writing-tasks.html
--- ant/core/branches/ANT_SITE/docs/manual/tutorial-writing-tasks.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/tutorial-writing-tasks.html Mon Dec 13 18:34:00 2010
@@ -18,6 +18,7 @@
   <title>Tutorial: Writing Tasks</title>
   <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
+  </link>
 <h1>Tutorial: Writing Tasks</h1>
@@ -25,28 +26,30 @@
 <p>This document provides a step by step tutorial for writing
 <li><a href="#buildenvironment">Set up the build environment</a></li>
 <li><a href="#write1">Write the Task</a></li>
 <li><a href="#use1">Use the Task</a></li>
 <li><a href="#TaskAdapter">Integration with TaskAdapter</a></li>
-<li><a href="#derivingFromTask">Deriving from Ant's Task</a></li>
+<li><a href="#derivingFromTask">Deriving from Apache Ant's Task</a></li>
+<li><a href="#accessTaskProject">Accessing the Task's Project</a></li>
 <li><a href="#attributes">Attributes</a></li>
 <li><a href="#NestedText">Nested Text</a></li>
 <li><a href="#NestedElements">Nested Elements</a></li>
 <li><a href="#complex">Our task in a little more complex version</a></li>
 <li><a href="#TestingTasks">Test the Task</a></li>
+<li><a href="#Debugging">Debugging</a></li>
 <li><a href="#resources">Resources</a></li>
 <a name="buildenvironment"></a>
 <h2>Set up the build environment</h2>
-<p>Ant builds itself, we are using Ant too (why we would write
-a task if not? :-) therefore we should use Ant for our build.<p>
+<p>Apache Ant builds itself, we are using Ant too (why we would write
+a task if not? :-) therefore we should use Ant for our build.</p>
 <p>We choose a directory as root directory. All things will be done
 here if I say nothing different. I will reference this directory
 as <i>root-directory</i> of our project. In this root-directory we
-create a text file names <i>build.xml</i>. What should Ant do for us?
+create a text file names <i>build.xml</i>. What should Ant do for us?</p>
 <li>compiles my stuff</li>
 <li>make the jar, so that I can deploy it</li>
@@ -127,8 +130,8 @@ its <i>depends</i>-clause the "compile" 
 <h2>Use the Task</h2>
 <p>But after creating the jar we want to use our new Task. Therefore we need a
 new target "use". Before we can use our new task we have to declare it with
-<a href="" target="_blank">
-<code>&lt;taskdef&gt;</code> [2]</a>. And for easier process we change the default clause:
+<a href="" target="_blank">
+<code>&lt;taskdef&gt;</code> [2]</a>. And for easier process we change the default clause:</p>
 <pre class="code">
 &lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
 &lt;project name="MyTask" basedir="." default="<b>use</b>"&gt;
@@ -143,10 +146,10 @@ new target "use". Before we can use our 
-Important is the <i>classpath</i>-attribute. Ant searches in its /lib directory for
+<p>Important is the <i>classpath</i>-attribute. Ant searches in its /lib directory for
 tasks and our task isn't there. So we have to provide the right location. </p>
-<p>Now we can type in <tt>ant</tt> and all should work ...
+<p>Now we can type in <tt>ant</tt> and all should work ...</p>
 <pre class="output">
 Buildfile: build.xml
@@ -176,7 +179,7 @@ setting a reference to the project and c
 <p><i>Setting a reference to the project</i>? Could be interesting. The Project class
 gives us some nice abilities: access to Ant's logging facilities getting and setting
-properties and much more. So we try to use that class:
+properties and much more. So we try to use that class:</p>
 <pre class="code">
@@ -198,7 +201,7 @@ and the execution with <tt>ant</tt> will
 <pre class="output">
 Here is project 'MyTask'.
 <a name="derivingFromTask"></a>
@@ -208,7 +211,7 @@ That class is integrated in Ant, get's t
 fiels, provides easier access to the logging facility and (very useful) gives you
 the exact location where <i>in the buildfile</i> this task instance is used.</p>
-<p>Oki-doki - let's us use some of these:
+<p>Oki-doki - let's us use some of these:</p>
 <pre class="code">
@@ -225,15 +228,27 @@ public class HelloWorld extends Task {
-which gives us when running
+<p>which gives us when running</p>
 <pre class="output">
 [helloworld] Here is project 'MyTask'.
 [helloworld] I am used in: C:\tmp\anttests\MyFirstTask\build.xml:23:
+<a name="accessTaskProject"></a>
+<h2>Accessing the Task's Project</h2>
+<p>The parent project of your custom task may be accessed through method <code>getProject()</code>.  However, do not call this from the custom task constructor, as the return value will be null.  Later, when node attributes or text are set, or method <code>execute()</code> is called, the Project object is available.</p>
+<p>Here are two useful methods from class Project:</p>
+  <li><code>String getProperty(String propertyName)</code></li>
+  <li>
+    <code>String replaceProperties(String value)</code>
+  </li>
+<p>The method <code>replaceProperties()</code> is discussed further in section <a href="#NestedText">Nested Text</a>.</p>
-<a name="attributes">
+<a name="attributes"></a>
 <p>Now we want to specify the text of our message (it seems that we are
 rewriting the <code>&lt;echo/&gt;</code> task :-). First we well do that with an attribute.
@@ -265,7 +280,7 @@ string provided there is written as buil
 the log() method can't handle a <i>null</i> value as parameter and throws a NullPointerException.
 (Of course you can initialize the <i>message</i> with a default string.)</p>
-<p>After that we have to modify our buildfile:
+<p>After that we have to modify our buildfile:</p>
 <pre class="code">
     &lt;target name="use" description="Use the Task" depends="jar"&gt;
         &lt;taskdef name="helloworld"
@@ -274,17 +289,17 @@ the log() method can't handle a <i>null<
         &lt;helloworld <b>message="Hello World"</b>/&gt;
-That's all.</p>
+<p>That's all.</p>
 <p>Some background for working with attributes: Ant supports any of these datatypes as
-arguments of the set-method:<ul>
+arguments of the set-method:</p><ul>
 <li>elementary data type like <i>int</i>, <i>long</i>, ...</li>
 <li>its wrapper classes like <i>java.lang.Integer</i>, <i>java.lang.Long</i>, ...</li>
 <li>some more classes (e.g. <i></i>; see
     <a href="develop.html#set-magic">Manual
     'Writing Your Own Task' [3]</a>)</li>
-<li>Any Java Object parsed from Ant 1.8's <a href="CoreTasks/propertyhelper.html">Property
+<li>Any Java Object parsed from Ant 1.8's <a href="Tasks/propertyhelper.html">Property
 Before calling the set-method all properties are resolved. So a <tt>&lt;helloworld message="${msg}"/&gt;</tt>
@@ -294,10 +309,11 @@ would not set the message string to "${m
 <a name="NestedText"></a>
 <h2>Nested Text</h2>
 <p>Maybe you have used the <code>&lt;echo&gt;</code> task in a way like <tt>&lt;echo&gt;Hello World&lt;/echo&gt;</tt>.
-For that you have to provide a <tt>public void addText(String text)</tt> method.
+For that you have to provide a <tt>public void addText(String text)</tt> method.</p>
 <pre class="code">
 public class HelloWorld extends Task {
+    private String message;
     public void addText(String text) {
         message = text;
@@ -305,16 +321,22 @@ public class HelloWorld extends Task {
-But here properties are <b>not</b> resolved! For resolving properties we have to use
+<p>But here properties are <b>not</b> resolved! For resolving properties we have to use
 Project's <tt>replaceProperties(String propname) : String</tt> method which takes the
 property name as argument and returns its value (or ${propname} if not set).</p>
+<p>Thus, to replace properties in the nested node text, our method <code>addText()</code> can be written as:</p>
+<pre class="code">
+    public void addText(String text) {
+        message = getProject().replaceProperties(text);
+    }
 <a name="NestedElements"></a>
 <h2>Nested Elements</h2>
 <p>There are several ways for inserting the ability of handling nested elements. See
 the <a href="">Manual [4]</a> for other.
-We use the first way of the three described ways. There are several steps for that:<ol>
+We use the first way of the three described ways. There are several steps for that:</p><ol>
 <li>We create a class for collecting all the info the nested element should contain.
   This class is created by the same rules for attributes and nested elements
   as for the task (<code>set&lt;attributename&gt;</code>() methods). </li>
@@ -322,7 +344,7 @@ We use the first way of the three descri
 <li>A factory method instantiates an object, saves the reference in the list
   and returns it to Ant Core.</li>
 <li>The execute() method iterates over the list and evaluates its values.</li>
 <pre class="code">
 import java.util.Vector;
 import java.util.Iterator;
@@ -356,7 +378,7 @@ import java.util.Iterator;
 <p>Then we can use the new nested element. But where is xml-name for that defined?
 The mapping XML-name : classname is defined in the factory method:
 <tt>public <i>classname</i> create<i>XML-name</i>()</tt>. Therefore we write in
-the buildfile
+the buildfile</p>
 <pre class="code">
             &lt;message msg="Nested Element 1"/&gt;
@@ -364,11 +386,11 @@ the buildfile
 <p>Note that if you choose to use methods 2 or 3, the class that represents the nested
-element must be declared as <pre>static</pre></p>
+element must be declared as <code>static</code></p>
 <a name="complex"></a>
 <h2>Our task in a little more complex version</h2>
-<p>For recapitulation now a little refactored buildfile:
+<p>For recapitulation now a little refactored buildfile:</p>
 <pre class="code">
 &lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
 &lt;project name="MyTask" basedir="." default="use"&gt;
@@ -593,7 +615,7 @@ target "test-jar" or you can download a [5]</a>.</p>
 <p>For executing the test and creating a report we need the optional tasks <code>&lt;junit&gt;</code>
-and <code>&lt;junitreport&gt;</code>. So we add to the buildfile:
+and <code>&lt;junitreport&gt;</code>. So we add to the buildfile:</p>
 <pre class="code">
 <font color="#9F9F9F">&lt;project name="MyTask" basedir="." </font>default="test"<font color="#9F9F9F">&gt;</font>
@@ -653,12 +675,12 @@ and <code>&lt;junitreport&gt;</code>. So
             description="Runs unit tests and creates a report"
 <p>Back to the <i>src/</i>. We create a class extending
 <i>BuildFileTest</i> with String-constructor (JUnit-standard), a <i>setUp()</i>
 method initializing Ant and for each testcase (targets use.*) a <i>testXX()</i>
-method invoking that target.
+method invoking that target.</p>
 <pre class="code">
@@ -700,10 +722,10 @@ public class HelloWorldTest extends Buil
         assertLogContaining("Nested Element 2");
 <p>When starting <tt>ant</tt> we'll get a short message to STDOUT and
-a nice HTML-report.
+a nice HTML-report.</p>
 <pre class="output">
 Buildfile: build.xml
@@ -732,15 +754,30 @@ test:
 Total time: 7 seconds
+<a name="Debugging"></a>
+<p>Try running Ant with the flag <code>-verbose</code>.  For more information, try flag <code>-debug</code>.</p>
+<p>For deeper issues, you may need to run the custom task code in a Java debugger.  First, get the source for Ant and build it with debugging information.</p>
+<p>Since Ant is a large project, it can be a little tricky to set the right breakpoints.  Here are two important breakpoints for version 1.8:</p>
+  <li>Initial <code>main()</code> function: <code></code></li>
+  <li>Task entry point: <code></code></li>
+<p>If you need to debug when a task attribute or the text is set, begin by debugging into method <code>execute()</code> of your custom task.  Then set breakpoints in other methods.  This will ensure the class byte-code has been loaded by the Java VM.</p>
 <a name="resources"></a>
 <p>This tutorial and its resources are available via
 <a href="">BugZilla [6]</a>.
-The ZIP provided there contains<ul>
-<li>this tutorial</li>
+The ZIP provided there contains</p><ul>
+<li>this initial version of this tutorial</li>
 <li>the buildfile (last version)</li>
 <li>the source of the task (last version)</li>
 <li>the source of the unit test (last version)</li>
@@ -749,21 +786,19 @@ The ZIP provided there contains<ul>
 <li>generated jar</li>
 <li>generated reports</li>
-The last sources and the buildfile are also available
+<p>The last sources and the buildfile are also available
 <a href="">here [7]</a> inside the manual.
-Used Links:<br>
-&nbsp;&nbsp;[1] <a href=""></a><br>
-&nbsp;&nbsp;[2] <a href=""></a><br>
-&nbsp;&nbsp;[3] <a href=""></a><br>
-&nbsp;&nbsp;[4] <a href=""></a><br>
-&nbsp;&nbsp;[5] <a href=""></a><br>
-&nbsp;&nbsp;[6] <a href=""></a><br>
-&nbsp;&nbsp;[7] <a href=""></a><br>
+<p>Used Links:<br></br>
+&nbsp;&nbsp;[1] <a href=""></a><br></br>
+&nbsp;&nbsp;[2] <a href=""></a><br></br>
+&nbsp;&nbsp;[3] <a href=""></a><br></br>
+&nbsp;&nbsp;[4] <a href=""></a><br></br>
+&nbsp;&nbsp;[5] <a href=""></a><br></br>
+&nbsp;&nbsp;[6] <a href=""></a><br></br>
+&nbsp;&nbsp;[7] <a href=""></a><br></br>

Modified: ant/core/branches/ANT_SITE/docs/manual/tutorials.html
--- ant/core/branches/ANT_SITE/docs/manual/tutorials.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/tutorials.html Mon Dec 13 18:34:00 2010
@@ -29,7 +29,7 @@
-<p><a href="tutorial-HelloWorldWithAnt.html">Hello World with Ant</a><br/>
+<p><a href="tutorial-HelloWorldWithAnt.html">Hello World with Apache Ant</a><br/>
 A step by step tutorial for starting java programming with Ant.</p>
 <p><a href="tutorial-writing-tasks.html">Writing Tasks</a><br/>

Modified: ant/core/branches/ANT_SITE/docs/manual/using.html
--- ant/core/branches/ANT_SITE/docs/manual/using.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/using.html Mon Dec 13 18:34:00 2010
@@ -23,9 +23,9 @@
-<h1>Using Ant</h1>
+<h1>Using Apache Ant</h1>
 <h2><a name="buildfile">Writing a Simple Buildfile</a></h2>
-<p>Ant's buildfiles are written in XML. Each buildfile contains one project
+<p>Apache Ant's buildfiles are written in XML. Each buildfile contains one project
 and at least one (default) target. Targets contain task elements.
 Each task element of the buildfile can have an <code>id</code> attribute and
 can later be referred to by the value supplied to this. The value has
@@ -67,7 +67,7 @@ to be unique. (For additional informatio
 <p>Optionally, a description for the project can be provided as a
 top-level <code>&lt;description&gt;</code> element (see the <a
-href="CoreTypes/description.html">description</a> type).</p>
+href="Types/description.html">description</a> type).</p>
 <p>Each project defines one or more <i>targets</i>.
 A target is a set of <i>tasks</i> you want
@@ -101,9 +101,7 @@ resolved before the task is executed.</p
 <p>where <i>name</i> is the name of the task,
 <i>attributeN</i> is the attribute name, and
 <i>valueN</i> is the value for this attribute.</p>
-<p>There is a set of <a href="coretasklist.html" target="navFrame">built-in tasks</a>, along with a
-number of
-<a href="optionaltasklist.html" target="navFrame"> optional tasks</a>, but it is also very
+<p>There is a set of <a href="tasklist.html" target="navFrame">built-in tasks</a>, but it is also very
 easy to <a href="develop.html#writingowntask">write your own</a>.</p>
 <p>All tasks share a task name attribute. The value of
 this attribute will be used in the logging messages generated by
@@ -146,7 +144,7 @@ task instances at all, only proxies.
   inside a build file.</p>
 <p>In its most simple form properties are defined in the build file
-  (for example by the <a href="CoreTasks/property.html">property</a>
+  (for example by the <a href="Tasks/property.html">property</a>
   task) or might be set outside Ant.  A property has a name and a
   value; the name is case-sensitive. Properties may be used in the
   value of task attributes or in the nested text of tasks that support
@@ -225,7 +223,7 @@ should be stored in a directory tree whi
 <p>A project can have a set of tokens that might be automatically expanded if
 found when a file is copied, when the filtering-copy behavior is selected in the
 tasks that support this. These might be set in the buildfile
-by the <a href="CoreTasks/filter.html">filter</a> task.</p>
+by the <a href="Tasks/filter.html">filter</a> task.</p>
 <p>Since this can potentially be a very harmful behavior,
 the tokens in the files <b>must</b>
 be of the form <code>@</code><i>token</i><code>@</code>, where
@@ -264,6 +262,12 @@ or semicolon-separated lists of location
 attribute is intended to be used with predefined paths - in any other
 case, multiple elements with <code>location</code> attributes should be
+<p><em>Since Ant 1.8.2</em> the location attribute can also contain a
+  wildcard in its last path component (i.e. it can end in a
+  &quot;*&quot;) in order to support wildcard CLASSPATHs introduced
+  with Java6.  Ant will not expand or evaluate the wildcards and the
+  resulting path may not work as anything else but a CLASSPATH - or
+  even as a CLASSPATH for a Java VM prior to Java6.</p>
 <p>As a shortcut, the <code>&lt;classpath&gt;</code> tag
 supports <code>path</code> and
 <code>location</code> attributes of its own, so:</p>
@@ -277,14 +281,14 @@ supports <code>path</code> and
     &lt;classpath path=&quot;${classpath}&quot;/&gt;
 <p>In addition, one or more
-<a href="CoreTypes/resources.html#collection">Resource Collection</a>s
+<a href="Types/resources.html#collection">Resource Collection</a>s
 can be specified as nested elements (these must consist of
-<a href="CoreTypes/resources.html#file">file</a>-type resources only).
+<a href="Types/resources.html#file">file</a>-type resources only).
 Additionally, it should be noted that although resource collections are
 processed in the order encountered, certain resource collection types
-such as <a href="CoreTypes/fileset.html">fileset</a>,
-<a href="CoreTypes/dirset.html">dirset</a> and
-<a href="CoreTypes/resources.html#files">files</a>
+such as <a href="Types/fileset.html">fileset</a>,
+<a href="Types/dirset.html">dirset</a> and
+<a href="Types/resources.html#files">files</a>
 are undefined in terms of order.</p>
@@ -502,15 +506,15 @@ replicate the same snippet of XML over a
 <p>All tasks that use nested elements for 
-<a href="CoreTypes/patternset.html">PatternSet</a>s, 
-<a href="CoreTypes/fileset.html">FileSet</a>s, 
-<a href="CoreTypes/zipfileset.html">ZipFileSet</a>s or 
+<a href="Types/patternset.html">PatternSet</a>s, 
+<a href="Types/fileset.html">FileSet</a>s, 
+<a href="Types/zipfileset.html">ZipFileSet</a>s or 
 <a href="#path">path-like structures</a> accept references to these structures 
 as shown in the examples. Using <code>refid</code> on a task will ordinarily 
 have the same effect (referencing a task already declared), but the user 
 should be aware that the interpretation of this attribute is dependent on the 
 implementation of the element upon which it is specified. Some tasks (the 
-<a href="CoreTasks/property.html">property</a> task is a handy example) 
+<a href="Tasks/property.html">property</a> task is a handy example) 
 deliberately assign a different meaning to <code>refid</code>.</p>
@@ -532,7 +536,7 @@ for adding libraries: 
 For the declaration there are several ways:
   <li>declare a single task per using instruction using  
-      <code>&lt;<a href="CoreTasks/taskdef.html">taskdef</a> name=&quot;taskname&quot; 
+      <code>&lt;<a href="Tasks/taskdef.html">taskdef</a> name=&quot;taskname&quot; 
       <code>&lt;taskdef name=&quot;for&quot; classname=&quot;net.sf.antcontrib.logic.For&quot; /&gt; 
@@ -544,14 +548,14 @@ For the declaration there are several wa
       <code>&lt;taskdef resource=&quot;net/sf/antcontrib/; /&gt; 
       &lt;for ... /&gt;</code>
-  <li>declare a bundle of tasks using a <a href="CoreTypes/antlib.html">xml-file</a> holding these  
+  <li>declare a bundle of tasks using a <a href="Types/antlib.html">xml-file</a> holding these  
       taskname-ImplementationClass-pairs and <code>&lt;taskdef&gt;</code>
       <code>&lt;taskdef resource=&quot;net/sf/antcontrib/antlib.xml&quot; /&gt; 
       &lt;for ... /&gt;</code>
   <li>declare a bundle of tasks using a xml-file named antlib.xml, XML-namespace and 
-      <a href="CoreTypes/antlib.html#antlibnamespace"><code>antlib:</code> protocoll handler</a> 
+      <a href="Types/antlib.html#antlibnamespace"><code>antlib:</code> protocoll handler</a> 
       <code>&lt;project xmlns:ac=&quot;antlib:net.sf.antconrib&quot;/&gt; 
       &lt;ac:for ... /&gt;</code>

Modified: ant/core/branches/ANT_SITE/docs/manual/usinglist.html
--- ant/core/branches/ANT_SITE/docs/manual/usinglist.html (original)
+++ ant/core/branches/ANT_SITE/docs/manual/usinglist.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>Using Ant</h3>
+<h3>Using Apache Ant</h3>
 <ul class="inlinelist">
 <li><a href="using.html#buildfile">Writing a Simple Buildfile</a></li>
 <div style="padding-left:1em">

Modified: ant/core/branches/ANT_SITE/docs/mission.html
--- ant/core/branches/ANT_SITE/docs/mission.html (original)
+++ ant/core/branches/ANT_SITE/docs/mission.html Mon Dec 13 18:34:00 2010
@@ -21,7 +21,7 @@
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - Apache Ant Mission</title>
+        <title>Apache Ant - Apache Ant&#x2122; Mission</title>
         <link type="text/css" href="./page.css" rel="stylesheet">
           <meta name="author" content="Apache Ant PMC">
   <meta name="email" content="">
@@ -99,7 +99,7 @@
                                     <a href="./index.html">Welcome</a>
-                                    <a href="./license.html">License</a>
+                                    <a href="">License</a>
                                     <a href="./antnews.html">News</a>
@@ -139,6 +139,9 @@
                                     <a href="">Source Distributions</a>
+                            <li>
+                                    <a href="">Ant Manual</a>
+                                </li>
               <li class="menuheader">Contributing
@@ -155,6 +158,9 @@
                                     <a href="./bugs.html">Bug Database</a>
+                            <li>
+                                    <a href="">Security</a>
+                                </li>
               <li class="menuheader">Sponsorship
@@ -165,9 +171,6 @@
                                     <a href="">Sponsorship</a>
-                            <li>
-                                    <a href="">Donations</a>
-                                </li>
               <li class="menuheader">Project Management
@@ -176,8 +179,8 @@
                                     <a href="./contributors.html">Contributors</a>
-                              <span class="sel">Apache Ant Mission</span>
-                              </li>
+                                    <a href="./mission.html">Apache Ant Mission</a>
+                                </li>
                                     <a href="./bylaws.html">Project Bylaws</a>
@@ -197,7 +200,7 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">Apache Ant Mission</h1>
+    <h1 class="title">Apache Ant&#x2122; Mission</h1>
             <h3 class="section">
       <a name="Board Resolution"></a>
       Board Resolution
@@ -272,6 +275,7 @@ hereby created.
         <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);
               //  -->

View raw message