ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r948574 [2/3] - in /ant/core/trunk: docs/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ docs/manual/OptionalTasks/ docs/manual/OptionalTypes/ docs/manual/Tasks/ docs/manual/Types/ xdocs/ xdocs/antlibs/svn/
Date Wed, 26 May 2010 20:33:55 GMT
Modified: ant/core/trunk/docs/manual/Tasks/loadproperties.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/loadproperties.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/loadproperties.html (original)
+++ ant/core/trunk/docs/manual/Tasks/loadproperties.html Wed May 26 20:33:51 2010
@@ -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 
 
 <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>

Modified: ant/core/trunk/docs/manual/Tasks/loadresource.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/loadresource.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/loadresource.html (original)
+++ ant/core/trunk/docs/manual/Tasks/loadresource.html Wed May 26 20:33:51 2010
@@ -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 i
   </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>

Modified: ant/core/trunk/docs/manual/Tasks/mail.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/mail.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/mail.html (original)
+++ ant/core/trunk/docs/manual/Tasks/mail.html Wed May 26 20:33:51 2010
@@ -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

Copied: ant/core/trunk/docs/manual/Tasks/mimemail.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/mimemail.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/mimemail.html?p2=ant/core/trunk/docs/manual/Tasks/mimemail.html&p1=ant/core/trunk/docs/manual/OptionalTasks/mimemail.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/mimemail.html (original)
+++ ant/core/trunk/docs/manual/Tasks/mimemail.html Wed May 26 20:33:51 2010
@@ -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>

Modified: ant/core/trunk/docs/manual/Tasks/move.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/move.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/move.html (original)
+++ ant/core/trunk/docs/manual/Tasks/move.html Wed May 26 20:33:51 2010
@@ -32,11 +32,11 @@ destination file is overwritten if it al
 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
     <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
 <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 
 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>

Copied: ant/core/trunk/docs/manual/Tasks/native2ascii.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/native2ascii.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/native2ascii.html?p2=ant/core/trunk/docs/manual/Tasks/native2ascii.html&p1=ant/core/trunk/docs/manual/OptionalTasks/native2ascii.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/native2ascii.html (original)
+++ ant/core/trunk/docs/manual/Tasks/native2ascii.html Wed May 26 20:33:51 2010
@@ -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>,

Copied: ant/core/trunk/docs/manual/Tasks/netrexxc.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/netrexxc.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/netrexxc.html?p2=ant/core/trunk/docs/manual/Tasks/netrexxc.html&p1=ant/core/trunk/docs/manual/OptionalTasks/netrexxc.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/netrexxc.html (original)
+++ ant/core/trunk/docs/manual/Tasks/netrexxc.html Wed May 26 20:33:51 2010
@@ -47,7 +47,7 @@ excluded.  This is also done with patter
 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

Modified: ant/core/trunk/docs/manual/Tasks/pack.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/pack.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/pack.html (original)
+++ ant/core/trunk/docs/manual/Tasks/pack.html Wed May 26 20:33:51 2010
@@ -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>

Modified: ant/core/trunk/docs/manual/Tasks/pathconvert.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/pathconvert.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/pathconvert.html (original)
+++ ant/core/trunk/docs/manual/Tasks/pathconvert.html Wed May 26 20:33:51 2010
@@ -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> valu
 </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>

Copied: ant/core/trunk/docs/manual/Tasks/perforce.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/perforce.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/perforce.html?p2=ant/core/trunk/docs/manual/Tasks/perforce.html&p1=ant/core/trunk/docs/manual/OptionalTasks/perforce.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/perforce.html (original)
+++ ant/core/trunk/docs/manual/Tasks/perforce.html Wed May 26 20:33:51 2010
@@ -733,7 +733,7 @@ Lists files under Perforce control and f
   </tr>
   <tr>
     <td valign="top">fileset</td>
-    <td valign="top">one or several <a href="../CoreTypes/fileset.html">fileset(s)</a></td>
+    <td valign="top">one or several <a href="../Types/fileset.html">fileset(s)</a></td>
     <td valign="top" align="center">yes (at least one fileset is needed)</td>
   </tr>
 </table>

Copied: ant/core/trunk/docs/manual/Tasks/renameextensions.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/renameextensions.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/renameextensions.html?p2=ant/core/trunk/docs/manual/Tasks/renameextensions.html&p1=ant/core/trunk/docs/manual/OptionalTasks/renameextensions.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/renameextensions.html (original)
+++ ant/core/trunk/docs/manual/Tasks/renameextensions.html Wed May 26 20:33:51 2010
@@ -26,8 +26,8 @@
 
 <h2><a name="renameexts">RenameExtensions</a></h2>
 <h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated.  Use the <a href="../CoreTasks/move.html">move</a>
-task with a <a href="../CoreTypes/mapper.html#glob-mapper">glob mapper</a> instead.</i></p>
+<p><i>This task has been deprecated.  Use the <a href="../Tasks/move.html">move</a>
+task with a <a href="../Types/mapper.html#glob-mapper">glob mapper</a> instead.</i></p>
 <h3>Description</h3>
 <p>Renames files in the <code>srcDir</code> directory ending with the
 <code>fromExtension</code> string so that they end with the
@@ -37,7 +37,7 @@ task with a <a href="../CoreTypes/mapper
 <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.
-This task forms an implicit <a href="../CoreTypes/fileset.html">FileSet</a> and
+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

Modified: ant/core/trunk/docs/manual/Tasks/replace.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/replace.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/replace.html (original)
+++ ant/core/trunk/docs/manual/Tasks/replace.html Wed May 26 20:33:51 2010
@@ -138,12 +138,12 @@ have been regenerated by this task.</p> 
 <p>replaces occurrences of the string &quot;@@@&quot; with the string
 &quot;wombat&quot;, in the file <code>${src}/index.html</code>.</p>
 <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>
 <p>Since Ant 1.8.0 this task supports any filesystem
-  based <a href="../CoreTypes/resources.html#collection">resource
+  based <a href="../Types/resources.html#collection">resource
     collections</a> as nested elements.</p>
 <h4>replacetoken and replacevalue</h4>
 <p>If either the text you want to replace or the replacement text

Copied: ant/core/trunk/docs/manual/Tasks/replaceregexp.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/replaceregexp.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/replaceregexp.html?p2=ant/core/trunk/docs/manual/Tasks/replaceregexp.html&p1=ant/core/trunk/docs/manual/OptionalTasks/replaceregexp.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/replaceregexp.html (original)
+++ ant/core/trunk/docs/manual/Tasks/replaceregexp.html Wed May 26 20:33:51 2010
@@ -33,11 +33,11 @@ in a selected file or set of files.</p>
 file.  This prevents spurious rebuilds based on unchanged files which
 have been regenerated by this task.</p> 
 
-<p>Similar to <a href="../CoreTypes/mapper.html#regexp-mapper">regexp
+<p>Similar to <a href="../Types/mapper.html#regexp-mapper">regexp
 type mappers</a> this task needs a supporting regular expression
 library and an implementation of
 <code>org.apache.tools.ant.util.regexp.Regexp</code>.
-See details in the documentation of the <a href="../CoreTypes/regexp.html#implementation">Regexp Type</a>. </p>
+See details in the documentation of the <a href="../Types/regexp.html#implementation">Regexp Type</a>. </p>
 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
@@ -107,12 +107,12 @@ See details in the documentation of the 
 value, in the file <code>${src}/build.properties</code></p>
 
 <h3>Parameters specified as nested elements</h3>
-<p>This task supports a nested <a href="../CoreTypes/fileset.html">FileSet</a>
+<p>This task supports a nested <a href="../Types/fileset.html">FileSet</a>
    element.</p>
 <p>Since Ant 1.8.0 this task supports any filesystem
-  based <a href="../CoreTypes/resources.html#collection">resource
+  based <a href="../Types/resources.html#collection">resource
     collections</a> as nested elements.</p>
-<p>This task supports a nested <i><a href="../CoreTypes/regexp.html">Regexp</a></i> element to specify
+<p>This task supports a nested <i><a href="../Types/regexp.html">Regexp</a></i> element to specify
    the regular expression.  You can use this element to refer to a previously
    defined regular expression datatype instance.</p>
 <blockquote>

Modified: ant/core/trunk/docs/manual/Tasks/resourcecount.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/resourcecount.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/resourcecount.html (original)
+++ ant/core/trunk/docs/manual/Tasks/resourcecount.html Wed May 26 20:33:51 2010
@@ -28,7 +28,7 @@
 
 <h3>Description</h3>
 <p>Display or set a property containing the size of a nested
-   <a href="../CoreTypes/resources.html#collection">Resource Collection</a>.
+   <a href="../Types/resources.html#collection">Resource Collection</a>.
    Can also be used as a condition. <b>Since Ant 1.7</b></p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
@@ -68,7 +68,7 @@
 <h3>Parameters specified as nested elements</h3>
 <h4>Resource Collection</h4>
 <p>A single
-  <a href="../CoreTypes/resources.html#collection">Resource Collection</a>
+  <a href="../Types/resources.html#collection">Resource Collection</a>
 should be specified via a nested element or the <code>refid</code> attribute.
 </p>
 

Modified: ant/core/trunk/docs/manual/Tasks/rmic.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/rmic.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/rmic.html (original)
+++ ant/core/trunk/docs/manual/Tasks/rmic.html Wed May 26 20:33:51 2010
@@ -42,7 +42,7 @@ finally with the <i>defaultexcludes</i> 
 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>base</code>) as well as the nested
 <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and

Copied: ant/core/trunk/docs/manual/Tasks/schemavalidate.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/schemavalidate.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/schemavalidate.html?p2=ant/core/trunk/docs/manual/Tasks/schemavalidate.html&p1=ant/core/trunk/docs/manual/OptionalTasks/schemavalidate.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/schemavalidate.html (original)
+++ ant/core/trunk/docs/manual/Tasks/schemavalidate.html Wed May 26 20:33:51 2010
@@ -43,7 +43,7 @@ sources of schema documents, so you can 
 just need to list all schema URIs and their URL equivalents.
 
 <p>This task supports the use of nested
-  <li><a href="../CoreTypes/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a> elements</li>
+  <li><a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a> elements</li>
   <li> <tt>&lt;schema&gt;</tt> elements, that bind a namespace URI to a URL or a
   local filename.
   <li><tt>&lt;dtd&gt;</tt> elements which are used to resolve DTDs and entities.</li>
@@ -187,7 +187,7 @@ the document(s).
   </tr>
 </table>
 <h4>xmlcatalog</h4>
-<p>The <a href="../CoreTypes/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
+<p>The <a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
 element is used to perform entity resolution.</p>
 <h4>attribute</h4>
 <p>The <tt>&lt;attribute&gt;</tt> element is used to set parser features.<br>

Copied: ant/core/trunk/docs/manual/Tasks/scp.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/scp.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/scp.html?p2=ant/core/trunk/docs/manual/Tasks/scp.html&p1=ant/core/trunk/docs/manual/OptionalTasks/scp.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/scp.html (original)
+++ ant/core/trunk/docs/manual/Tasks/scp.html Wed May 26 20:33:51 2010
@@ -186,7 +186,7 @@ for more information.  This task has bee
 <h3>Parameters specified as nested elements</h3>
 
 <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 copy.
  To use a fileset, the <code>todir</code> attribute must be set.</p>
 

Copied: ant/core/trunk/docs/manual/Tasks/scriptdef.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/scriptdef.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/scriptdef.html?p2=ant/core/trunk/docs/manual/Tasks/scriptdef.html&p1=ant/core/trunk/docs/manual/OptionalTasks/scriptdef.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/scriptdef.html (original)
+++ ant/core/trunk/docs/manual/Tasks/scriptdef.html Wed May 26 20:33:51 2010
@@ -105,7 +105,7 @@ more information on writing scripts, ple
     <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>
@@ -201,7 +201,7 @@ more information on writing scripts, ple
 
   <h4>classpath</h4>
   <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>
 

Modified: ant/core/trunk/docs/manual/Tasks/sql.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/sql.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/sql.html (original)
+++ ant/core/trunk/docs/manual/Tasks/sql.html Wed May 26 20:33:51 2010
@@ -297,11 +297,11 @@ on the same schema.</p>
   </tr>
 </table>
 <p>The <code>&lt;transaction&gt;</code> element supports any <a
-href="../CoreTypes/resources.html">resource</a> or single element
+href="../Types/resources.html">resource</a> or single element
 resource collection as nested element to specify the resource
 containing the SQL statements.</p>
 
-<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>You can specify multiple sources via nested resource collection

Modified: ant/core/trunk/docs/manual/Tasks/style.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/style.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/style.html (original)
+++ ant/core/trunk/docs/manual/Tasks/style.html Wed May 26 20:33:51 2010
@@ -45,7 +45,7 @@ finally with the <i>defaultexcludes</i> 
 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 supports all
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports all
   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 <code>&lt;patternset&gt;</code> elements.</p>
@@ -61,13 +61,13 @@ been matched.  If this behavior is not w
 scanincludedirectories attribute to false.</p>
 
 <p>Starting with Ant 1.7 this task supports nested <a
-href="../CoreTypes/resources.html#collection">resource collection</a>s
+href="../Types/resources.html#collection">resource collection</a>s
 in addition to (or instead of, depending on the useImplicitFileset
 attribute) the implicit fileset formed by this task.</p>
 
 <p>This task supports the use of a nested <code>&lt;param&gt;</code> element which is used to pass values
   to an <code>&lt;xsl:param&gt;</code> declaration.</p>
-<p>This task supports the use of a nested <a href="../CoreTypes/xmlcatalog.html">xmlcatalog</a>
+<p>This task supports the use of a nested <a href="../Types/xmlcatalog.html">xmlcatalog</a>
 element which is used to perform Entity and URI resolution.</p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
@@ -260,7 +260,7 @@ element which is used to perform Entity 
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="../CoreTypes/resources.html#collection">resource
+<h4>any <a href="../Types/resources.html#collection">resource
 collection</a></h4>
 
 <p><em>since Ant 1.7</em></p>
@@ -275,7 +275,7 @@ nested <code>&lt;classpath&gt;</code>, a
 <a href="../using.html#path">path</a>-like structure.</p>
 
 <h4>xmlcatalog</h4>
-<p>The <a href="../CoreTypes/xmlcatalog.html">xmlcatalog</a>
+<p>The <a href="../Types/xmlcatalog.html">xmlcatalog</a>
 element is used to perform Entity and URI resolution.</p>
 
 <h4>param</h4>
@@ -406,7 +406,7 @@ And in Saxon 7.x:
 <p><em>since Ant 1.6.2</em></p>
 
 <p>You can define filename transformations by using a nested <a
-href="../CoreTypes/mapper.html">mapper</a> element. The default mapper
+href="../Types/mapper.html">mapper</a> element. The default mapper
 used by <code>&lt;xslt&gt;</code> removes the file extension from the
 source file and adds the extension specified via the extension
 attribute.</p>
@@ -416,7 +416,7 @@ attribute.</p>
 <p><em>Since Ant 1.7</em></p>
 
 <p>The nested style element can be used to specify your stylesheet in terms
-of Ant's <a href="../CoreTypes/resources.html">resource</a> types.  With
+of Ant's <a href="../Types/resources.html">resource</a> types.  With
 this element, the stylesheet should be specified as a nested resource or
 single-element collection.  Alternatively, use the <code>refid</code> to
 specify the resource or collection as a reference.</p>
@@ -433,7 +433,7 @@ for <a href="exec.html#env">environment 
 <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.8.0</em>.</p>
 

Modified: ant/core/trunk/docs/manual/Tasks/subant.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/subant.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/subant.html (original)
+++ ant/core/trunk/docs/manual/Tasks/subant.html Wed May 26 20:33:51 2010
@@ -288,7 +288,7 @@
       <tr><td>&nbsp;</td></tr>
       <tr><td bgcolor="#828DA6">
         <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>any filesystem based <a href="../CoreTypes/resources.html#collection">resource collection</a></strong></font>
+          <strong>any filesystem based <a href="../Types/resources.html#collection">resource collection</a></strong></font>
       </td></tr>
       <tr><td><blockquote>
         This includes <code>&lt;fileset&gt;</code>,

Copied: ant/core/trunk/docs/manual/Tasks/symlink.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/symlink.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/symlink.html?p2=ant/core/trunk/docs/manual/Tasks/symlink.html&p1=ant/core/trunk/docs/manual/OptionalTasks/symlink.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/symlink.html (original)
+++ ant/core/trunk/docs/manual/Tasks/symlink.html Wed May 26 20:33:51 2010
@@ -31,7 +31,7 @@ make an individual link, delete a link, 
 or create properties files describing links in the specified directories.
 Existing links are not overwritten by default.
 
-<p><a href="../CoreTypes/fileset.html">FileSet</a>s are used to select a
+<p><a href="../Types/fileset.html">FileSet</a>s are used to select a
 set of links to record, or a set of property files to create links from. </p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
@@ -86,7 +86,7 @@ set of links to record, or a set of prop
 <h3>Parameters specified as nested elements</h3>
  
 <h4>fileset</h4>
- <p><a href="../CoreTypes/fileset.html">FileSet</a>s
+ <p><a href="../Types/fileset.html">FileSet</a>s
  are used when action = "record" to select directories and linknames to be recorded. 
  They are also used when action = "recreate" to specify both the name of the property 
  files to be processed, and the directories in which they can be found. At least one 

Modified: ant/core/trunk/docs/manual/Tasks/sync.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/sync.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/sync.html (original)
+++ ant/core/trunk/docs/manual/Tasks/sync.html Wed May 26 20:33:51 2010
@@ -29,7 +29,7 @@
 <h3>Description</h3>
 
 <p>Synchronize a target directory from the files defined in one or
-more <a href="../CoreTypes/resources.html#collection">Resource Collection</a>s.</p>
+more <a href="../Types/resources.html#collection">Resource Collection</a>s.</p>
 
 <p>Any file in the target directory that has not been matched by at
 least one of the nested resource collections gets removed.  I.e. if you exclude a
@@ -97,7 +97,7 @@ dir, it will get removed from the target
 <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
@@ -112,7 +112,7 @@ directory even if they are not present i
 directories.</p>
 
 <p>This nested element is like a <a
-href="../CoreTypes/fileset.html">FileSet</a> except that it doesn't
+href="../Types/fileset.html">FileSet</a> except that it doesn't
 support the dir attribute and the usedefaultexcludes attribute
 defaults to false.</p>
 

Modified: ant/core/trunk/docs/manual/Tasks/tar.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/tar.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/tar.html (original)
+++ ant/core/trunk/docs/manual/Tasks/tar.html Wed May 26 20:33:51 2010
@@ -29,7 +29,7 @@
 <p>Creates a tar archive.</p>
 <p>The <i>basedir</i> attribute is the reference directory from where to tar.</p>
 <p>This task is a <a href="../dirtasks.html#directorybasedtasks">directory based task</a>
-and, as such, forms an implicit <a href="../CoreTypes/fileset.html">Fileset</a>. This
+and, as such, forms an implicit <a href="../Types/fileset.html">Fileset</a>. This
 defines which files, relative to the <i>basedir</i>, will be included in the
 archive. The tar task supports all the attributes of Fileset to refine the
 set of files to be included in the implicit fileset.</p>
@@ -131,8 +131,8 @@ or "bzip2".</p>
 <h3>Nested Elements</h3>
 
 The tar task supports nested <a
-href="../CoreTypes/tarfileset.html">tarfileset</a> elements. These are
-extended <a href="../CoreTypes/fileset.html">FileSets</a> which,
+href="../Types/tarfileset.html">tarfileset</a> elements. These are
+extended <a href="../Types/fileset.html">FileSets</a> which,
 in addition to the standard elements, support one additional
 attributes
 
@@ -151,7 +151,7 @@ attributes
 </table>
 
 <h4>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 archive.</p>
 <p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> has been
 supported as a nested element.</p>

Modified: ant/core/trunk/docs/manual/Tasks/touch.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/touch.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/touch.html (original)
+++ ant/core/trunk/docs/manual/Tasks/touch.html Wed May 26 20:33:51 2010
@@ -29,9 +29,9 @@
 
 <p>Changes the modification time of a resource and possibly creates it
 at the same time. In addition to working with a single file, this Task
-can also work on <a href="../CoreTypes/resources.html">resources</a> and
+can also work on <a href="../Types/resources.html">resources</a> and
 resource collections (which also includes directories).  Prior to Ant
-1.7 only FileSet or <a href="../CoreTypes/filelist.html">Filelist</a>
+1.7 only FileSet or <a href="../Types/filelist.html">Filelist</a>
 (since Ant 1.6) have been supported.</p>
 
 <h3>Parameters</h3>
@@ -97,7 +97,7 @@ not to filesets nested into a path or an
 collection.</p>
 
 <h4>mapper</h4>
-<p><em>Since Ant 1.6.3,</em> a nested <a href="../CoreTypes/mapper.html">
+<p><em>Since Ant 1.6.3,</em> a nested <a href="../Types/mapper.html">
     mapper</a> can be specified.  Files specified via nested
     <code>fileset</code>s, <code>filelist</code>s, or the <code>file</code>
     attribute are mapped using the specified mapper.  For each file mapped,

Copied: ant/core/trunk/docs/manual/Tasks/translate.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/translate.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/translate.html?p2=ant/core/trunk/docs/manual/Tasks/translate.html&p1=ant/core/trunk/docs/manual/OptionalTasks/translate.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/translate.html (original)
+++ ant/core/trunk/docs/manual/Tasks/translate.html Wed May 26 20:33:51 2010
@@ -72,7 +72,7 @@ modified after the destination file was 
 <em>New in Ant 1.6:</em><br>
 Line endings of source files are preserved in the translated files.
 </p>
-<p><a href="../CoreTypes/fileset.html">FileSet</a>s are used to select files to
+<p><a href="../Types/fileset.html">FileSet</a>s are used to select files to
 translate.
 </p>
 <h3>Parameters</h3>
@@ -155,7 +155,7 @@ translate.
 <h3>Parameters specified as nested elements</h3>
 
 <h4>fileset</h4>
- <p><a href="../CoreTypes/fileset.html">FileSets</a> are used to select files that
+ <p><a href="../Types/fileset.html">FileSets</a> are used to select files that
  contain keys for which value translated files are to be generated.
 </p>
 <h3>Examples</h3>

Modified: ant/core/trunk/docs/manual/Tasks/truncate.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/truncate.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/truncate.html (original)
+++ ant/core/trunk/docs/manual/Tasks/truncate.html Wed May 26 20:33:51 2010
@@ -30,7 +30,7 @@
 <p>Set the length of one or more files, as the intermittently available
 <code>truncate</code> Unix utility/function. In addition to working with
 a single file, this Task can also work on
-<a href="../CoreTypes/resources.html">resources</a> and resource collections.
+<a href="../Types/resources.html">resources</a> and resource collections.
 <strong>Since Ant 1.7.1</strong>.
 </p>
 

Modified: ant/core/trunk/docs/manual/Tasks/typedef.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/typedef.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/typedef.html (original)
+++ ant/core/trunk/docs/manual/Tasks/typedef.html Wed May 26 20:33:51 2010
@@ -36,7 +36,7 @@
   </p>
   <p>
     Data types are things like <a href="../using.html#path">paths</a> or
-    <a href="../CoreTypes/fileset.html">filesets</a> that can be defined at
+    <a href="../Types/fileset.html">filesets</a> that can be defined at
     the project level and referenced via their ID attribute.
     Custom data types usually need custom tasks to put them to good use.
   </p>
@@ -59,7 +59,7 @@
     
   <p>
     The xml format is described in the
-    <a href="../CoreTypes/antlib.html">Antlib</a> section.
+    <a href="../Types/antlib.html">Antlib</a> section.
   </p>
 
 <h3>Parameters</h3>
@@ -102,7 +102,7 @@
       are "properties" or "xml". If the value is "properties" the file/resource
       is a property file contains name to classname pairs. If the value
       is "xml", the file/resource is an xml file/resource structured according
-      to <a href="../CoreTypes/antlib.html">Antlib</a>.
+      to <a href="../Types/antlib.html">Antlib</a>.
       The default is "properties" unless the file/resource name ends with
       ".xml", in which case the format attribute will have the value "xml".
       <b>since Ant 1.6</b>

Modified: ant/core/trunk/docs/manual/Tasks/unpack.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/unpack.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/unpack.html (original)
+++ ant/core/trunk/docs/manual/Tasks/unpack.html Wed May 26 20:33:51 2010
@@ -55,7 +55,7 @@ does not exist.</p>
 </table>
 <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.</p>
@@ -106,7 +106,7 @@ is identical to
 <p>The same is also true for <code>&lt;bunzip2&gt;</code> and
 <code>&lt;bzip2resource&gt;</code>.  <code>&lt;copy&gt;</code> offers
 additional features like <a
-href="../CoreTypes/filterchain.html">filtering files</a> on the fly,
+href="../Types/filterchain.html">filtering files</a> on the fly,
 allowing a file to be mapped to multiple destinations, preserving the
 last modified time or a configurable file system timestamp
 granularity.</p>

Modified: ant/core/trunk/docs/manual/Tasks/unzip.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/unzip.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/unzip.html (original)
+++ ant/core/trunk/docs/manual/Tasks/unzip.html Wed May 26 20:33:51 2010
@@ -27,23 +27,23 @@
 <h2><a name="unzip">Unjar/Untar/Unwar/Unzip</a></h2>
 <h3>Description</h3>
 <p>Unzips a zip-, war-, or jar file.</p>
-<p><a href="../CoreTypes/patternset.html">PatternSet</a>s are used to select files to extract
+<p><a href="../Types/patternset.html">PatternSet</a>s are used to select files to extract
 <I>from</I> the archive.  If no patternset is used, all files are extracted.
 </p>
 
-<p><a href="../CoreTypes/resources.html#collection">Resource
+<p><a href="../Types/resources.html#collection">Resource
 Collection</a>s may be used to select archived files to perform
 unarchival upon.  Only file system based resource collections are
 supported by Unjar/Unwar/Unzip, this includes <a
-href="../CoreTypes/fileset.html">fileset</a>, <a
-href="../CoreTypes/filelist.html">filelist</a>, <a
+href="../Types/fileset.html">fileset</a>, <a
+href="../Types/filelist.html">filelist</a>, <a
 href="../using.html#path">path</a>, and <a
-href="../CoreTypes/resources.html#files">files</a>.
+href="../Types/resources.html#files">files</a>.
 Untar supports arbitrary resource collections.
 Prior to Ant 1.7 only fileset has been supported as a nested element.</p>
 
-<p>You can define filename transformations by using a nested <a href="../CoreTypes/mapper.html">mapper</a> element.  The default mapper is the
-<a href="../CoreTypes/mapper.html#identity-mapper">identity mapper</a>.
+<p>You can define filename transformations by using a nested <a href="../Types/mapper.html">mapper</a> element.  The default mapper is the
+<a href="../Types/mapper.html#identity-mapper">identity mapper</a>.
 </p>
 <p>File permissions will not be restored on extracted files.</p>
 <p>The untar task recognizes the long pathname entries used by GNU tar.<p>
@@ -205,7 +205,7 @@ is identical to
 
 <p>The same is also true for <code>&lt;untar&gt;</code> and
 <code>&lt;tarfileset&gt;</code>.  <code>&lt;copy&gt;</code> offers
-additional features like <a href="../CoreTypes/filterchain.html">filtering files</a> on the fly,
+additional features like <a href="../Types/filterchain.html">filtering files</a> on the fly,
 allowing a file to be mapped to multiple destinations or a
 configurable file system timestamp granularity.</p>
 

Modified: ant/core/trunk/docs/manual/Tasks/uptodate.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/uptodate.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/uptodate.html (original)
+++ ant/core/trunk/docs/manual/Tasks/uptodate.html Wed May 26 20:33:51 2010
@@ -30,16 +30,16 @@
 than a source file or set of source files. A single source file is specified
 using the <code>srcfile</code> attribute. A set of source files is specified
 using the nested <code>&lt;srcfiles&gt;</code>
-elements. These are <a href="../CoreTypes/fileset.html">FileSet</a>s,
+elements. These are <a href="../Types/fileset.html">FileSet</a>s,
 whereas multiple target files are specified using a nested
-<a href="../CoreTypes/mapper.html"><code>&lt;mapper&gt;</code></a> element.</p>
+<a href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a> element.</p>
 <p>By default, the value of the property is set to <code>true</code> if
 the timestamp of the source file(s) is not more recent than the timestamp of
 the corresponding target file(s). You can set the value to something other
 than the default by specifying the <code>value</code> attribute.</p>
 <p>If a <code>&lt;srcfiles&gt;</code> element is used, without also specifying
 a <code>&lt;mapper&gt;</code> element, the default behavior is to use a
-<a href="../CoreTypes/mapper.html#merge-mapper">merge mapper</a>, with the
+<a href="../Types/mapper.html#merge-mapper">merge mapper</a>, with the
 <code>to</code> attribute set to the value of the
 <code>targetfile</code> attribute.</p>
 <p>Normally, this task is used to set properties that are useful to avoid
@@ -79,7 +79,7 @@ target execution depending on the relati
 <h3>Parameters specified as nested elements</h3>
 <h4><a name="srcfiles">srcfiles</a></h4>
 <p>The nested <code>&lt;srcfiles&gt;</code> element is a
-<a href="../CoreTypes/fileset.html">fileset</a> and allows you to
+<a href="../Types/fileset.html">fileset</a> and allows you to
 specify a set of files to check against the target file(s).</p>
 
 <p><strong>Note:</strong> You can specify either the <code>srcfile</code>
@@ -92,7 +92,7 @@ attribute or nested <code>&lt;srcfiles&g
 
 <h4><a name="srcresources">srcresources</a></h4>
 <p>The nested <code>&lt;srcresources&gt;</code> element is a <a
-href="../CoreTypes/resources.html#union">union</a> and allows you to
+href="../Types/resources.html#union">union</a> and allows you to
 specify a collection of resources to check against the target file(s).
 <em>Since Ant 1.7</em></p>
 

Modified: ant/core/trunk/docs/manual/Tasks/war.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/war.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/war.html (original)
+++ ant/core/trunk/docs/manual/Tasks/war.html Wed May 26 20:33:51 2010
@@ -273,24 +273,24 @@ to a value other than its default, <code
 
 <h4>lib</h4>
 <p>The nested <code>lib</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>WEB-INF/lib</code> directory of the war file.</p>
 
 <h4>classes</h4>
 <p>The nested <code>classes</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>WEB-INF/classes</code> directory of the war file.</p>
 
 <h4>webinf</h4>
 <p>The nested <code>webinf</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>WEB-INF</code> directory of the war file. If this
 fileset includes a file named <code>web.xml</code>, the file is
 ignored and you will get a warning.</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 war file. If this
 fileset includes a file named <code>MANIFEST.MF</code>, the file is
 ignored and you will get a warning.</p>

Modified: ant/core/trunk/docs/manual/Tasks/xmlproperty.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/xmlproperty.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/xmlproperty.html (original)
+++ ant/core/trunk/docs/manual/Tasks/xmlproperty.html Wed May 26 20:33:51 2010
@@ -155,10 +155,10 @@ is roughly equivalent to the following f
 
 <h3><a name="nested">Nested Elements</a></h3>
 <h4>xmlcatalog</h4>
-<p>The <a href="../CoreTypes/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
+<p>The <a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
 element is used to perform entity resolution.</p>
 
-<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 input.</p>

Copied: ant/core/trunk/docs/manual/Tasks/xmlvalidate.html (from r948529, ant/core/trunk/docs/manual/OptionalTasks/xmlvalidate.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/xmlvalidate.html?p2=ant/core/trunk/docs/manual/Tasks/xmlvalidate.html&p1=ant/core/trunk/docs/manual/OptionalTasks/xmlvalidate.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/xmlvalidate.html (original)
+++ ant/core/trunk/docs/manual/Tasks/xmlvalidate.html Wed May 26 20:33:51 2010
@@ -32,7 +32,7 @@ task uses the SAX2 parser implementation
 SAX1/2 parser if needed.</p>
 
 <p>This task supports the use of nested
-  <li><a href="../CoreTypes/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a> elements</li>
+  <li><a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a> elements</li>
   <li><tt>&lt;dtd&gt;</tt> elements which are used to resolve DTDs and entities</li>
   <li><tt>&lt;attribute&gt;</tt> elements which are used to set features on the parser.
       These can be any number of
@@ -122,7 +122,7 @@ may not apply.</p>
   </tr>
 </table>
 <h4>xmlcatalog</h4>
-<p>The <a href="../CoreTypes/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
+<p>The <a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
 element is used to perform entity resolution.</p>
 <h4>attribute</h4>
 <p>The <tt>&lt;attribute&gt;</tt> element is used to set parser features.<br>

Modified: ant/core/trunk/docs/manual/Tasks/zip.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/zip.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/zip.html (original)
+++ ant/core/trunk/docs/manual/Tasks/zip.html Wed May 26 20:33:51 2010
@@ -38,7 +38,7 @@ finally with the <i>defaultexcludes</i> 
 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
@@ -79,7 +79,7 @@ see <a href="#encoding">below</a></p>
 
 <p>Starting with Ant 1.5.2, <code>&lt;zip&gt;</code> can store Unix permissions
 inside the archive (see description of the filemode and dirmode
-attributes for <a href="../CoreTypes/zipfileset.html">&lt;zipfileset&gt;</a>).
+attributes for <a href="../Types/zipfileset.html">&lt;zipfileset&gt;</a>).
 Unfortunately there is no portable way to store these permissions.
 Ant uses the algorithm used by <a href="http://www.info-zip.org">Info-Zip's</a>
 implementation of the zip and unzip commands - these are the default
@@ -387,7 +387,7 @@ archive.</p>
 <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 files to archive.</p>
 <p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> and
 <code>&lt;zipfileset&gt;</code> have been supported as nested elements.</p>
@@ -399,7 +399,7 @@ merged into the archive. Each file found
 the same way that <i>zipfileset src</i> files are added.</p>
 
 <p><code>&lt;zipgroupfileset&gt;</code> is
-  a <a href="../CoreTypes/fileset.html">fileset</a> and supports all
+  a <a href="../Types/fileset.html">fileset</a> and supports all
   of its attributes and nested elements.</a>
 
 <h3>Examples</h3>

Modified: ant/core/trunk/docs/manual/Types/antlib.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/antlib.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/antlib.html (original)
+++ ant/core/trunk/docs/manual/Types/antlib.html Wed May 26 20:33:51 2010
@@ -31,7 +31,7 @@
       An antlib file is an xml file with a root element of "antlib".
       Antlib's elements are ant definition tasks - like
       
-      and <a href="../CoreTasks/taskdef.html">Taskdef</a>,
+      and <a href="../Tasks/taskdef.html">Taskdef</a>,
       or any ant task that extends
       <code>org.apache.tools.ant.taskdefs.AntlibDefinition</code>.
     </p>
@@ -39,15 +39,15 @@
         The current set of declarations bundled with Ant that do this are:
     </p>
         <ol>
-            <li><a href="../CoreTasks/typedef.html">Typedef</a>
+            <li><a href="../Tasks/typedef.html">Typedef</a>
             </li>
-            <li><a href="../CoreTasks/taskdef.html">Taskdef</a>
+            <li><a href="../Tasks/taskdef.html">Taskdef</a>
             </li>
-            <li><a href="../CoreTasks/macrodef.html">Macrodef</a>
+            <li><a href="../Tasks/macrodef.html">Macrodef</a>
             </li>
-            <li><a href="../CoreTasks/presetdef.html">Presetdef</a>
+            <li><a href="../Tasks/presetdef.html">Presetdef</a>
             </li>
-            <li><a href="../OptionalTasks/scriptdef.html">Scriptdef</a>
+            <li><a href="../Tasks/scriptdef.html">Scriptdef</a>
             </li>
         </ol>
     <p>

Modified: ant/core/trunk/docs/manual/Types/assertions.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/assertions.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/assertions.html (original)
+++ ant/core/trunk/docs/manual/Types/assertions.html Wed May 26 20:33:51 2010
@@ -28,8 +28,8 @@
 <p>
 The <tt>assertions</tt> type enables or disables the Java 1.4 assertions feature,
 on a whole Java program, or components of a program. It can be used
-in <a href="../CoreTasks/java.html"><code>&lt;java&gt;</code></a> and
-<a href="../OptionalTasks/junit.html"><code>&lt;junit&gt;</code></a> to add extra validation to code.  
+in <a href="../Tasks/java.html"><code>&lt;java&gt;</code></a> and
+<a href="../Tasks/junit.html"><code>&lt;junit&gt;</code></a> to add extra validation to code.  
 
 <p>
 Assertions are covered in the 

Copied: ant/core/trunk/docs/manual/Types/classfileset.html (from r948529, ant/core/trunk/docs/manual/OptionalTypes/classfileset.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/classfileset.html?p2=ant/core/trunk/docs/manual/Types/classfileset.html&p1=ant/core/trunk/docs/manual/OptionalTypes/classfileset.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTypes/classfileset.html (original)
+++ ant/core/trunk/docs/manual/Types/classfileset.html Wed May 26 20:33:51 2010
@@ -41,7 +41,7 @@ This type requires the <code>jakarta-BCE
 <h3>Attributes</h3>
 <p>The class fileset support the following attributes in addition
 to those supported by the 
-<a href="../CoreTypes/fileset.html">standard fileset</a>:
+<a href="../Types/fileset.html">standard fileset</a>:
 </p>
  
 <table border="1" cellpadding="2" cellspacing="0">

Copied: ant/core/trunk/docs/manual/Types/extensionset.html (from r948529, ant/core/trunk/docs/manual/OptionalTypes/extensionset.html)
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/extensionset.html?p2=ant/core/trunk/docs/manual/Types/extensionset.html&p1=ant/core/trunk/docs/manual/OptionalTypes/extensionset.html&r1=948529&r2=948574&rev=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTypes/extensionset.html (original)
+++ ant/core/trunk/docs/manual/Types/extensionset.html Wed May 26 20:33:51 2010
@@ -39,7 +39,7 @@ http://java.sun.com/j2se/1.3/docs/guide/
 <p><a href="extension.html">Extension</a> object to add to set.</p>
 
 <h4>fileset</h4>
- <p><a href="../CoreTypes/fileset.html">FileSet</a>s all files contained
+ <p><a href="../Types/fileset.html">FileSet</a>s all files contained
  contained within set that are jars and implement an extension are added
  to extension set.</p>
 

Modified: ant/core/trunk/docs/manual/Types/filterchain.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/filterchain.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/filterchain.html (original)
+++ ant/core/trunk/docs/manual/Types/filterchain.html Wed May 26 20:33:51 2010
@@ -98,11 +98,11 @@ is equivalent to:
 </pre></blockquote>
 
 The following built-in tasks support nested <code>&lt;filterchain&gt;</code> elements.<br>
-<a href="../CoreTasks/concat.html">Concat</a>,<br>
-<a href="../CoreTasks/copy.html">Copy</a>,<br>
-<a href="../CoreTasks/loadfile.html">LoadFile</a>,<br>
-<a href="../CoreTasks/loadproperties.html">LoadProperties</a>,<br>
-<a href="../CoreTasks/move.html">Move</a><br><br>
+<a href="../Tasks/concat.html">Concat</a>,<br>
+<a href="../Tasks/copy.html">Copy</a>,<br>
+<a href="../Tasks/loadfile.html">LoadFile</a>,<br>
+<a href="../Tasks/loadproperties.html">LoadProperties</a>,<br>
+<a href="../Tasks/move.html">Move</a><br><br>
 
 A FilterChain is formed by defining zero or more of the following
 nested elements.<br>
@@ -124,7 +124,7 @@ nested elements.<br>
 <a href="#deletecharacters">DeleteCharacters</a><br>
 <a href="#concatfilter">ConcatFilter</a><br>
 <a href="#tokenfilter">TokenFilter</a><br>
-<a href="../CoreTasks/fixcrlf.html">FixCRLF</a><br>
+<a href="../Tasks/fixcrlf.html">FixCRLF</a><br>
 <a href="#sortfilter">SortFilter</a><br>
 
 <h3><a name="filterreader">FilterReader</a></h3>
@@ -1282,7 +1282,7 @@ concerning the choice of the implementat
   <tr>
     <td vAlign=top>flags</td>
     <td vAlign=top>See
-<a href="../OptionalTasks/replaceregexp.html">ReplaceRegexp</a>
+<a href="../Tasks/replaceregexp.html">ReplaceRegexp</a>
 for an explanation of regex flags.</td>
     <td vAlign=top align="center">No</td>
   </tr>
@@ -1329,7 +1329,7 @@ concerning the choice of regular express
   <tr>
     <td vAlign=top>flags</td>
     <td vAlign=top>See
-<a href="../OptionalTasks/replaceregexp.html">ReplaceRegexp</a>
+<a href="../Tasks/replaceregexp.html">ReplaceRegexp</a>
 for an explanation of regex flags.</td>
     <td vAlign=top align="center">No</td>
   </tr>
@@ -1416,7 +1416,7 @@ This is an optional filter that executes
   or
   <a href="https://scripting.dev.java.net">JSR 223</a>
 supported language.</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>
 <p>
@@ -1443,7 +1443,7 @@ Must be a supported Apache BSF or JSR 22
     <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>
@@ -1476,7 +1476,7 @@ Must be a supported Apache BSF or JSR 22
 </table>
   <p>
     This filter can take a nested &lt;classpath&gt; element.
-    See the <a href="../OptionalTasks/script.html">script</a> task
+    See the <a href="../Tasks/script.html">script</a> task
     on how to use this element.
   </p>
 <h4>Examples:</h4>

Modified: ant/core/trunk/docs/manual/Types/mapper.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/mapper.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/mapper.html (original)
+++ ant/core/trunk/docs/manual/Types/mapper.html Wed May 26 20:33:51 2010
@@ -27,7 +27,7 @@
 <h2><a name="mapper">Mapping File Names</a></h2>
 <p>Some tasks take source files and create target files. Depending on
 the task, it may be quite obvious which name a target file will have
-(using <a href="../CoreTasks/javac.html">javac</a>, you know there will be
+(using <a href="../Tasks/javac.html">javac</a>, you know there will be
 <code>.class</code> files for your <code>.java</code> files) - in
 other cases you may want to specify the target files, either to help
 Ant or to get an extra bit of functionality.</p>
@@ -95,7 +95,7 @@ instead.
 a <a href="../using.html#path">path</a>-like structure.</p>
 <p><b>Since Ant 1.7.0,</b> nested File Mappers can
 be supplied via either <CODE>&lt;mapper&gt;</CODE> elements or
-<a href="../CoreTasks/typedef.html"><code>&lt;typedef&gt;</code></a>'d
+<a href="../Tasks/typedef.html"><code>&lt;typedef&gt;</code></a>'d
 implementations of <CODE>org.apache.tools.ant.util.FileNameMapper</CODE>.
 If nested File Mappers are specified by either means, the mapper will be
 implicitly configured as a <a href="#composite-mapper">composite mapper</a>.
@@ -762,7 +762,7 @@ supported language, once per file to map
 The script can be declared inline or in a specified file.
 </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>
 
@@ -783,7 +783,7 @@ an explanation of scripts and dependenci
       <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>
@@ -817,7 +817,7 @@ an explanation of scripts and dependenci
     </table>
   <p>
     This filename mapper can take a nested &lt;classpath&gt; element.
-    See the <a href="../OptionalTasks/script.html">script</a> task
+    See the <a href="../Tasks/script.html">script</a> task
     on how to use this element.
   </p>
 

Modified: ant/core/trunk/docs/manual/Types/redirector.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/redirector.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/redirector.html (original)
+++ ant/core/trunk/docs/manual/Types/redirector.html Wed May 26 20:33:51 2010
@@ -26,7 +26,7 @@
 
 <h2><a name="redirector">I/O redirection</a></h2>
 <p>For many tasks, input and output can be defined in a fairly
-straightforward fashion.  The <a href="../CoreTasks/exec.html">exec</a>
+straightforward fashion.  The <a href="../Tasks/exec.html">exec</a>
 task, used to execute an external process, stands as a very
 basic example.  The executed process may accept input, produce
 output, or do either or both depending upon various circumstances.
@@ -169,9 +169,9 @@ applied to the error output.</p>
 <h3>Usage</h3>
 Tasks known to support I/O redirection:
 <ul>
-<li><a href="../CoreTasks/exec.html">Exec</a></li>
-<li><a href="../CoreTasks/apply.html">Apply</a></li>
-<li><a href="../CoreTasks/java.html">Java</a></li>
+<li><a href="../Tasks/exec.html">Exec</a></li>
+<li><a href="../Tasks/apply.html">Apply</a></li>
+<li><a href="../Tasks/java.html">Java</a></li>
 </ul>
 <p>The expected behavior of a <code>&lt;redirector&gt;</code> is to a great degree
 dependent on the supporting task.  Any possible points of confusion

Modified: ant/core/trunk/docs/manual/Types/regexp.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/regexp.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/regexp.html (original)
+++ ant/core/trunk/docs/manual/Types/regexp.html Wed May 26 20:33:51 2010
@@ -96,7 +96,7 @@ both Unix and Windows platforms before y
 <h3>Usage</h3>
 The following tasks and types use the Regexp type :
 <ul>
-<li><a href="../OptionalTasks/replaceregexp.html">ReplaceRegExp task</a></li>
+<li><a href="../Tasks/replaceregexp.html">ReplaceRegExp task</a></li>
 <li><a href="filterchain.html#linecontainsregexp">LineContainsRegexp filter</a></li>
 </ul>
 <p>

Modified: ant/core/trunk/docs/manual/Types/resources.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/resources.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/resources.html (original)
+++ ant/core/trunk/docs/manual/Types/resources.html Wed May 26 20:33:51 2010
@@ -339,7 +339,7 @@ Ant's "legacy" datatypes have been modif
 </p>
 <p>Strangely, some tasks can even legitimately behave as resource collections:
 <ul>
-  <li><a href="../CoreTasks/concat.html">concat</a>
+  <li><a href="../Tasks/concat.html">concat</a>
     exposes a concatenated resource, and adds e.g.
     <a href="filterchain.html">filtering</a>
     to Ant's resource-related capabilities.
@@ -1159,7 +1159,7 @@ larger collection. <strong>Since Ant 1.7
   archives.</p>
 
 <p>This resource collection is a generalization
-  of <a href="../CoreTasks/zip.html#zipgroupfileset">zipgroupfileset</a>
+  of <a href="../Tasks/zip.html#zipgroupfileset">zipgroupfileset</a>
   which is only supported by the zip family of tasks.</p>
 
 <p><em>archives</em> doesn't support any attributes.</p>

Modified: ant/core/trunk/docs/manual/Types/selectors.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/selectors.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/selectors.html (original)
+++ ant/core/trunk/docs/manual/Types/selectors.html Wed May 26 20:33:51 2010
@@ -1010,7 +1010,7 @@
         or
         <a href="https://scripting.dev.java.net">JSR 223</a>
         supported language.
-        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>
       <p>
@@ -1031,7 +1031,7 @@
           <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>
@@ -1063,7 +1063,7 @@
       </table>
   <p>
     This selector can take a nested &lt;classpath&gt; element.
-    See the <a href="../OptionalTasks/script.html">script</a> task
+    See the <a href="../Tasks/script.html">script</a> task
     on how to use this element.
   </p>
       <p>

Modified: ant/core/trunk/docs/manual/Types/tarfileset.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/tarfileset.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/tarfileset.html (original)
+++ ant/core/trunk/docs/manual/Types/tarfileset.html Wed May 26 20:33:51 2010
@@ -138,7 +138,7 @@ may be used to specify a subset of the a
 archive as with the <i>dir</i> attribute.</p>
 
 <p>Please note that currently only the <a
-href="../CoreTasks/tar.html">tar</a> task uses the permission and
+href="../Tasks/tar.html">tar</a> task uses the permission and
 ownership attributes.</p>
 
 <h3>Parameters specified as nested elements</h3>

Modified: ant/core/trunk/docs/manual/Types/zipfileset.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/zipfileset.html?rev=948574&r1=948529&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Types/zipfileset.html (original)
+++ ant/core/trunk/docs/manual/Types/zipfileset.html Wed May 26 20:33:51 2010
@@ -119,8 +119,8 @@ may be used to specify a subset of the a
 archive as with the <i>dir</i> attribute.</p>
 
 <p>Please note that currently only the <a
-href="../CoreTasks/tar.html">tar</a> and <a
-href="../CoreTasks/zip.html">zip</a> tasks use the permission.</p>
+href="../Tasks/tar.html">tar</a> and <a
+href="../Tasks/zip.html">zip</a> tasks use the permission.</p>
 
 <h3>Parameters specified as nested elements</h3>
 

Modified: ant/core/trunk/docs/manual/anttaskslist.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/anttaskslist.html?rev=948574&r1=948573&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/anttaskslist.html (original)
+++ ant/core/trunk/docs/manual/anttaskslist.html Wed May 26 20:33:51 2010
@@ -31,8 +31,7 @@
 <h3>Ant Tasks</h3>
 <ul class="inlinelist">
 <li><a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a></li>
-<li><a href="coretasklist.html" target="navFrame">Core Tasks</a></li>
-<li><a href="optionaltasklist.html" target="navFrame">Optional Tasks</a></li>
+<li><a href="tasklist.html" target="navFrame">List of Tasks</a></li>
 <div style="padding-left:1em">
   <li><a href="install.html#librarydependencies" target="mainFrame">Library Dependencies</a></li>
 </div>

Modified: ant/core/trunk/docs/manual/clonevm.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/clonevm.html?rev=948574&r1=948573&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/clonevm.html (original)
+++ ant/core/trunk/docs/manual/clonevm.html Wed May 26 20:33:51 2010
@@ -30,8 +30,8 @@
 
 <p>The value of the ant.build.clonevm system property controls how Ant
 instruments forked Java Virtual Machines.  The <a
-href="CoreTasks/java.html">java</a> and <a
-href="OptionalTasks/junit.html">junit</a> tasks support clonevm
+href="Tasks/java.html">java</a> and <a
+href="Tasks/junit.html">junit</a> tasks support clonevm
 attributes to control the VMs on a task-by-task basis while the system
 property applies to all forked Java VMs.</p>
 

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

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

Modified: ant/core/trunk/docs/manual/dirtasks.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/dirtasks.html?rev=948574&r1=948573&r2=948574&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/dirtasks.html (original)
+++ ant/core/trunk/docs/manual/dirtasks.html Wed May 26 20:33:51 2010
@@ -26,11 +26,11 @@
 
 <h2><a name="directorybasedtasks">Directory-based Tasks</a></h2>
 <p>Some tasks use directory trees for the actions they perform.
-For example, the <a href="CoreTasks/javac.html">javac</a> task, which
+For example, the <a href="Tasks/javac.html">javac</a> task, which
 compiles a directory tree with <code>.java</code> files into
 <code>.class</code> files, is one of these directory-based tasks. Because
 some of these tasks do so much work with a directory tree, the task itself
-can act as an implicit <a href="CoreTypes/fileset.html">FileSet</a>.</p>
+can act as an implicit <a href="Types/fileset.html">FileSet</a>.</p>
 <p>Whether the fileset is implicit or not, it can often be very useful to
 work on a subset of the directory tree. This section describes how you can
 select a subset of such a directory tree when using one of these
@@ -41,16 +41,16 @@ which can be used at the same time:</p>
   <li>Only include files and directories that match any
     <code>include</code> patterns and do not match any
     <code>exclude</code> patterns in a given
-    <a href="CoreTypes/patternset.html">PatternSet</a>.</li>
+    <a href="Types/patternset.html">PatternSet</a>.</li>
   <li>Select files based on selection criteria defined by a collection of
-    <a href="CoreTypes/selectors.html">selector</a> nested elements.</li>
+    <a href="Types/selectors.html">selector</a> nested elements.</li>
 </ul>
 <h3><a name="patternset">Patternset</a></h3>
 
 <p>We said that Directory-based tasks can sometimes act as an implicit
-<a href="CoreTypes/fileset.html"><code>&lt;fileset&gt;</code></a>,
+<a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
 but in addition to that, a FileSet acts as an implicit
-<a href="CoreTypes/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
+<a href="Types/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
 
 <p>The inclusion and exclusion elements of the implicit PatternSet can be
 specified inside the directory-based task (or explicit fileset) via
@@ -190,13 +190,13 @@ For example, <code>mypackage/test/</code
 way to select just the files you want.</p>
 
 <h3><a name="selectors">Selectors</a></h3>
-<p>The <a href="CoreTypes/fileset.html"><code>&lt;fileset&gt;</code></a>,
+<p>The <a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
 whether implicit or explicit in the
 directory-based task, also acts as an
-<a href="CoreTypes/selectors.html#andselect"><code>&lt;and&gt;</code></a>
+<a href="Types/selectors.html#andselect"><code>&lt;and&gt;</code></a>
 selector container. This can be used to create arbitrarily complicated
 selection criteria for the files the task should work with. See the
-<a href="CoreTypes/selectors.html">Selector</a> documentation for more
+<a href="Types/selectors.html">Selector</a> documentation for more
 information.</p>
 
 <h3><a name="tasklist">Standard Tasks/Filesets</a></h3>
@@ -204,32 +204,32 @@ information.</p>
 the rules given here. This list, a subset of those, is a list of standard ant
 tasks that can act as an implicit fileset:</p>
 <ul>
-      <li><a href="CoreTasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
-  <li><a href="CoreTasks/copydir.html"><code>&lt;copydir&gt;</code></a> (deprecated)</li>
-  <li><a href="CoreTasks/delete.html"><code>&lt;delete&gt;</code></a></li>
-  <li><a href="CoreTasks/dependset.html"><code>&lt;dependset&gt;</code></a></li>
-  <li><a href="CoreTasks/fixcrlf.html"><code>&lt;fixcrlf&gt;</code></a></li>
-  <li><a href="CoreTasks/javac.html"><code>&lt;javac&gt;</code></a></li>
-  <li><a href="CoreTasks/replace.html"><code>&lt;replace&gt;</code></a></li>
-  <li><a href="CoreTasks/rmic.html"><code>&lt;rmic&gt;</code></a></li>
-  <li><a href="CoreTasks/style.html"><code>&lt;style&gt;</code> (aka <code>&lt;xslt&gt;</code>)</a></li>
-  <li><a href="CoreTasks/tar.html"><code>&lt;tar&gt;</code></a></li>
-  <li><a href="CoreTasks/zip.html"><code>&lt;zip&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ddcreator"><code>&lt;ddcreator&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ejbjar"><code>&lt;ejbjar&gt;</code></a></li>
-  <li><a href="OptionalTasks/ejb.html#ejbc"><code>&lt;ejbc&gt;</code></a></li>
-  <li><a href="OptionalTasks/cab.html"><code>&lt;cab&gt;</code></a></li>
-  <li><a href="OptionalTasks/native2ascii.html"><code>&lt;native2ascii&gt;</code></a></li>
-  <li><a href="OptionalTasks/netrexxc.html"><code>&lt;netrexxc&gt;</code></a></li>
+      <li><a href="Tasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
+  <li><a href="Tasks/copydir.html"><code>&lt;copydir&gt;</code></a> (deprecated)</li>
+  <li><a href="Tasks/delete.html"><code>&lt;delete&gt;</code></a></li>
+  <li><a href="Tasks/dependset.html"><code>&lt;dependset&gt;</code></a></li>
+  <li><a href="Tasks/fixcrlf.html"><code>&lt;fixcrlf&gt;</code></a></li>
+  <li><a href="Tasks/javac.html"><code>&lt;javac&gt;</code></a></li>
+  <li><a href="Tasks/replace.html"><code>&lt;replace&gt;</code></a></li>
+  <li><a href="Tasks/rmic.html"><code>&lt;rmic&gt;</code></a></li>
+  <li><a href="Tasks/style.html"><code>&lt;style&gt;</code> (aka <code>&lt;xslt&gt;</code>)</a></li>
+  <li><a href="Tasks/tar.html"><code>&lt;tar&gt;</code></a></li>
+  <li><a href="Tasks/zip.html"><code>&lt;zip&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ddcreator"><code>&lt;ddcreator&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ejbjar"><code>&lt;ejbjar&gt;</code></a></li>
+  <li><a href="Tasks/ejb.html#ejbc"><code>&lt;ejbc&gt;</code></a></li>
+  <li><a href="Tasks/cab.html"><code>&lt;cab&gt;</code></a></li>
+  <li><a href="Tasks/native2ascii.html"><code>&lt;native2ascii&gt;</code></a></li>
+  <li><a href="Tasks/netrexxc.html"><code>&lt;netrexxc&gt;</code></a></li>
   <li>
-    <a href="OptionalTasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a>
+    <a href="Tasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a>
   </li>
-  <li><a href="OptionalTasks/depend.html"><code>&lt;depend&gt;</code></a></li>
-  <li><a href="OptionalTasks/translate.html"><code>&lt;translate&gt;</code></a></li>
-  <li><a href="OptionalTasks/image.html"><code>&lt;image&gt;</code></a></li>
-  <li><a href="OptionalTasks/jlink.html"><code>&lt;jlink&gt;</code></a> (deprecated)</li>
-  <li><a href="OptionalTasks/jspc.html"><code>&lt;jspc&gt;</code></a></li>
-  <li><a href="OptionalTasks/wljspc.html"><code>&lt;wljspc&gt;</code></a></li>
+  <li><a href="Tasks/depend.html"><code>&lt;depend&gt;</code></a></li>
+  <li><a href="Tasks/translate.html"><code>&lt;translate&gt;</code></a></li>
+  <li><a href="Tasks/image.html"><code>&lt;image&gt;</code></a></li>
+  <li><a href="Tasks/jlink.html"><code>&lt;jlink&gt;</code></a> (deprecated)</li>
+  <li><a href="Tasks/jspc.html"><code>&lt;jspc&gt;</code></a></li>
+  <li><a href="Tasks/wljspc.html"><code>&lt;wljspc&gt;</code></a></li>
 </ul>
 
 <h3><a name="examples">Examples</a></h3>
@@ -288,7 +288,7 @@ attribute.</p>
 
 <p>This is the default list; note that you can modify the list of
 default excludes by using the <a
-href="CoreTasks/defaultexcludes.html">defaultexcludes</a> task.</p>
+href="Tasks/defaultexcludes.html">defaultexcludes</a> task.</p>
 
 
 



Mime
View raw message