Obliterating "core" vs. "optional" distinction for tasks and types in manual and associated doc files.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@948574 13f79535-47bb-0310-9956-ffa450edef68

docs/ant_in_anger.html

@@ -122,7 +122,7 @@ And of course, the ubiquitous <b>clean</b> target.
 
 With standard target names, it is easy to build encompassing Ant build
 files which just hand off the work to the classes below using the
-<a href="manual/CoreTasks/ant.html">ant</a>
+<a href="manual/Tasks/ant.html">ant</a>
 task. For example. the clean target could be handed down to the <tt>intf</tt> and
 <tt>impl</tt> subdirectories from a parent directory
 
@@ -147,9 +147,9 @@ entry points is therefore very useful, even before a project becomes big and com
 </h3>
 
 If Ant does not do what you want, you can use the
-<a href="manual/CoreTasks/exec.html">exec</a> and
-<a href="manual/CoreTasks/java.html">java</a> tasks or
-<a href="manual/OptionalTasks/script.html">inline scripting</a> to extend it. In a
+<a href="manual/Tasks/exec.html">exec</a> and
+<a href="manual/Tasks/java.html">java</a> tasks or
+<a href="manual/Tasks/script.html">inline scripting</a> to extend it. In a
 project with many <tt>build.xml</tt> files, you soon find that having a single
 central place for implementing the functionality keeps maintenance
 overhead down. Implementing task extensions through Java code seems
@@ -180,7 +180,7 @@ Embrace Automated Testing
 
 <b>(alternatively "recriminate early, recriminate often")</b>
 <p>
-Ant lets you call <a href="manual/OptionalTasks/junit.html">JUnit</a>
+Ant lets you call <a href="manual/Tasks/junit.html">JUnit</a>
 tasks, which unit test the code your team has written. Automated testing
 may seem like extra work at first, but JUnit makes writing unit tests so
 easy that you have almost no reason not to. Invest the time in learning
@@ -203,7 +203,7 @@ given the choice.
 <p>
 System tests are harder to automate than unit tests, but if you can
 write java code to stress large portions of the system - even if the code
-can not run as JUnit tasks - then the <a href= "manual/CoreTasks/java.html">java</a>
+can not run as JUnit tasks - then the <a href= "manual/Tasks/java.html">java</a>
 task can be used to invoke them. It is best to specify that you want a
 new JVM for these tests, so that a significant crash does not break the
 full build. The Junit extensions such as 
@@ -263,8 +263,8 @@ The common barriers to cross-platform Ant are the use of command line
 tools (exec tasks) which are not portable, path issues, and hard coding
 in the location of things.
 
-<h3>Command Line apps: <a href="manual/CoreTasks/exec.html">Exec</a> /
- <a href= "manual/CoreTasks/apply.html">Apply</a></h3>
+<h3>Command Line apps: <a href="manual/Tasks/exec.html">Exec</a> /
+ <a href= "manual/Tasks/apply.html">Apply</a></h3>
 
 The trouble with external invocation is that not all functions are found
 cross platform, and those that are often have different names - DOS
@@ -307,7 +307,7 @@ attributes), or by including a fileset of <tt>*.jar</tt> in the classpath
 definition.
 <p>
 There is also the <a
-href="manual/CoreTasks/pathconvert.html">PathConvert</a> task which
+href="manual/Tasks/pathconvert.html">PathConvert</a> task which
 can put a fully resolved path into a property. Why do that? Because then 
 you can use that path in other ways - such as pass it as a parameter to 
 some application you are calling, or use the replace task to patch it
@@ -326,14 +326,14 @@ find any <tt>.java</tt> files. The Java compiler is of course case sensitive - y
 not have a class 'ExampleThree' implemented in "examplethree.java".
 
 <p>
-Some tasks only work on one platform - <a href= "manual/CoreTasks/chmod.html">
+Some tasks only work on one platform - <a href= "manual/Tasks/chmod.html">
 Chmod</a> being a classic example. These tasks usually result in just a
 warning message on an unsupported platform - the rest of the target's
 tasks will still be called. Other tasks degrade their functionality on
 platforms or Java versions. In particular, any task which adjusts the
 timestamp of files can not do so properly on Java 1.1. Tasks which can
-do that - <a href="manual/CoreTasks/get.html">Get</a>, <a
-href="manual/CoreTasks/touch.html">Touch</a> and <A href="manual/CoreTasks/unzip.html">
+do that - <a href="manual/Tasks/get.html">Get</a>, <a
+href="manual/Tasks/touch.html">Touch</a> and <A href="manual/Tasks/unzip.html">
 Unjar/Unwar/Unzip</a> for example, degrade their functionality on
 Java1.1, usually resorting to the current timestamp instead.
 
@@ -348,7 +348,7 @@ on Windows, OS/2 and Unix and hence called from Ant without issues. The
 perl code can be left to resolve its own platform issues. Don't forget to
 set the line endings of the file to the appropriate platform when you
 redistribute Perl code; <a
-href="manual/CoreTasks/fixcrlf.html">fixCRLF</a> 
+href="manual/Tasks/fixcrlf.html">fixCRLF</a> 
 can do that for you.
 
 <a name="team">
@@ -381,36 +381,36 @@ processes for deploying Java to remote sites are reasonably well
 evolved in Ant. That is because we all have to do it these days, so
 many people have put in the effort to make the tasks easier.
 <p>
-Ant can <a href="manual/CoreTasks/jar.html">Jar</a>, <a href=
-"manual/CoreTasks/tar.html">Tar</a> or <a
-href="manual/CoreTasks/zip.html">Zip</a> files for deployment, while the
-<a href="manual/CoreTasks/war.html">War</a> task extends the jar task
+Ant can <a href="manual/Tasks/jar.html">Jar</a>, <a href=
+"manual/Tasks/tar.html">Tar</a> or <a
+href="manual/Tasks/zip.html">Zip</a> files for deployment, while the
+<a href="manual/Tasks/war.html">War</a> task extends the jar task
 for better servlet deployment. 
-<a href ="manual/OptionalTasks/jlink.html">Jlink</a> is a
+<a href ="manual/Tasks/jlink.html">Jlink</a> is a
 jar generation file which lets you merge multiple sub jars. This is
 ideal for a build process in which separate jars are generated by sub
 projects, yet the final output is a merged jar. <a href=
-"manual/OptionalTasks/cab.html">Cab</a> can be used on Win32 boxes to
+"manual/Tasks/cab.html">Cab</a> can be used on Win32 boxes to
 build a cab file which is useful if you still have to target IE deployment.
 
 <p>
 The <a href="index.html#ftp">ftp</a> task lets you move stuff up to a
 server. Beware of putting the ftp password in the build file - a property
 file with tight access control is slightly better. The <a href=
-"manual/CoreTasks/fixcrlf.html">FixCRLF</a> task is often a useful interim step if
+"manual/Tasks/fixcrlf.html">FixCRLF</a> task is often a useful interim step if
 you need to to adjust the line endings of files. A
 WebDav task has long been discussed, which would provide a more secure
 upload to web servers, but it is still in the todo list. Rumour has it
 that there is such a task in the jakarta-slide libraries. With MacOS X,
 Linux and Windows XP all supporting WebDAV file systems, you may even be able
-to use <a href="manual/CoreTasks/copy.html">copy</a> to deploy
+to use <a href="manual/Tasks/copy.html">copy</a> to deploy
 though a firewall. 
 
 <p>
-EJB deployment is aided by the <a href="manual/OptionalTasks/ejb.html">ejb</a> tasks,
+EJB deployment is aided by the <a href="manual/Tasks/ejb.html">ejb</a> tasks,
 while the 
 <a
-href="manual/OptionalTasks/serverdeploy.html">serverdeploy</a>
+href="manual/Tasks/serverdeploy.html">serverdeploy</a>
 suite can deploy to multiple servers. The popularity of Ant has
 encouraged vendors to produce their own deployment tasks which they
 redistribute with their servers. For example, the Tomcat4.1 installation
@@ -418,9 +418,9 @@ includes tasks to deploy, undeploy and reload web applications.
 
 <p>
 Finally, there are of course the fallbacks of just copying files to a
-destination using <a href="manual/CoreTasks/copy.html">Copy</a> and <a href="index.html#copydir">Copydir</a> , or just sending them to a person or
-process using <a href="manual/CoreTasks/mail.html">Mail</a> or the attachment
-aware <a href= "manual/OptionalTasks/mimemail.html">MimeMail</a>.
+destination using <a href="manual/Tasks/copy.html">Copy</a> and <a href="index.html#copydir">Copydir</a> , or just sending them to a person or
+process using <a href="manual/Tasks/mail.html">Mail</a> or the attachment
+aware <a href= "manual/Tasks/mimemail.html">MimeMail</a>.
 In one project our team even used Ant to build CD images through a build followed
 by a long set of Copy tasks, which worked surprisingly well, certainly
 easier than when we mailed them to the free email service on
@@ -673,7 +673,7 @@ Tips and Tricks</h2>
     get
 </b><dd>
 
-The <a href="manual/CoreTasks/get.html">get</a> task can fetch any URL, so be used
+The <a href="manual/Tasks/get.html">get</a> task can fetch any URL, so be used
 to trigger remote server side code during the build process, from remote
 server restarts to sending SMS/pager messages to the developer
 cellphones.
@@ -683,7 +683,7 @@ i18n
 </b><dd>
 
 Internationalisation is always trouble. Ant helps here with the <a href=
-"manual/OptionalTasks/native2ascii.html">native2ascii</a> task which can escape out all non
+"manual/Tasks/native2ascii.html">native2ascii</a> task which can escape out all non
 ascii characters into unicode. You can use this to write java files
 which include strings (and indeed comments) in your own non-ASCII
 language and then use native2ascii to convert to ascii prior to feeding
@@ -758,7 +758,7 @@ XML entity expansion is handled during the parsing process.
 <p>
 The <tt>&lt;import&gt;</tt> task does powerful things, such as let you override targets,
 and use ant properties to name the location of the file to import. Consult the
-<a href="manual/CoreTasks/import.html">documentation</a> for the specifics of
+<a href="manual/Tasks/import.html">documentation</a> for the specifics of
 these features.  
 
 <p>
@@ -791,7 +791,7 @@ Implement complex Ant builds through XSL
 </b><dd>
 
 XSLT can be used to dynamically generate build.xml files from a source
-xml file, with the <a href="manual/CoreTasks/style.html">xslt</a> task controlling
+xml file, with the <a href="manual/Tasks/style.html">xslt</a> task controlling
 the transform. This is the current recommended strategy for creating
 complex build files dynamically. However, its use is still apparently
 quite rare - which means you will be on the bleeding edge of technology.

docs/ant_task_guidelines.html

@@ -496,8 +496,7 @@ subject.
 <li>Patch files generated using svn diff -u
 <li>patch files include a patch to defaults.properties to register the
 tasks
-<li>patch files include a patch to coretasklist.html or
-optionaltasklist.html to link to the new task page
+<li>patch files include a patch to tasklist.html to link to the new task page
 <li>Message to dev contains [SUBMIT] and task name in subject
 <li>Message body contains a rationale for the task
 <li>Message attachments contain the required files -source, documentation,

docs/manual/CoreTasks/ant.html → docs/manual/Tasks/ant.html

@@ -172,7 +172,7 @@ optionally changing their id.</p>
 
 <p>You can specify a set of properties to be copied into the new
 project with <a
-href="../CoreTypes/propertyset.html">propertyset</a>s.</p>
+href="../Types/propertyset.html">propertyset</a>s.</p>
 
 <p><em>since Ant 1.6</em>.</p>
 

docs/manual/CoreTasks/antcall.html → docs/manual/Tasks/antcall.html

@@ -148,7 +148,7 @@ optionally changing their id.</p>
 
 <p>You can specify a set of properties to be copied into the new
 project with <a
-href="../CoreTypes/propertyset.html">propertyset</a>s.</p>
+href="../Types/propertyset.html">propertyset</a>s.</p>
 
 <p><em>since Ant 1.6</em>.</p>
 

docs/manual/CoreTasks/antstructure.html → docs/manual/Tasks/antstructure.html

@@ -35,7 +35,7 @@ usage of XML cannot be captured with a DTD.  Several elements in Ant
 can have different attribute lists depending on the element that
 contains them.  &quot;fail&quot; for example can be <a
 href="fail.html">the task</a> or the nested child element of the <a
-href="../OptionalTasks/sound.html">sound</a> task.  Don't consider the
+href="../Tasks/sound.html">sound</a> task.  Don't consider the
 generated DTD something to rely upon.</p>
 
 <p>Also note that the DTD generated by this task is incomplete, you can

docs/manual/CoreTasks/apply.html → docs/manual/Tasks/apply.html

@@ -33,16 +33,16 @@ the command is only executed when Ant is run on one of the specified operating
 systems.</p>
 
 <p>The files and/or directories of a number of <a
-href="../CoreTypes/resources.html#collection">Resource Collection</a>s
+href="../Types/resources.html#collection">Resource Collection</a>s
 &ndash; including but not restricted to
- <a href="../CoreTypes/fileset.html">FileSet</a>s,
- <a href="../CoreTypes/dirset.html">DirSet</a>s
+ <a href="../Types/fileset.html">FileSet</a>s,
+ <a href="../Types/dirset.html">DirSet</a>s
  (<em>since&nbsp;Ant&nbsp;1.6</em>) or
- <a href="../CoreTypes/filelist.html">FileList</a>s
+ <a href="../Types/filelist.html">FileList</a>s
  (<em>since&nbsp;Ant&nbsp;1.6</em>)
 &ndash;
  are passed as arguments to the system command.</p>
-<p>If you specify a nested <a href="../CoreTypes/mapper.html">mapper</a>,
+<p>If you specify a nested <a href="../Types/mapper.html">mapper</a>,
 the timestamp of each source file is compared to the timestamp of a
 target file which is defined by the nested mapper element and searched
 for in the given <i>dest</i>, if specified.</p>
@@ -312,7 +312,7 @@ elements to define the files for this task and refer to
 elements to define the directories for this task and refer to
 <code>&lt;dirset&gt;</code>s defined elsewhere.</p>
 
-<h4>Any other <a href="../CoreTypes/resources.html#collection">Resource
+<h4>Any other <a href="../Types/resources.html#collection">Resource
 Collection</a></h4>
 <p><em>since Ant 1.7</em></p>
 <p>You can use any number of nested resource collections.</p>
@@ -383,7 +383,7 @@ system command via nested <code>&lt;env&gt;</code> elements. See the
 description in the section about <a href="exec.html#env">exec</a></p>
 <h4>redirector</h4>
 <i><b>Since&nbsp;Ant&nbsp;1.6.2</b></i>
-<p>A nested <a href="../CoreTypes/redirector.html">I/O Redirector</a>
+<p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
 can be specified.  &lt;apply&gt;'s behavior is like that of
 <a href="exec.html#redirector">exec</a> with regard to
 redirectors, with the exception that, in non-<i>parallel</i> mode,

docs/manual/OptionalTasks/attrib.html → docs/manual/Tasks/attrib.html

@@ -33,14 +33,14 @@ directories.  Right now it has effect only under Windows. Each of the
 4 possible permissions has its own attribute, matching the arguments
 for the attrib command.</p>
 
-<p><a href="../CoreTypes/fileset.html">FileSet</a>s, 
-<a href="../CoreTypes/dirset.html">DirSet</a>s or <a
-href="../CoreTypes/filelist.html">FileList</a>s can be specified using
+<p><a href="../Types/fileset.html">FileSet</a>s, 
+<a href="../Types/dirset.html">DirSet</a>s or <a
+href="../Types/filelist.html">FileList</a>s can be specified using
 nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and 
 <code>&lt;filelist&gt;</code> elements.</p>
 
 <p>Starting with Ant 1.7, this task supports arbitrary <a
-href="../CoreTypes/resources.html#collection">Resource Collection</a>s
+href="../Types/resources.html#collection">Resource Collection</a>s
 as nested elements.</p>
 
 <p>By default this task will use a single invocation of the underlying
@@ -126,7 +126,7 @@ directory tree), so you'll have to experiment a little.</p>
   <tr>
     <td valign="top">osfamily</td>
     <td valign="top">OS family as used in
-      the <a href="../CoreTasks/conditions.html#os">&lt;os&gt;</a>
+      the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
       condition.</td>
     <td align="center" valign="top">No - defaults to "windows"</td>
   </tr>

docs/manual/CoreTasks/buildnumber.html → docs/manual/Tasks/buildnumber.html

@@ -33,7 +33,7 @@ set the property <code>build.number</code> to the value that was read in
 (or to <code>0</code>, if no such value). It will then increment the
 number by one and write it back out to the file.
 (See the
-<a href="../OptionalTasks/propertyfile.html">PropertyFile</a> task
+<a href="../Tasks/propertyfile.html">PropertyFile</a> task
 if you need finer control over things such as the property name or
 the number format.)
 </p>

docs/manual/OptionalTasks/cab.html → docs/manual/Tasks/cab.html

@@ -27,7 +27,7 @@
 <h2><a name="cab">Cab</a></h2>
 <h3>Description</h3>
 <p>The cab task 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.
+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 cabarc tool (provided by Microsoft)
 which must be located in your executable path.</p>
 <p>To use this task on other platforms you need to download and compile libcabinet from
@@ -36,7 +36,7 @@ http://trill.cis.fordham.edu/~barbacha/cabinet_library/</a>.</p>
 <p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based
 tasks</a>, on how the inclusion/exclusion of files works, and how to
 write patterns.</p>
-<p>This task forms an implicit <a href="../CoreTypes/fileset.html">FileSet</a> and
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
 supports most attributes of <code>&lt;fileset&gt;</code>
 (<code>dir</code> becomes <code>basedir</code>) as well as the nested
 <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
@@ -112,7 +112,7 @@ supports most attributes of <code>&lt;fileset&gt;</code>
 <h4>fileset</h4>
 
 <p>The cab task supports one nested <a
-href="../CoreTypes/fileset.html"><code>&lt;fileset&gt;</code></a>
+href="../Types/fileset.html"><code>&lt;fileset&gt;</code></a>
 element to specify the files to be included in the archive.
   If this is specified, the "basedir" attribute cannot be used.
 </p>

docs/manual/CoreTasks/checksum.html → docs/manual/Tasks/checksum.html

@@ -189,7 +189,7 @@ or set the <tt>fileext</tt> attribute.
 
 <h4>resource collection</h4>
  <p>
- <a href="../CoreTypes/resources.html#collection">Resource collections</a> are
+ <a href="../Types/resources.html#collection">Resource collections</a> are
  used to select files for which checksums should be generated.
  </p>
 

docs/manual/OptionalTasks/chgrp.html → docs/manual/Tasks/chgrp.html

@@ -33,14 +33,14 @@ directories. Right now it has effect only under Unix.  The group
 attribute is equivalent to the corresponding argument for the chgrp
 command.</p>
 
-<p><a href="../CoreTypes/fileset.html">FileSet</a>s, 
-<a href="../CoreTypes/dirset.html">DirSet</a>s or <a
-href="../CoreTypes/filelist.html">FileList</a>s can be specified using
+<p><a href="../Types/fileset.html">FileSet</a>s, 
+<a href="../Types/dirset.html">DirSet</a>s or <a
+href="../Types/filelist.html">FileList</a>s can be specified using
 nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and 
 <code>&lt;filelist&gt;</code> elements.</p>
 
 <p>Starting with Ant 1.7, this task supports arbitrary <a
-href="../CoreTypes/resources.html#collection">Resource Collection</a>s
+href="../Types/resources.html#collection">Resource Collection</a>s
 as nested elements.</p>
 
 <p>By default this task will use a single invocation of the underlying
@@ -120,7 +120,7 @@ could use as initial value for these experiments.</p>
   <tr>
     <td valign="top">osfamily</td>
     <td valign="top">OS family as used in
-      the <a href="../CoreTasks/conditions.html#os">&lt;os&gt;</a>
+      the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
       condition.</td>
     <td align="center" valign="top">No - defaults to "unix"</td>
   </tr>

docs/manual/CoreTasks/chmod.html → docs/manual/Tasks/chmod.html

@@ -34,16 +34,16 @@ tasks</a>, on how the inclusion/exclusion of files works, and how to
 write patterns.</p>
 
 <p>This task holds an implicit <a
-href="../CoreTypes/fileset.html">FileSet</a> and supports all of
+href="../Types/fileset.html">FileSet</a> and supports all of
 FileSet's attributes and nested elements directly. More sets can be
 specified using nested <code>&lt;fileset&gt;</code> or
 <code>&lt;dirset&gt;</code> (<em>since Ant 1.6</em>) elements. </p>
 
 <p>Starting with Ant 1.6, this task also supports nested <a
-href="../CoreTypes/filelist.html">filelist</a>s.</p>
+href="../Types/filelist.html">filelist</a>s.</p>
 
 <p>Starting with Ant 1.7, this task supports arbitrary <a
-href="../CoreTypes/resources.html#collection">Resource Collection</a>s
+href="../Types/resources.html#collection">Resource Collection</a>s
 as nested elements.</p>
 
 <p>By default this task will use a single invocation of the underlying

docs/manual/OptionalTasks/chown.html → docs/manual/Tasks/chown.html

@@ -33,14 +33,14 @@ directories. Right now it has effect only under Unix.  The owner
 attribute is equivalent to the corresponding argument for the chown
 command.</p>
 
-<p><a href="../CoreTypes/fileset.html">FileSet</a>s, 
-<a href="../CoreTypes/dirset.html">DirSet</a>s or <a
-href="../CoreTypes/filelist.html">FileList</a>s can be specified using
+<p><a href="../Types/fileset.html">FileSet</a>s, 
+<a href="../Types/dirset.html">DirSet</a>s or <a
+href="../Types/filelist.html">FileList</a>s can be specified using
 nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and 
 <code>&lt;filelist&gt;</code> elements.</p>
 
 <p>Starting with Ant 1.7, this task supports arbitrary <a
-href="../CoreTypes/resources.html#collection">Resource Collection</a>s
+href="../Types/resources.html#collection">Resource Collection</a>s
 as nested elements.</p>
 
 <p>By default this task will use a single invocation of the underlying
@@ -119,7 +119,7 @@ could use as initial value for these experiments.</p>
   <tr>
     <td valign="top">osfamily</td>
     <td valign="top">OS family as used in
-      the <a href="../CoreTasks/conditions.html#os">&lt;os&gt;</a>
+      the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
       condition.</td>
     <td align="center" valign="top">No - defaults to "unix"</td>
   </tr>

docs/manual/CoreTasks/componentdef.html → docs/manual/Tasks/componentdef.html

@@ -55,7 +55,7 @@
   <p>
     defines two components with the same name "or"; one is a condition
     (see <a href="conditions.html">conditions</a>) and one is 
-    a selector (see <a href="../CoreTypes/selectors.html">selectors</a>).
+    a selector (see <a href="../Types/selectors.html">selectors</a>).
   </p>
 </body>
 </html>

docs/manual/CoreTasks/concat.html → docs/manual/Tasks/concat.html

@@ -30,20 +30,20 @@
 
       <p>
         Concatenates one or more 
-        <a href="../CoreTypes/resources.html">resource</a>s
+        <a href="../Types/resources.html">resource</a>s
         to a single file or to the console. The destination
         file will be created if it does not exist unless the resource
         list is empty and ignoreempty is true.
       </p>
 
       <p><strong>Since Ant 1.7.1</strong>, this task can be used as a
-        <a href="../CoreTypes/resources.html#collection">Resource Collection</a>
+        <a href="../Types/resources.html#collection">Resource Collection</a>
         that will return exactly one 
-        <a href="../CoreTypes/resources.html">resource</a>.
+        <a href="../Types/resources.html">resource</a>.
       </p>
 
       <p>
-        <a href="../CoreTypes/resources.html#collection">
+        <a href="../Types/resources.html#collection">
 Resource Collection</a>s are used to
         select which resources are to be concatenated. There is no
         singular attribute to specify a single resource to cat.
@@ -198,7 +198,7 @@ Resource Collection</a>s are used to
         <p><em>since Ant 1.7</em>.</p>
 
       <p>
-        Any of the various <a href="../CoreTypes/resources.html#collection">
+        Any of the various <a href="../Types/resources.html#collection">
         Resource Collection</a> types can specify the resources to be
         concatenated.
       </p>
@@ -206,7 +206,7 @@ Resource Collection</a>s are used to
       <h4>filterchain</h4>
         <p><em>since Ant 1.6</em>.</p>
       <p>The concat task supports nested
-        <a href="../CoreTypes/filterchain.html"> FilterChain</a>s.</p>
+        <a href="../Types/filterchain.html"> FilterChain</a>s.</p>
 
       <h4>header, footer</h4>
         <p><em>since Ant 1.6</em>.</p>

docs/manual/CoreTasks/conditions.html → docs/manual/Tasks/conditions.html

@@ -30,7 +30,7 @@
 <a href="waitfor.html"><code>&lt;waitfor&gt;</code></a> tasks.
     There are core conditions and custom conditions. Custom
     conditions are described in
-    <a href="../CoreTypes/custom-programming.html#customconditions">
+    <a href="../Types/custom-programming.html#customconditions">
       Custom Conditions</a>.
     Core Conditions are described below.
   </p>
@@ -412,7 +412,7 @@ that is "true","yes", or "on"</p>
   <h4>isfileselected</h4>
   <p>
     Test whether a file passes an embedded
-    <a href="../CoreTypes/selectors.html">selector</a>.
+    <a href="../Types/selectors.html">selector</a>.
   </p>
   <p>
     This condition was added in Apache Ant 1.6.3.
@@ -490,7 +490,7 @@ tasks, datatypes, scriptdefs, macrodefs and presetdefs.</p>
 supported language.
 </p>
 <p>
-See the <a href="../OptionalTasks/script.html">Script</a> task for
+See the <a href="../Tasks/script.html">Script</a> task for
 an explanation of scripts and dependencies.
 </p>
 
@@ -511,7 +511,7 @@ an explanation of scripts and dependencies.
     <td valign="top">manager</td>
     <td valign="top">
       The script engine manager to use.
-      See the <a href="../OptionalTasks/script.html">script</a> task
+      See the <a href="../Tasks/script.html">script</a> task
       for using this attribute.
     </td>
     <td valign="top" align="center">No - default is "auto"</td>
@@ -549,7 +549,7 @@ an explanation of scripts and dependencies.
 <h5>Parameters specified as nested elements</h5>
 <h6>classpath</h6>
   <p>
-    See the <a href="../OptionalTasks/script.html">script</a> task
+    See the <a href="../Tasks/script.html">script</a> task
     for using this nested element.
   </p>
 <h5>Description</h5>
@@ -738,7 +738,7 @@ Probe for the maven repository being reachable using the hostname, ten second ti
 <p>This condition is a facet of the
   <a href="resourcecount.html">ResourceCount</a> task.
   It is used to test the size of a 
-  <a href="../CoreTypes/resources.html#collection">resource collection</a>.
+  <a href="../Types/resources.html#collection">resource collection</a>.
   <b>Since Ant 1.7</b>
 </p>
 
@@ -754,7 +754,7 @@ By default this test does a byte for byte comparision, so test time scales with
 byte size. NB: if the files are different sizes, one of them is missing
 or the filenames match the answer is so obvious the detailed test is omitted.
 The resources to check are specified as nested
-<a href="../CoreTypes/resources.html#collection">resource collections</a>,
+<a href="../Types/resources.html#collection">resource collections</a>,
 meaning that more than two resources can be checked; in this case all resources
 must match. <b>Since Ant 1.7</b>
 </p>
@@ -916,7 +916,7 @@ must match. <b>Since Ant 1.7</b>
   <p>
     There is also an optional &lt;regexp&gt; element, which can be used to specify
     a regular expression instead of the "pattern" attribute.
-    See <a href="../CoreTypes/regexp.html">Regexp Type</a> for the description
+    See <a href="../Types/regexp.html">Regexp Type</a> for the description
     of the nested element regexp and of
     the choice of regular expression implementation.
   </p>

docs/manual/CoreTasks/copy.html → docs/manual/Tasks/copy.html

@@ -31,11 +31,11 @@ only copied if the source file is newer than the destination file,
 or when the destination file does not exist.  However, you can explicitly
 overwrite files with the <code>overwrite</code> attribute.</p>
 
-<p><a href="../CoreTypes/resources.html#collection">Resource
+<p><a href="../Types/resources.html#collection">Resource
 Collection</a>s are used to select a group of files to copy.  To use a
 resource collection, the <code>todir</code> attribute must be set.
 <strong>Note</strong> that some resources (for example
-the <a href="../CoreTypes/resources.html#file">file</a> resource)
+the <a href="../Types/resources.html#file">file</a> resource)
 return absolute paths as names and the result of using them without
 using a nested mapper (or the flatten attribute) may not be what you
 expect.</p>
@@ -46,7 +46,7 @@ you should limit the copy to text files. Binary files will be corrupted
 by the copy operation.
 This applies whether the filters are implicitly defined by the
 <a href="filter.html">filter</a> task or explicitly provided to the copy
-operation as <a href="../CoreTypes/filterset.html">filtersets</a>.
+operation as <a href="../Types/filterset.html">filtersets</a>.
   <em>See <a href="#encoding">encoding note</a></em>.
 </p>
 <h3>Parameters</h3>
@@ -109,7 +109,7 @@ operation as <a href="../CoreTypes/filterset.html">filtersets</a>.
     <td valign="top">Ignore the directory structure of the source files,
       and copy all files into the directory specified by the <code>todir</code>
       attribute.  Note that you can achieve the same effect by using a
-      <a href="../CoreTypes/mapper.html#flatten-mapper">flatten mapper</a>.</td>
+      <a href="../Types/mapper.html#flatten-mapper">flatten mapper</a>.</td>
     <td valign="top" align="center">No; defaults to false.</td>
   </tr>
   <tr>
@@ -170,7 +170,7 @@ operation as <a href="../CoreTypes/filterset.html">filtersets</a>.
 <h3>Parameters specified as nested elements</h3>
 
 <h4>fileset or any other resource collection</h4>
-<p><a href="../CoreTypes/resources.html#collection">Resource
+<p><a href="../Types/resources.html#collection">Resource
 Collection</a>s are used to select groups of files to copy.  To use a
 resource collection, the <code>todir</code> attribute must be set.</p>
 <p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> has been
@@ -178,9 +178,9 @@ supported as a nested element.</p>
 
 <h4>mapper</h4>
  <p>You can define filename transformations by using a nested <a
- href="../CoreTypes/mapper.html">mapper</a> element. The default mapper used by
+ href="../Types/mapper.html">mapper</a> element. The default mapper used by
  <code>&lt;copy&gt;</code> is the <a
- href="../CoreTypes/mapper.html#identity-mapper">identity mapper</a>.</p>
+ href="../Types/mapper.html#identity-mapper">identity mapper</a>.</p>
   <p>
     <em>Since Ant 1.6.3</em>,
     one can use a filenamemapper type in place of the mapper element.
@@ -194,14 +194,14 @@ directory.  In any other case the absolute filename of the source will
 be used.</p>
 
 <h4>filterset</h4>
- <p><a href="../CoreTypes/filterset.html">FilterSet</a>s are used to replace
+ <p><a href="../Types/filterset.html">FilterSet</a>s are used to replace
 tokens in files that are copied.
  To use a FilterSet, use the nested <code>&lt;filterset&gt;</code> element.</p>
 
 <p>It is possible to use more than one filterset.</p>
 
 <h4>filterchain</h4>
-<p>The Copy task supports nested <a href="../CoreTypes/filterchain.html">
+<p>The Copy task supports nested <a href="../Types/filterchain.html">
 FilterChain</a>s.</p>
 
 <p>

docs/manual/CoreTasks/copydir.html → docs/manual/Tasks/copydir.html

@@ -38,7 +38,7 @@ finally with the <i>defaultexcludes</i> attribute, you can specify whether you
 want to use default exclusions or not. See the section on <a
 href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
-<p>This task forms an implicit <a href="../CoreTypes/fileset.html">FileSet</a> and
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
 supports most attributes of <code>&lt;fileset&gt;</code>
 (<code>dir</code> becomes <code>src</code>) as well as the nested
 <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and

docs/manual/CoreTasks/delete.html → docs/manual/Tasks/delete.html

@@ -28,7 +28,7 @@
 <h3>Description</h3>
 <p>Deletes a single file, a specified directory and all its files and
 subdirectories, or a set of files specified by one or more
-<a href="../CoreTypes/resources.html#collection">resource collection</a>s.
+<a href="../Types/resources.html#collection">resource collection</a>s.
 The literal implication of <code>&lt;fileset&gt;</code> is that
 directories are not included; however the removal of empty directories can
 be triggered when using nested filesets by setting the

docs/manual/OptionalTasks/depend.html → docs/manual/Tasks/depend.html

@@ -179,7 +179,7 @@ via a nested <code>&lt;classpath&gt;</code> element.</p>
 
 <p>Additionally,
 this task forms an implicit
-<a href="../CoreTypes/fileset.html">FileSet</a>
+<a href="../Types/fileset.html">FileSet</a>
 and supports most attributes of
 <code>&lt;fileset&gt;</code> (<code>dir</code> becomes <code>srcdir</code>),
 as well as the nested <code>&lt;include&gt;</code>,

docs/manual/CoreTasks/dependset.html → docs/manual/Tasks/dependset.html

@@ -37,7 +37,7 @@ any of the target files, all of the target files are removed.
 </p>
 <p>
 Sources and target files are specified via nested
-<a href="../CoreTypes/resources.html#collection">Resource Collection</a>s;
+<a href="../Types/resources.html#collection">Resource Collection</a>s;
 sources can be resources of any type, while targets are restricted to files
 only. At least one set of sources and one set of targets is required.
 </p>
@@ -78,7 +78,7 @@ well as other stylesheets imported by the main stylesheet.
 <h4>sources</h4>
 
 <p>The <code>&lt;sources&gt;</code> element is a
-<a href="../CoreTypes/resources.html#union">Union</a> into which
+<a href="../Types/resources.html#union">Union</a> into which
 arbitrary resource collections can be nested. <b>Since Ant 1.7</b>
 </p>
 
@@ -86,7 +86,7 @@ arbitrary resource collections can be nested. <b>Since Ant 1.7</b>
 
 <p>
 The nested <code>&lt;srcfileset&gt;</code> element specifies a <a
-href="../CoreTypes/fileset.html">FileSet</a>. All files included in
+href="../Types/fileset.html">FileSet</a>. All files included in
 this fileset will be compared against all files included in all of the
 <code>&lt;targetfileset&gt;</code> filesets and <code>&lt;targetfilelist&gt;</code>
 filelists.  Multiple <code>&lt;srcfileset&gt;</code> filesets may be specified.
@@ -96,7 +96,7 @@ filelists.  Multiple <code>&lt;srcfileset&gt;</code> filesets may be specified.
 
 <p>
 The nested <code>&lt;srcfilelist&gt;</code> element specifies a <a
-href="../CoreTypes/filelist.html">FileList</a>. All files included in
+href="../Types/filelist.html">FileList</a>. All files included in
 this filelist will be compared against all files included in all of the 
 <code>&lt;targetfileset&gt;</code> filesets and <code>&lt;targetfilelist&gt;</code>
 filelists.  Multiple <code>&lt;srcfilelist&gt;</code> filelists may be specified.
@@ -113,7 +113,7 @@ include any filesystem-based resource. <b>Since Ant 1.7</b>
 
 <p>
 The nested <code>&lt;targetfileset&gt;</code> element specifies a <a
-href="../CoreTypes/fileset.html">FileSet</a>.  All files included in
+href="../Types/fileset.html">FileSet</a>.  All files included in
 this fileset will be compared against all files included in all of the
 <code>&lt;srcfileset&gt;</code> filesets and <code>&lt;sourcefilelist&gt;</code>
 filelists, and if any are older, they are all deleted.
@@ -124,7 +124,7 @@ Multiple <code>&lt;targetfileset&gt;</code> filesets may be specified.
 
 <p>
 The nested <code>&lt;targetfilelist&gt;</code> element specifies a <a
-href="../CoreTypes/filelist.html">FileList</a>.  All files included in
+href="../Types/filelist.html">FileList</a>.  All files included in
 this filelist will be compared against all files included in all of the
 <code>&lt;srcfileset&gt;</code> filesets and <code>&lt;sourcefilelist&gt;</code>
 filelists, and if any are older, they are all deleted.

docs/manual/CoreTasks/ear.html → docs/manual/Tasks/ear.html

@@ -270,7 +270,7 @@ to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
 
 <h4>metainf</h4>
 <p>The nested <code>metainf</code> element specifies a <a
-href="../CoreTypes/fileset.html">FileSet</a>. All files included in this fileset will
+href="../Types/fileset.html">FileSet</a>. All files included in this fileset will
 end up in the <code>META-INF</code> directory of the ear file. If this
 fileset includes a file named <code>MANIFEST.MF</code>, the file is
 ignored and you will get a warning.</p>

docs/manual/CoreTasks/echo.html → docs/manual/Tasks/echo.html

@@ -55,7 +55,7 @@ ignored</p>
   </tr>
   <tr>
     <td valign="top">output</td>
-    <td valign="top">the <a href="../CoreTypes/resources.html">Resource</a>
+    <td valign="top">the <a href="../Types/resources.html">Resource</a>
       to write the message to (see <a href="../develop.html#set-magic">note</a>).
       <b>Since Ant 1.8</b></td>
   </tr>

docs/manual/OptionalTasks/echoproperties.html → docs/manual/Tasks/echoproperties.html

@@ -89,7 +89,7 @@ files.</p>
 <h4>propertyset</h4>
 
 <p>You can specify subsets of properties to be echoed with <a
-href="../CoreTypes/propertyset.html">propertyset</a>s. Using
+href="../Types/propertyset.html">propertyset</a>s. Using
 <tt>propertyset</tt>s gives more control on which properties will be
 picked up. The attributes <tt>prefix</tt> and <tt>regex</tt> are just
 shorcuts that use <tt>propertyset</tt>s internally.

docs/manual/OptionalTasks/ejb.html → docs/manual/Tasks/ejb.html

@@ -863,7 +863,7 @@ requiring the vendor classes in the classpath, you would need to use a
 
 <p>The <code>&lt;support&gt;</code> nested element is used to supply additional classes
 (files) to be included in the generated jars. The <code>&lt;support&gt;</code> element is a
-<a href="../CoreTypes/fileset.html">FileSet</a>, so it can either reference a fileset declared elsewhere or it can be
+<a href="../Types/fileset.html">FileSet</a>, so it can either reference a fileset declared elsewhere or it can be
 defined in-place with the appropriate <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code> nested
 elements. The files in the support fileset are added into the generated EJB jar
 in the same relative location as their location within the support fileset. Note

docs/manual/CoreTasks/exec.html → docs/manual/Tasks/exec.html

@@ -364,13 +364,13 @@ system command via nested <code>&lt;env&gt;</code> elements.</p>
 </table>
 <a name="redirector"><h4>redirector</h4></a>
 <i><b>Since Ant 1.6.2</b></i>
-<p>A nested <a href="../CoreTypes/redirector.html">I/O Redirector</a>
+<p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
 can be specified.  In general, the attributes of the redirector behave
 as the corresponding attributes available at the task level.  The most
 notable peculiarity stems from the retention of the &lt;exec&gt;
 attributes for backwards compatibility.  Any file mapping is done
 using a <CODE>null</CODE> sourcefile; therefore not all
-<a href="../CoreTypes/mapper.html">Mapper</a> types will return
+<a href="../Types/mapper.html">Mapper</a> types will return
 results.  When no results are returned, redirection specifications
 will fall back to the task level attributes.  In practice this means that
 defaults can be specified for input, output, and error output files.
@@ -437,7 +437,7 @@ Ant process. The browser will remain.</p>
 </pre></blockquote>
 
 Sends the string &quot;blah before blah&quot; to the &quot;cat&quot; executable,
-using an <a href="../CoreTypes/filterchain.html">&lt;inputfilterchain&gt;</a>
+using an <a href="../Types/filterchain.html">&lt;inputfilterchain&gt;</a>
 to replace &quot;before&quot; with &quot;after&quot; on the way in.
 Output is sent to the file &quot;redirector.out&quot; and stored
 in a property of the same name.  Similarly, error output is sent to

docs/manual/CoreTasks/fixcrlf.html → docs/manual/Tasks/fixcrlf.html

@@ -47,7 +47,7 @@
 
   <p>
     This task forms an implicit
-    <a href="../CoreTypes/fileset.html">FileSet</a> and
+    <a href="../Types/fileset.html">FileSet</a> and
     supports most attributes of <code>&lt;fileset&gt;</code>
     (<code>dir</code> becomes <code>srcdir</code>) as well as the nested
     <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
@@ -63,7 +63,7 @@
 
   <p>
     Since <b>Ant 1.7</b>, this task can be used in a
-    <a href="../CoreTypes/filterchain.html">filterchain</a>.
+    <a href="../Types/filterchain.html">filterchain</a>.
   </p>
 
 <h3>Parameters</h3>

docs/manual/OptionalTasks/ftp.html → docs/manual/Tasks/ftp.html

@@ -480,7 +480,7 @@ patterns of the <code>fileset <br>
 </table><h3>Parameters specified as nested elements</h3>
 <h4>fileset</h4>
 <p>The ftp task supports any number of nested <a
-href="../CoreTypes/fileset.html"><code>&lt;fileset&gt;</code></a> elements to specify
+href="../Types/fileset.html"><code>&lt;fileset&gt;</code></a> elements to specify
 the files to be retrieved, or deleted, or listed, or whose mode you want to change.</p>
 <p>
 The attribute <code>followsymlinks</code> of <code>fileset</code> is supported on

docs/manual/CoreTasks/get.html → docs/manual/Tasks/get.html

@@ -43,7 +43,7 @@ plain text' authentication is used. This is only secure over an HTTPS link.
   <a href="../proxy.html">use the proxy settings of the operating
     system</a> if enabled with the
   <code>-autoproxy</code> option. There is also the
-  <a href="../OptionalTasks/setproxy.html">&lt;setproxy&gt;</a> task
+  <a href="../Tasks/setproxy.html">&lt;setproxy&gt;</a> task
   for earlier Java versions. With proxies turned
   on, <code>&lt;get&gt;</code> requests against localhost may not work
   as expected, if the request is relayed to the proxy.</p>
@@ -125,7 +125,7 @@ plain text' authentication is used. This is only secure over an HTTPS link.
 <h3>Parameters specified as nested elements</h3>
 <h4>any resource collection</h4>
 
-<p><a href="../CoreTypes/resources.html#collection">Resource
+<p><a href="../Types/resources.html#collection">Resource
     Collection</a>s are used to select groups of URLs to download.  If
     the collection contains more than one resource, the dest attribute
     must point to a directory if it exists or a directory will be
@@ -136,7 +136,7 @@ plain text' authentication is used. This is only secure over an HTTPS link.
 <h4>mapper</h4>
 
 <p>You can define name transformations by using a
-  nested <a href="../CoreTypes/mapper.html">mapper</a> element.  You
+  nested <a href="../Types/mapper.html">mapper</a> element.  You
   can also use any filenamemapper type in place of the mapper
   element.</p>
 

docs/manual/OptionalTasks/image.html → docs/manual/Tasks/image.html

@@ -119,7 +119,7 @@
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<p>This task forms an implicit <a href="../CoreTypes/fileset.html">FileSet</a> and
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
 supports most attributes of <code>&lt;fileset&gt;</code> as well as the
 nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
 <code>&lt;patternset&gt;</code> elements.</p>
@@ -204,10 +204,10 @@ nested inside the Draw object.</p>
 <p><em>Since Ant 1.8.0</em></p>
 
 <p>You can define filename transformations by using a
-  nested <a href="../CoreTypes/mapper.html">mapper</a> element. The
+  nested <a href="../Types/mapper.html">mapper</a> element. The
   default mapper used by
   <code>&lt;image&gt;</code> is
-  the <a href="../CoreTypes/mapper.html#identity-mapper">identity
+  the <a href="../Types/mapper.html#identity-mapper">identity
   mapper</a>.</p>
 
 <p>You can also use a filenamemapper type in place of the mapper

docs/manual/CoreTasks/import.html → docs/manual/Tasks/import.html

@@ -211,7 +211,7 @@ project).</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="../CoreTypes/resources.html">resource</a> or resource
+<h4>any <a href="../Types/resources.html">resource</a> or resource
 collection</h4>
 
 <p>The specified resources will be imported.  <em>Since Ant

docs/manual/CoreTasks/include.html → docs/manual/Tasks/include.html

@@ -215,7 +215,7 @@ project).</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="../CoreTypes/resources.html">resource</a> or resource
+<h4>any <a href="../Types/resources.html">resource</a> or resource
 collection</h4>
 
 <p>The specified resources will be included.</p>

docs/manual/CoreTasks/jar.html → docs/manual/Tasks/jar.html

@@ -38,7 +38,7 @@ finally with the <i>defaultexcludes</i> attribute, you can specify whether you
 want to use default exclusions or not. See the section on <a
 href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
-<p>This task forms an implicit <a href="../CoreTypes/fileset.html">FileSet</a> and
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
 supports most attributes of <code>&lt;fileset&gt;</code>
 (<code>dir</code> becomes <code>basedir</code>) as well as the nested
 <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
@@ -325,7 +325,7 @@ to a value other than its default, <code>"add"</code>.</b></p>
 <h3>Nested elements</h3>
 <h4>metainf</h4>
 <p>The nested <code>metainf</code> element specifies a <a
-href="../CoreTypes/fileset.html">FileSet</a>. All files included in this fileset will
+href="../Types/fileset.html">FileSet</a>. All files included in this fileset will
 end up in the <code>META-INF</code> directory of the jar file. If this
 fileset includes a file named <code>MANIFEST.MF</code>, the file is
 ignored and you will get a warning.</p>

docs/manual/OptionalTasks/jarlib-available.html → docs/manual/Tasks/jarlib-available.html

@@ -61,15 +61,15 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>extension</h4>
- <p><a href="../OptionalTypes/extension.html">Extension</a> the extension
+ <p><a href="../Types/extension.html">Extension</a> the extension
  to search for.</p>
 
 <h4>fileset</h4>
- <p><a href="../CoreTypes/fileset.html">FileSet</a>s are used to select
+ <p><a href="../Types/fileset.html">FileSet</a>s are used to select
 sets of files to check for extension.</p>
 
 <h4>extensionSet</h4>
- <p><a href="../OptionalTypes/extensionset.html">ExtensionSet</a>s is the set
+ <p><a href="../Types/extensionset.html">ExtensionSet</a>s is the set
  of extensions to search for extension in.</p>
 
 <h3>Examples</h3>

docs/manual/OptionalTasks/jarlib-display.html → docs/manual/Tasks/jarlib-display.html

@@ -56,7 +56,7 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>fileset</h4>
- <p><a href="../CoreTypes/fileset.html">FileSet</a>s contain list of files to
+ <p><a href="../Types/fileset.html">FileSet</a>s contain list of files to
  display Extension information  about.</p>
 
 <h3>Examples</h3>

docs/manual/OptionalTasks/jarlib-manifest.html → docs/manual/Tasks/jarlib-manifest.html

@@ -57,15 +57,15 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>extension</h4>
- <p><a href="../OptionalTypes/extension.html">Extension</a> the extension
+ <p><a href="../Types/extension.html">Extension</a> the extension
  that this library implements.</p>
 
 <h4>depends</h4>
- <p><a href="../OptionalTypes/extensionset.html">ExtensionSet</a>s containing
+ <p><a href="../Types/extensionset.html">ExtensionSet</a>s containing
  all dependencies for jar.</p>
 
 <h4>options</h4>
- <p><a href="../OptionalTypes/extensionset.html">ExtensionSet</a>s containing
+ <p><a href="../Types/extensionset.html">ExtensionSet</a>s containing
  all optional dependencies for jar. (Optional dependencies will be used if
  present else they will be ignored)</p>
 

docs/manual/OptionalTasks/jarlib-resolve.html → docs/manual/Tasks/jarlib-resolve.html

@@ -71,7 +71,7 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>extension</h4>
- <p><a href="../OptionalTypes/extension.html">Extension</a> the extension
+ <p><a href="../Types/extension.html">Extension</a> the extension
  to resolve. Must be present</p>
 
 <h4>location</h4>

docs/manual/CoreTasks/java.html → docs/manual/Tasks/java.html

@@ -234,7 +234,7 @@ variables</a>.</p>
 <h4>syspropertyset</h4>
 
 <p>You can specify a set of properties to be used as system properties
-with <a href="../CoreTypes/propertyset.html">syspropertyset</a>s.</p>
+with <a href="../Types/propertyset.html">syspropertyset</a>s.</p>
 
 <p><em>since Ant 1.6</em>.</p>
 
@@ -261,7 +261,7 @@ section about <a href="exec.html#env">exec</a></p>
 <h4>permissions</h4>
 <p>Security permissions can be revoked and granted during the execution of the
 class via a nested <i>permissions</i> element. For more information please
-see <a href="../CoreTypes/permissions.html">permissions</a></p>
+see <a href="../Types/permissions.html">permissions</a></p>
 <p>When the permission RuntimePermission exitVM has not been granted (or has
 been revoked) the System.exit() call will be intercepted
 and treated like indicated in <i>failonerror</i>.</p>
@@ -280,7 +280,7 @@ disallowed.
 <h4>assertions</h4>
 
 <p>You can control enablement of Java 1.4 assertions with an
-<a href="../CoreTypes/assertions.html"><tt>&lt;assertions&gt;</tt></a>
+<a href="../Types/assertions.html"><tt>&lt;assertions&gt;</tt></a>
 subelement.</p>
 
 <p>Assertion statements are currently ignored in non-forked mode.</p>
@@ -289,13 +289,13 @@ subelement.</p>
 
 <a name="redirector"><h4>redirector</h4></a>
 <i><b>Since Ant 1.6.2</b></i>
-<p>A nested <a href="../CoreTypes/redirector.html">I/O Redirector</a>
+<p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
 can be specified.  In general, the attributes of the redirector behave
 as the corresponding attributes available at the task level.  The most
 notable peculiarity stems from the retention of the <code>&lt;java&gt;</code>
 attributes for backwards compatibility.  Any file mapping is done
 using a <CODE>null</CODE> sourcefile; therefore not all
-<a href="../CoreTypes/mapper.html">Mapper</a> types will return
+<a href="../Types/mapper.html">Mapper</a> types will return
 results.  When no results are returned, redirection specifications
 will fall back to the task level attributes.  In practice this means that
 defaults can be specified for input, output, and error output files.

docs/manual/CoreTasks/javac.html → docs/manual/Tasks/javac.html

@@ -36,7 +36,7 @@ or where the class file is older than the
 the classes that need a rebuild. It will not scan the source and therefore
 will have no knowledge about nested classes, classes that are named different
 from the source file, and so on. See the
-<a href="../OptionalTasks/depend.html"><code>&lt;depend&gt;</code></a> task
+<a href="../Tasks/depend.html"><code>&lt;depend&gt;</code></a> task
 for dependency checking based on other than just
 existence/modification times.</p>
 <p>When the source files are part of a package, the directory structure of
@@ -443,7 +443,7 @@ invoking the compiler.</p>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<p>This task forms an implicit <a href="../CoreTypes/fileset.html">FileSet</a> and
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
 supports most attributes of <code>&lt;fileset&gt;</code>
 (<code>dir</code> becomes <code>srcdir</code>) as well as the nested
 <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and

docs/manual/CoreTasks/javadoc.html → docs/manual/Tasks/javadoc.html

@@ -526,7 +526,7 @@ recommended.</p>
 
 <h4>packageset</h4>
 
-<p>A <a href="../CoreTypes/dirset.html">DirSet</a>.  All matched
+<p>A <a href="../Types/dirset.html">DirSet</a>.  All matched
 directories that contain Java source files will be passed to javadoc
 as package names.  Package names are created from the directory names
 by translating the directory separator into dots.  Ant assumes the
@@ -539,7 +539,7 @@ the nested <code>&lt;packageset&gt;</code> elements.</p>
 
 <h4>fileset</h4>
 
-<p>A <a href="../CoreTypes/fileset.html">FileSet</a>.  All matched
+<p>A <a href="../Types/fileset.html">FileSet</a>.  All matched
 files will be passed to javadoc as source files.  Ant will
 automatically add the include pattern <code>**/*.java</code> (and
 <code>**/package.html</code> if includenosourcepackages is true) to
@@ -558,7 +558,7 @@ the nested <code>&lt;fileset&gt;</code> elements.</p>
 <h4>sourcefiles</h4>
 
 <p>A container for arbitrary file system based <a
-href="../CoreTypes/resources.html#collection">resource
+href="../Types/resources.html#collection">resource
 collections</a>.  All files contained in any of the nested collections
 (this includes nested filesets, filelists or paths) will be passed to
 javadoc as source files.</p>
@@ -765,7 +765,7 @@ not set the description attribute for those tags.</p>
   <tr>
     <td valign="top">dir</td>
     <td valign="top">If this attribute is specified, this element will behave as an implicit
-    <a href="../CoreTypes/fileset.html">fileset</a>. The files included by this fileset should
+    <a href="../Types/fileset.html">fileset</a>. The files included by this fileset should
     contain each tag definition on a separate line, as described in the
     <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#tag">Javadoc reference guide</a>:
     <pre>ejb.bean:t:XDoclet EJB Tag

docs/manual/OptionalTasks/jlink.html → docs/manual/Tasks/jlink.html

@@ -23,9 +23,9 @@
 
 <h2><a name="jlink">Jlink</a></h2>
 <h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated. Use a <a href="../CoreTypes/zipfileset.html">zipfileset</a>
- or <a href="../CoreTasks/zip.html#zipgroupfileset">zipgroupfileset</a> with the
- <a href="../CoreTasks/jar.html">Jar task</a> or <a href="../CoreTasks/zip.html">Zip task</a>
+<p><i>This task has been deprecated. Use a <a href="../Types/zipfileset.html">zipfileset</a>
+ or <a href="../Tasks/zip.html#zipgroupfileset">zipgroupfileset</a> with the
+ <a href="../Tasks/jar.html">Jar task</a> or <a href="../Tasks/zip.html">Zip task</a>
  instead.</i></p>
 
 <h3><b>Description:</b></h3>

docs/manual/OptionalTasks/junit.html → docs/manual/Tasks/junit.html

@@ -292,7 +292,7 @@ href="../using.html#arg">Command-line Arguments</a>.</p>
 properties required by the class. These properties will be made available
 to the VM during the execution of the test (either ANT's VM or the forked VM,
 if <code>fork</code> is enabled).
-The attributes for this element are the same as for <a href="../CoreTasks/exec.html#env">environment variables</a>.</p>
+The attributes for this element are the same as for <a href="../Tasks/exec.html#env">environment variables</a>.</p>
 
 <pre>
 &lt;junit fork=&quot;no&quot;&gt;
@@ -307,7 +307,7 @@ available to the test.</p>
 <h4>syspropertyset</h4>
 
 <p>You can specify a set of properties to be used as system properties
-with <a href="../CoreTypes/propertyset.html">syspropertyset</a>s.</p>
+with <a href="../Types/propertyset.html">syspropertyset</a>s.</p>
 
 <p><em>since Ant 1.6</em>.</p>
 
@@ -316,7 +316,7 @@ with <a href="../CoreTypes/propertyset.html">syspropertyset</a>s.</p>
 <p>It is possible to specify environment variables to pass to the
 forked VM via nested <code>&lt;env&gt;</code> elements. For a description
 of the <code>&lt;env&gt;</code> element's attributes, see the
-description in the <a href="../CoreTasks/exec.html#env">exec</a> task.</p>
+description in the <a href="../Tasks/exec.html#env">exec</a> task.</p>
 
 <p>Settings will be ignored if <code>fork</code> is disabled.</p>
 
@@ -332,7 +332,7 @@ support it (i.e. Java 1.1).</p>
 <h4>permissions</h4>
 <p>Security permissions can be revoked and granted during the execution of the 
 class via a nested <i>permissions</i> element. For more information please
-see <a href="../CoreTypes/permissions.html">permissions</a></p>
+see <a href="../Types/permissions.html">permissions</a></p>
 
 <p>Settings will be ignored if fork is enabled.</p>
 
@@ -341,7 +341,7 @@ see <a href="../CoreTypes/permissions.html">permissions</a></p>
 <h4>assertions</h4>
 
 <p>You can control enablement of Java 1.4 assertions with an
-<a href="../CoreTypes/assertions.html"><tt>&lt;assertions&gt;</tt></a>
+<a href="../Types/assertions.html"><tt>&lt;assertions&gt;</tt></a>
 subelement.</p>
  
 <p>Assertion statements are currently ignored in non-forked mode.</p>
@@ -501,9 +501,9 @@ the name of the resulting class (without suffix). It defaults to <i>java-tmp-dir
 
 <p>Define a number of tests based on pattern matching.</p>
 
-<p><code>batchtest</code> collects the included <a href="../CoreTypes/resources.html">resources</a> from any number
+<p><code>batchtest</code> collects the included <a href="../Types/resources.html">resources</a> from any number
 of nested <a
-href="../CoreTypes/resources.html#collection">Resource Collection</a>s. It then
+href="../Types/resources.html#collection">Resource Collection</a>s. It then
 generates a test class name for each resource that ends in
 <code>.java</code> or <code>.class</code>.</p>
 

docs/manual/OptionalTasks/junitreport.html → docs/manual/Tasks/junitreport.html

@@ -76,7 +76,7 @@ available anymore for quite some time.</p>
 <h3><a name="nested">Nested Elements</a></h3>
 <h4>fileset</h4>
 <p><code>junitreport</code> collects individual xml files generated by the JUnit
-task using the nested <a href="../CoreTypes/fileset.html"><code>&lt;FileSet&gt;</code></a>
+task using the nested <a href="../Types/fileset.html"><code>&lt;FileSet&gt;</code></a>
 element.</p>
 <h4>report</h4>
 <p>Generate a browsable report based on the document created by the merge.</p>

docs/manual/CoreTasks/length.html → docs/manual/Tasks/length.html

@@ -28,7 +28,7 @@
 <h3>Description</h3>
 <p>Display or set a property containing length information for
    a string, a file, or one or more nested
-   <a href="../CoreTypes/resources.html#collection">Resource Collection</a>s.
+   <a href="../Types/resources.html#collection">Resource Collection</a>s.
    Can also be used as a condition. <b>Since Ant 1.6.3</b></p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
@@ -92,7 +92,7 @@
 
 <h4>Resource Collections</h4>
 <p>You can include resources via nested
-  <a href="../CoreTypes/resources.html#collection">Resource Collection</a>s.</p>
+  <a href="../Types/resources.html#collection">Resource Collection</a>s.</p>
 
 <h3>Examples</h3>
 

docs/manual/CoreTasks/loadfile.html → docs/manual/Tasks/loadfile.html

@@ -75,7 +75,7 @@ the property is not set.</p>
 
 </table>
 <p>
-The LoadFile task supports nested <a href="../CoreTypes/filterchain.html">
+The LoadFile task supports nested <a href="../Types/filterchain.html">
 FilterChain</a>s.
 
 <h3>Examples</h3>
@@ -107,7 +107,7 @@ Load a file, don't fail if it is missing (a message is printed, though)
       property="mail.recipients"
       srcFile="recipientlist.txt"&gt;
       &lt;filterchain&gt;
-        &lt;<a href="../CoreTypes/filterchain.html#striplinebreaks">striplinebreaks</a>/&gt;
+        &lt;<a href="../Types/filterchain.html#striplinebreaks">striplinebreaks</a>/&gt;
       &lt;/filterchain&gt;
     &lt;/loadfile&gt;
 </pre>
@@ -118,7 +118,7 @@ merging lines to ensure this happens.
       property="system.configuration.xml"
       srcFile="configuration.xml"&gt;
         &lt;filterchain&gt;
-          &lt;<a href="../CoreTypes/filterchain.html#expandproperties">expandproperties</a>/&gt;
+          &lt;<a href="../Types/filterchain.html#expandproperties">expandproperties</a>/&gt;
         &lt;/filterchain&gt;
     &lt;/loadfile&gt;
 </pre>

docs/manual/CoreTasks/loadproperties.html → docs/manual/Tasks/loadproperties.html

@@ -35,7 +35,7 @@ than a warning being printed.
 
 <p>If you want to simulate <a href="property.html">property</a>'s
 prefix attribute, please use <a
-href="../CoreTypes/filterchain.html#prefixlines">prefixlines</a>
+href="../Types/filterchain.html#prefixlines">prefixlines</a>
 filter.</p>
 
 <h3>Parameters</h3>
@@ -82,12 +82,12 @@ filter.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="../CoreTypes/resources.html">resource</a> or single element
+<h4>any <a href="../Types/resources.html">resource</a> or single element
 resource collection</h4>
 
 <p>The specified resource will be used as src. <em>Since Ant 1.7</em></p>
 
-<h4><a href="../CoreTypes/filterchain.html">FilterChain</a></h4>
+<h4><a href="../Types/filterchain.html">FilterChain</a></h4>
 
 <h4>classpath</h4>
 
@@ -106,7 +106,7 @@ Load contents of file.properties as Ant properties.
 
 <pre>    &lt;loadproperties srcFile="file.properties"&gt;
       &lt;filterchain&gt;
-        &lt;<a href="../CoreTypes/filterchain.html#linecontains">linecontains</a>&gt;
+        &lt;<a href="../Types/filterchain.html#linecontains">linecontains</a>&gt;
           &lt;contains value=&quot;import.&quot;/&gt;
         &lt;/linecontains&gt;
       &lt;/filterchain&gt;
@@ -118,8 +118,8 @@ Ant properties.
 
 <pre>
     &lt;loadproperties&gt;
-      &lt;<a href="../CoreTypes/resources.html#gzipresource">gzipresource</a>&gt;
-        &lt;<a href="../CoreTypes/resources.html#url">url</a> url="http://example.org/url.properties.gz"/&gt;
+      &lt;<a href="../Types/resources.html#gzipresource">gzipresource</a>&gt;
+        &lt;<a href="../Types/resources.html#url">url</a> url="http://example.org/url.properties.gz"/&gt;
       &lt;/gzipresource&gt;
     &lt;/loadproperties&gt;
 </pre>

docs/manual/CoreTasks/loadresource.html → docs/manual/Tasks/loadresource.html

@@ -32,7 +32,7 @@
 Load a text resource into a single property. Unless an encoding is
 specified, the encoding of the current locale is used.  Resources to
 load are specified as nested <a
-href="../CoreTypes/resources.html">resource</a> elements or single
+href="../Types/resources.html">resource</a> elements or single
 element resource collections. If the resource content is empty (maybe after
 processing a filterchain) the property is not set.
 </p>
@@ -73,7 +73,7 @@ processing a filterchain) the property is not set.
   </tr>
 </table>
 <p>
-The LoadResource task supports nested <a href="../CoreTypes/filterchain.html">
+The LoadResource task supports nested <a href="../Types/filterchain.html">
 FilterChain</a>s.
 
 <h3>Examples</h3>

docs/manual/CoreTasks/mail.html → docs/manual/Tasks/mail.html

@@ -41,7 +41,7 @@
     <code>&lt;attachments&gt;</code> elements, which are <a
     href="../using.html#path">path-like structures</a>.  This means
     any filesystem based <a
-    href="../CoreTypes/resources.html">resource</a> or resource
+    href="../Types/resources.html">resource</a> or resource
     collection can be used to point to attachments.  Prior to Ant 1.7
     only <code>&lt;fileset&gt;</code> has been supported as a nested
     element, you can still use this directly without an

docs/manual/OptionalTasks/mimemail.html → docs/manual/Tasks/mimemail.html

@@ -27,14 +27,14 @@
 <h2><a name="mimemail">MimeMail</a></h2>
 
 <h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated.  Use the <a href="../CoreTasks/mail.html">mail</a> task instead.</i></p>
+<p><i>This task has been deprecated.  Use the <a href="../Tasks/mail.html">mail</a> task instead.</i></p>
 
 <h3>Description</h3>
 <p>Sends SMTP mail with MIME attachments.
 <a href="http://java.sun.com/products/javamail/index.html">JavaMail</a>
 and <a href="http://java.sun.com/products/javabeans/glasgow/jaf.html">Java
 Activation Framework</a> are required for this task.</p>
-<p>Multiple files can be attached using <a href="../CoreTypes/fileset.html">FileSets.</a></p>
+<p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>

docs/manual/CoreTasks/move.html → docs/manual/Tasks/move.html

@@ -32,11 +32,11 @@ destination file is overwritten if it already exists.  When <var>overwrite</var>
 turned off, then files are only moved if the source file is newer than
 the destination file, or when the destination file does not exist.</p>
 
-<p><a href="../CoreTypes/resources.html#collection">Resource
+<p><a href="../Types/resources.html#collection">Resource
 Collection</a>s are used to select a group of files to move.  Only
 file system based resource collections are supported, this includes <a
-href="../CoreTypes/fileset.html">fileset</a>s, <a
-href="../CoreTypes/filelist.html">filelist</a> and <a
+href="../Types/fileset.html">fileset</a>s, <a
+href="../Types/filelist.html">filelist</a> and <a
 href="../using.html#path">path</a>.  Prior to Ant 1.7 only
 <code>&lt;fileset&gt;</code> has been supported as a nested element.
 To use a resource collection, the <code>todir</code> attribute must be
@@ -103,7 +103,7 @@ there is a directory by the same name in <i>todir</i>, the action will fail.
     <td valign="top">ignore directory structure of source directory,
       copy all files into a single directory, specified by the <var>todir</var>
       attribute (default is &quot;false&quot;).Note that you can achieve the
-      same effect by using a <a href="../CoreTypes/mapper.html#flatten-mapper">flatten mapper</a></td>
+      same effect by using a <a href="../Types/mapper.html#flatten-mapper">flatten mapper</a></td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
@@ -163,9 +163,9 @@ there is a directory by the same name in <i>todir</i>, the action will fail.
 <h3>Parameters specified as nested elements</h3>
 <h4>mapper</h4>
 <p>You can define file name transformations by using a nested <a
-href="../CoreTypes/mapper.html">mapper</a> element. The default mapper used by
+href="../Types/mapper.html">mapper</a> element. The default mapper used by
 <code>&lt;move&gt;</code> is the <a
-href="../CoreTypes/mapper.html#identity-mapper">identity</a>.</p>
+href="../Types/mapper.html#identity-mapper">identity</a>.</p>
 <p>Note that the source name handed to the mapper depends on the
 resource collection you use.  If you use <code>&lt;fileset&gt;</code>
 or any other collection that provides a base directory, the name
@@ -173,7 +173,7 @@ passed to the mapper will be a relative filename, relative to the base
 directory.  In any other case the absolute filename of the source will
 be used.</p>
 <h4>filterchain</h4>
-<p>The Move task supports nested <a href="../CoreTypes/filterchain.html">
+<p>The Move task supports nested <a href="../Types/filterchain.html">
 FilterChain</a>s.</p>
 
 <p>

docs/manual/OptionalTasks/native2ascii.html → docs/manual/Tasks/native2ascii.html

@@ -43,14 +43,14 @@
       to use it as a new extension.
       More sophisticated file name translations can be achieved using a nested
       <em><code>&lt;mapper&gt;</code></em> element. By default an
-      <a href="../CoreTypes/mapper.html#identity-mapper">identity mapper</a> will be used.
+      <a href="../Types/mapper.html#identity-mapper">identity mapper</a> will be used.
       If <em>dest</em> and <em>src</em> point to the same directory,
       the <em>ext</em> attribute or a nested <em><code>&lt;mapper&gt;</code></em>
       is required.
     </p>
 
     <p>
-      This task forms an implicit <a href="../CoreTypes/fileset.html">File Set</a>,
+      This task forms an implicit <a href="../Types/fileset.html">File Set</a>,
       and supports most attributes of <code>&lt;fileset&gt;</code>
       (<code>dir</code> becomes <code>src</code>) as well as
       nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>,

docs/manual/OptionalTasks/netrexxc.html → docs/manual/Tasks/netrexxc.html

@@ -47,7 +47,7 @@ excluded.  This is also done with patterns.  And finally with the
 want to use default exclusions or not. See the section on <a
 href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
-<p>This task forms an implicit <a href="../CoreTypes/fileset.html">FileSet</a> and
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
 supports most attributes of <code>&lt;fileset&gt;</code>
 (<code>dir</code> becomes <code>srcdir</code>) as well as the nested
 <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and

docs/manual/CoreTasks/pack.html → docs/manual/Tasks/pack.html

@@ -51,7 +51,7 @@ resource is newer.</p>
     <td valign="top">the <i>deprecated</i> old name of destfile.</td>
   </tr>
 </table>
-<h4>any <a href="../CoreTypes/resources.html">resource</a> or single element
+<h4>any <a href="../Types/resources.html">resource</a> or single element
 resource collection</h4>
 
 <p>The specified resource will be used as src. <em>Since Ant 1.7</em></p>

docs/manual/CoreTasks/pathconvert.html → docs/manual/Tasks/pathconvert.html

@@ -26,7 +26,7 @@
 
 <h2><a name="pathconvert">Pathconvert</a></h2>
 <h3>Description</h3>
-<p>Converts nested <a href="../CoreTypes/resources.html#collection">
+<p>Converts nested <a href="../Types/resources.html#collection">
 ResourceCollection</a>s, or a reference to just one, into a path
 form for a particular platform, optionally storing the result into
 a given property. It can also be used when you need
@@ -37,7 +37,7 @@ of files in a FileList into a path.
 <p>Nested <code>&lt;map&gt;</code> elements can be specified to map Windows
 drive letters to Unix paths, and vice-versa.</p>
 <p>More complex transformations can be achieved using a nested
-<a href="../CoreTypes/mapper.html"><code>&lt;mapper&gt;</code></a>
+<a href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a>
 (since Ant 1.6.2).
 </p>
 
@@ -140,10 +140,10 @@ prefixes of other <code>from</code> values.</i>
 </p>   
 <h4>Resource Collections</h4>
 <p>If the <code>refid</code> attribute is not specified, then one or more
-   nested <a href="../CoreTypes/resources.html#collection">Resource
+   nested <a href="../Types/resources.html#collection">Resource
 Collection</a>s must be supplied.</p>
 <h4>mapper</h4>
-<p>A single nested <a href="../CoreTypes/mapper.html">
+<p>A single nested <a href="../Types/mapper.html">
 <code>&lt;mapper&gt;</code></a> element can be specified
 to perform any of various filename transformations (since Ant 1.6.2).
 </p>