http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/install.html
----------------------------------------------------------------------
diff --git a/doc/use/install.html b/doc/use/install.html
deleted file mode 100644
index 6066109..0000000
--- a/doc/use/install.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-Installs a module and all its dependencies in a resolver. <span 
class="since">since 1.3</span>
-
-The module to install should be available in a resolver, and will be installed 
in another resolver which should support publish.
-
-This is particularly useful for users who only have a private repository, and 
want to benefit from public repositories from time to time. In this case, when 
a module is missing in the private repository, a call to install let download 
the module from a public repository not usually used for dependency resolution, 
and install it and its dependencies in the private repository.
-
-For more details about this task and its usage see the <a 
href="../tutorial/build-repository.html">build repository tutorial</a>
-  
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>from</td><td>the name of the resolver in which the module must be 
found</td>
-        <td>Yes</td></tr>
-    <tr><td>to</td><td>the name of the resolver in which the module must be 
installed</td>
-        <td>Yes</td></tr>
-    <tr><td>organisation</td><td>the name of the organisation of the module to 
install</td>
-        <td>Yes</td></tr>
-    <tr><td>module</td><td>the name of the module to install</td>
-        <td>Yes</td></tr>
-    <tr><td>branch</td><td>the branch of the module to install <span 
class="since">since 2.0</span></td>
-        <td>No, defaults to default branch with exact matcher, '*' with any 
other matcher</td></tr>
-    <tr><td>revision</td><td>the revision of the module to install</td>
-        <td>Yes</td></tr>
-    <tr><td>type</td><td>the type(s) of artefact(s) to install.  You can give 
multiple values separated by commas</td>
-        <td>No, defaults to '*' meaning all types</td></tr>
-    <tr><td>conf</td><td>the configurations to install. Only the dependencies 
of the specified configurations will be installed. <span class="since">since 
2.3</span></td>
-        <td>No, defaults to '*' meaning all configurations</td></tr>
-    <tr><td>validate</td><td>true to force ivy files validation against 
ivy.xsd, false to force no validation</td>
-        <td>No. Defaults to default ivy value (as configured in configuration 
file)</td></tr>
-    <tr><td>overwrite</td><td>true to override modules already present in the 
destination resolver, false otherwise</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>transitive</td><td>true to install the module and all its 
transitive dependencies, false to install only the module</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>matcher</td><td>the name of the matcher to use to find the modules 
to install</td>
-        <td>No, defaults to exact</td></tr>
-    <tr><td>settingsRef</td><td>A reference to the ivy settings that must be 
used by this task <span class="since">(since 2.0)</span></td>
-       <td>No, 'ivy.instance' is taken by default.</td></tr>
-    <tr><td>haltonfailure</td><td>true to fail build on unresolved 
dependencies <span class="since">since 2.0</span></td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>installOriginalMetadata</td><td>true to install original metadata 
(if available). If the module has been originally resolved from a m2 
repository, the original metadata is the original POM file <span 
class="since">since 2.4</span></td>
-        <td>No, defaults to false</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivy:install organisation="apache" module="commons-lang" revision="2.0" 
from="ivyrep" to="myfsresolver"/>
-</code>
-Installs the module commons-lang from apache in revision 2.0 in the resolver 
myfsresolver. The module is found in the resolver named 'ivyrep'.
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/listmodules.html
----------------------------------------------------------------------
diff --git a/doc/use/listmodules.html b/doc/use/listmodules.html
deleted file mode 100644
index 32896e6..0000000
--- a/doc/use/listmodules.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<span class="since">since 1.4</span>
-Finds the list of modules in the repository matching some criteria and set a 
corresponding list of properties in ant.
-
-The criteria is set by given patterns matching the organisation, name branch 
and revision of the modules to find.
-
-To know if a module matches the criteria ivy will use the configured <a 
href="../concept.html#matcher">pattern matcher</a>.
-
-<h1>Attributes</h1>
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>organisation</td><td>the pattern matching the organisation of the 
modules to list</td>
-        <td>Yes</td></tr>
-    <tr><td>module</td><td>the pattern matching the name of the modules to 
list</td>
-        <td>Yes</td></tr>
-    <tr><td>branch</td><td>the pattern matching the branch of the modules to 
list</td>
-        <td>No, defaults to '*'</td></tr>
-    <tr><td>revision</td><td>the pattern matching the revision of the modules 
to list</td>
-        <td>Yes</td></tr>
-    <tr><td>matcher</td><td>the name of the pattern matcher to use for 
matching the modules fields</td>
-        <td>No. Defaults to exactOrRegexp.</td></tr>
-    <tr><td>property</td><td>the pattern of the property to set when a module 
is found</td>
-        <td>Yes</td></tr>
-    <tr><td>value</td><td>The pattern of the value to set when a module is 
found</td><td>Yes</td></tr>
-<tr><td>settingsRef</td><td>A reference to the ivy settings that must be used 
by this task <span class="since">(since 2.0)</span></td><td>No, 'ivy.instance' 
is taken by default.</td></tr>
-<tr><td>resolver</td><td>The name of the resolver to use for searching the 
modules <span class="since">(since 2.2.0)</span></td><td>No, all available 
resolvers will be used by default.</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivy:listmodules organisation="apache" module="ivy" revision="*" 
property="ivy.[revision]" value="found"/>
-</code>
-will find all revisions of the module ivy in the org apache, and create one 
property for each revision found, the name of the property depending on the 
revision, the value being always 'found'
-
-<hr/>
-
-<code type="xml">
-<ivy:listmodules organisation="*" module="ivy*" revision="1.0" matcher="glob" 
property="modules.[module]" value="[organisation]"/>
-</code>
-use the glob matcher to find all modules which name starts with ivy with 
revision 1.0, and sets for each a property with module name found  and 
organisation for value.
-Example:
-modules.ivy=apache
-modules.ivyde=apache
-modules.ivytools=ivytools
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/makepom.html
----------------------------------------------------------------------
diff --git a/doc/use/makepom.html b/doc/use/makepom.html
deleted file mode 100644
index a47d850..0000000
--- a/doc/use/makepom.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<span class="since">since 2.0</span>
-The makepom task allows to convert an ivy file to a pom file.
-
-An example of use is to publish an Ivy managed module to a maven 2 repository.
-
-<em>Note that all Ivy features are not supported by maven poms, so the 
converted pom may not resolve to the exact same dependencies as the original 
ivy file.</em>
-
-<span class="since">since 2.2</span>
-It is possible to specify a template file defining the structure of the 
generated POM. The following processing is done on this template:
-<ul>
-<li>properties like <i>${property.name}</i> are replaced if they are defined 
in Ant or by the ivy:makepom task (see below for the standard properties)</li>
-<li>lines containg the string <i>SKIP_LINE</i> are skipped.</li>
-<li>the defined dependencies will be added to the first <dependencies> element 
encountered in the pom template. If the template doesn't contain a 
<dependencies> element, it is generated a the end of the pom.
-</ul>
-
-The ivy:makepom task defines following properties that can be used in the 
template. <ul>
-<li><b>ivy.pom.groupId</b>: defaults to the organisation as defined in the 
ivy.xml file</li>
-<li><b>ivy.pom.artifactId</b>: defaults to the value of the 'atifactName' 
attribute of this task, or the name of the module as defined in the ivy.xml 
file</li>
-<li><b>ivy.pom.packaging</b>: defaults to the value of the 'artifactPackaging' 
attribute of this task, or the extenstion of the artifact</li>
-<li><b>ivy.pom.version</b>: defaults to the revision as defined in the ivy.xml 
file</li>
-<li><b>ivy.pom.name</b>: defaults to 'SKIP_LINE'</li>
-<li><b>ivy.pom.description</b>: defaults to the value of the 'description' 
attribute of this task, or 'SKIP_LINE' when not specified</li>
-<li><b>ivy.pom.url</b>: defaults to the homepage as defined in the ivy.xml 
file</li>
-<li><b>ivy.pom.license</b>: the content of the specified headerFile, or 
'SKIP_LINE' if not specified</li>
-<li><b>ivy.pom.header</b>: some Ivy information, or 'SKIP_LINE' if the 
'printIvyInfo' attribute is set to false.</li>
-</ul>
-Note that each property can be given a value manually in the Ant build file. 
In that case, Ivy will use the value specified in the build file instead of the 
default value.
-
-The default template that ships with Ivy looks like this:
-<code type="xml">
-${ivy.pom.license}
-${ivy.pom.header}
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>${ivy.pom.groupId}</groupId>
-  <artifactId>${ivy.pom.artifactId}</artifactId>
-  <packaging>${ivy.pom.packaging}</packaging>
-  <version>${ivy.pom.version}</version>
-  <name>${ivy.pom.name}</name>
-  <description>${ivy.pom.description}</description>
-  <url>${ivy.pom.url}</url>
-</project>
-</code>
-
-<h1>Attributes</h1>
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>ivyfile</td><td>the source ivy file to convert</td>
-        <td>Yes</td></tr>
-    <tr><td>pomfile</td><td>the destination pom file to write</td>
-        <td>Yes</td></tr>
-    <tr><td>templatefile</td><td>the template file to use when generating the 
pom <span class="since">(since 2.2)</span></td>
-        <td>No, defaults to the internal template file.</td></tr>
-    <tr><td>artifactName</td><td>The name of the artifact which is represented 
by the generated pom file. <span class="since">(since 2.2)</span></td>
-        <td>No, defaults to the module name in the source ivy file.</td></tr>
-    <tr><td>artifactPackaging</td><td>The packaging of the artifact which is 
represented by the generated pom file. <span class="since">(since 
2.2)</span></td>
-        <td>No, the artifact type is taken by default. Defaults to 'pom' if no 
such artifact is defined.</td></tr>
-    <tr><td>conf</td><td>a comma separated list of the configurations to 
include in the generated pom. Wildcards are supported here. <span 
class="since">(since 2.2)</span></td>
-        <td>No, defaults to all configurations.</td></tr>
-    <tr><td>settingsRef</td><td>A reference to the ivy settings that must be 
used by this task</td>
-        <td>No, 'ivy.instance' is taken by default.</td></tr>
-    <tr><td>printIvyInfo</td><td>Add some information about Ivy to the 
generated POM. <span class="since">(since 2.2)</span></td>
-        <td>No, defaults to 'true'.</td></tr>
-    <tr><td>headerFile</td><td>the header of the generated pom file</td>
-        <td>No</td></tr>
-    <tr><td>description</td><td>The description that will be added to the 
generated pom. <span class="since">(since 2.2)</span></td>
-        <td>No, defaults to no description. Since 2.5, defaults to the 
description in the source ivy file.</td></tr>
-</tbody>
-</table>
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th 
class="ivy-chld-desc">Description</th><th 
class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>mapping</td>
-        <td>describes the mapping from an Ivy module configuration to a Maven 
POM scope.<br/>These elements takes two attributes: <ul><li>conf</li> the 
configuration to map<li>scope</li>the scope to which it should be 
mapped</ul></td>
-        <td>0..n</td></tr>
-    <tr><td>dependency</td>
-        <td>describes extra dependencies that should be added to the generated 
Maven POM file.<br/>These elements takes the following attributes: 
<ul><li>group</li> the groupId. Default <i>organisation</i> as defined in 
<i>info</i><li>artifact</li> the name of the artifact<li>version</li> the 
version. Default <i>revision</i> as defined in <i>info</i><li>type <span 
class="since">(since 2.3)</span></li> the type<li>classifier <span 
class="since">(since 2.3)</span></li> the classifier<li>scope</li> the 
scope<li>optional</li> is the artifact optional. Default <i>false</i></ul></td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<ivy:makepom ivyfile="${basedir}/path/to/ivy.xml" 
pomfile="${basedir}/path/to/module.pom" conf="default,runtime">
-   <mapping conf="default" scope="compile"/>
-   <mapping conf="runtime" scope="runtime"/>
-   <dependency group="com.acme" artifact="acme-logging" version="1.0" 
optional="true"/>
-</ivy:makepom>
-</code>
-Converts ${basedir}/path/to/ivy.xml to a pom and writes the result to 
${basedir}/path/to/module.pom. The configuration 'default' in the parsed ivy 
file will be mapped to the scope 'compile', the configuration 'runtime' will be 
mapped to 'runtime', and other configurations will be excluded.
-
-The <i>com.acme.acme-logging</i> artifact with version 1.0 will be added as an 
optional dependency.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/postresolvetask.html
----------------------------------------------------------------------
diff --git a/doc/use/postresolvetask.html b/doc/use/postresolvetask.html
deleted file mode 100644
index 67124ca..0000000
--- a/doc/use/postresolvetask.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-Several tasks in Ivy are considered as post resolve task and share a common 
behaviour and settings accordingly.
-
-These tasks are:
-<ul>
-<li>[[ant:retrieve]]</li>
-<li>[[ant:cachefileset]]</li>
-<li>[[ant:cachepath]]</li>
-<li>[[ant:artifactproperty]] <span class="since">(since 2.0)</span></li>
-<li>[[ant:artifactreport]] <span class="since">(since 2.0)</span></li>
-</ul>
-
-All these tasks will trigger automatically a resolve if:
-<ul>
-<li>none has already been called in the current build with the attribute keep 
set to true (see below)</li>
-<li>organisation and module are not set</li>
-</ul>
-
-<span class="since">Since Ivy 1.4</span>, there are two ways to run a 
[[ant:resolve]]: with an ivy file, or with the inline mode.
-When you call resolve with an ivy file, the default for it is to keep the 
resolved data for use by the subsequent post resolve tasks. When you run an 
inline resolve, the default is not to keep the data. You can override this 
behaviour by setting the keep attribute as you like.
-
-If you want to to reuse the resolved data obtained through a call to resolve 
in another build (i.e. not the current one), then you have to set the 
organisation and module attributes. This work only if the cache was not cleaned 
since your last resolve call. This does not work with inline calls, which must 
be performed in the same build.
-
-
-The attributes listed are then mostly used only if a resolve is triggered 
automatically.
-
-<h1>Attributes</h1>
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>conf</td><td>a comma separated list of the configurations to 
retrieve or '*'.
-<span class="since">Since 2.0</span> you can also use '*(public)' or 
'*(private)'.  Note that '*' is interpreted as '*(public)' when inline is 
true.</td>
-        <td>No. Defaults to the configurations resolved by the last resolve 
call, or '*' if no resolve was explicitly called</td></tr>
-    <tr><td>inline</td><td>true to use inline mode, false to resolve an ivy 
file <span class="since">(since 1.4)</span></td><td>No. defaults false</td></tr>
-    <tr><td>organisation</td><td>the organisation of the module to retrieve. 
This usually doesn't need to be set since it defaults to the last resolved one, 
except for inline mode where it is required.</td><td>Yes in inline mode, 
otherwise no, it then defaults to last resolved module name</td></tr>
-    <tr><td>module</td><td>the name of the module to retrieve. This usually 
doesn't need to be set since it defaults to the last resolved one, except for 
inline mode where it is required.</td><td>Yes in inline mode, otherwise no, it 
then defaults to last resolved module name</td></tr>
-    <tr><td>revision</td><td>the revision constraint of the module to 
retrieve. Used only in inline mode. <span class="since">since 
1.4</span></td><td>No. Defaults to latest.integration</td></tr>
-    <tr><td>branch</td><td>the name of the branch to resolve in inline mode 
<span class="since">(since 2.1)</span></td><td>Defaults to no branch in inline 
mode, nothing in standard mode.</td></tr>
-    <tr><td>changing</td><td>indicates that the module may change when 
resolving in inline mode. See <a href="../concept.html#change">cache and change 
management</a> for details. Ignored when resolving in standard mode. <span 
class="since">(since 2.2.0)</span></td><td>No. Defaults to false.</td></tr>
-    <tr><td>transitive</td><td>true to resolve dependencies transitively, 
false otherwise <span class="since">since 1.4</span></td><td>No. Defaults to 
true</td></tr>
-    <tr><td>resolveMode</td><td>the [[ant:resolve resolve mode]] to use when 
an automatic resolve is triggered <span class="since">(since 
2.1)</span></td><td>No. defaults to using the resolve mode set in the 
[[settings settings]]</td></tr>
-    <tr><td>keep</td><td>true to keep the results of the automatic resolve in 
memory, false to discard them. When this is false, the standard ivy properties 
won't be set and other postresolve-tasks (like retrieve and cachepath) won't be 
able to resuse the results of this resolve!</td><td>No. defaults to false for 
an inline resolve and to true in any other case</td></tr>
-    <tr><td>haltonfailure</td><td>true to halt the build on ivy failure, false 
to continue</td><td>No. Defaults to true</td></tr>
-    <tr><td>validate</td><td>true to force ivy files validation against 
ivy.xsd, false to force no validation</td><td>No. Defaults to default ivy value 
(as configured in configuration file)</td></tr>
-    <tr><td>refresh</td><td>true to force Ivy to resolve dynamic revision in 
this resolve process, false to use cached resolved revision <span 
class="since">since 2.1</span></td><td>No. defaults to false</td></tr>
-    <tr><td>file</td><td>the file to resolve if a resolve is necessary <span 
class="since">since 2.0</span></td><td>No. Defaults to the previous resolved 
Ivy file or to ${ivy.dep.file}</td></tr>
-       <tr><td>settingsRef</td><td>A reference to the ivy settings that must 
be used by this task <span class="since">(since 2.0)</span></td><td>No, 
'ivy.instance' is taken by default.</td></tr>
-       <tr><td>resolveId</td><td>The id which was used for a previous resolve, 
or the resolveId if a new resolve is performed <span class="since">(since 
2.0)</span></td><td>No, defaults to '[org]-[module]'.</td></tr>
-    <tr><td>log</td><td>the log setting to use during the resolve process. 
<span class="since">(since 2.0)</span><br/>
-Available options are:
-<ul><li>default</li> the default log settings, where all usual messages are 
output to the console
-<li>download-only</li> disable all usual messages but download ones. A resolve 
with everything in cache won't output any message.
-<li>quiet</li> disable all usual messages, making the whole resolve process 
quiet unless errors occur
-</ul></td><td>No, defaults to 'default'.</td></tr>
-</tbody>
-</table>
-
-<h1>Child elements</h1>
-
-<b><i>(Since 2.3)</i></b>
-
-These child elements are defining an inlined ivy.xml's <a 
href="../ivyfile/dependencies.html">dependencies</a> elements. Thus these child 
elements cannot be used together with the <i>inline</i> or <i>file</i> 
attributes.
-There is one important difference with the ivy.xml's <a 
href="../ivyfile/dependencies.html">dependencies</a>: there is no master 
configuration to handle here. There is actually only one, the one on which the 
resolve will run. So every attribute in <a 
href="../ivyfile/dependency.html">dependency</a>, <a 
href="../ivyfile/exclude.html">exclude</a>,  <a 
href="../ivyfile/override.html">override</a> or <a 
href="../ivyfile/conflict.html">conflict</a> which is about a master 
configuration is not supported. And every attribute about a mapping of a master 
configuration on a dependency configuration is now expecting only the 
dependency configuration. 
-
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Element</th><th 
class="ant-desc">Description</th><th class="ant-req">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td><a 
href="../ivyfile/dependency.html">dependency</a></td><td>declares a dependency 
to resolve</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/exclude.html">exclude</a></td><td>excludes 
artifacts, modules or whole organizations from the set of dependencies to 
resolve</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/override.html">override</a></td><td>specify an 
override mediation rule, overriding the revision and/or branch requested for a 
transitive dependency <span class="since">since 2.0</span></td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/conflict.html">conflict</a></td><td>specify a 
a conflict manager for one or several dependencies <span class="since">since 
2.0</span></td>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<ivy:cachepath organisation="emma" module="emma" revision="2.0.4217" 
inline="true" conf="ant" pathid="emma.classpath"/>
-<taskdef resource="emma_ant.properties" classpathref="emma.classpath" /> 
-</code>
-Resolves the emma module in version 2.0.4217, constructs an ant path with the 
corresponding artifacts, and then define the emma tasks using this path.
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/publish.html
----------------------------------------------------------------------
diff --git a/doc/use/publish.html b/doc/use/publish.html
deleted file mode 100644
index cce12c2..0000000
--- a/doc/use/publish.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-Publishes the current module's <a 
href="../ivyfile/publications.html">artifacts</a> and the <a 
href="../ivyfile.html#resolved">resolved descriptor</a> (delivered ivy file).
-
-This task is meant to publish the current module descriptor together with its 
declared publication artifacts to a repository.
-
-All the artifacts must have been created <em>before</em> calling this task. It 
does not create the artifacts themselves, but expects to find them at the 
location indicated by the artifacts pattern.
-
-The target repository is given through the name of a resolver declared in 
current ivy settings. See [[settings]] for details about resolver supporting 
artifact publishing.
-
-It also publishes the delivered ivy file (except if you don't want), and even 
deliver it, if it has not been done with a previous deliver call or if 
forcedeliver is set to true. That's why this task takes some parameters useful 
only for delivery. See the illustration below:
-
-<p><img alt="publish flowchart" src="../images/ivy-publish-fc.png" width="360" 
height="473"/></p>
-
-<span class="since">since 1.4.1</span>
-The source artifact pattern can be specified either as an attribute on the 
task (artifactspattern) or using a list of nested artifacts element (see 
examples below).
-  
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>organisation</td><td>the name of the organisation of the module to 
publish</td><td>No. Defaults to ${ivy.organisation} or the last resolved module 
organisation.</td></tr>
-    <tr><td>module</td><td>the name of the module to publish</td><td>No. 
Defaults to ${ivy.module} or the last resolved module name.</td></tr>
-    <tr><td>revision</td><td>the revision of the module to publish and also 
the published revision unless pubrevision is set</td><td>No. Defaults to 
${ivy.revision} or the last resolve module revision.</td></tr>
-    <tr><td>artifactspattern</td><td>the pattern to use to find artifacts to 
publish</td>
-        <td>No. Defaults to ${ivy.publish.src.artifacts.pattern}</td></tr>
-    <tr><td>resolver</td><td>the name of the resolver to use for 
publication</td>
-        <td>Yes</td></tr>
-    <tr><td>pubrevision</td><td>the revision to use for the publication</td>
-        <td>No. Defaults to the ${ivy.deliver.revision}</td></tr>
-    <tr><td>pubbranch</td><td>the branch to use for the publication</td>
-        <td>No. Defaults to the ${ivy.deliver.branch}</td></tr>
-    <tr><td>forcedeliver</td><td>true to force the implicit call to deliver, 
false to do it only if the ivy file to publish doesn't exist yet <span 
class="since">(since 1.4)</span></td>
-        <td>No. Defaults to false</td></tr>
-    <tr><td>update</td><td>true to update ivy file metadata (revision, branch, 
publication date and status) before publishing, false otherwise. This is 
usually not necessary when using deliver before publish.</td>
-        <td>No. Defaults to false</td></tr>
-    <tr><td>merge</td><td>if this descriptor <a 
href="../ivyfile/extends.html">extends</a> a parent, merge the inherited 
information directly into this descriptor on publish.  The <i>extends</i> 
element itself will be commented out in the published descriptor. <span 
class="since">(since 2.2)</span></td>
-        <td>No. Defaults to true</tr>
-    <tr><td>validate</td><td>true to force ivy files validation against 
ivy.xsd, false to force no validation</td>
-        <td>No. Defaults to default ivy value (as configured in [[settings 
settings file]])</td></tr>
-    <tr><td>replacedynamicrev</td><td>true to replace dynamic revisions by 
static ones in the delivered file, false to avoid this replacement <span 
class="since">(since 1.3)</span></td>
-        <td>No. Defaults to true</td></tr>
-    <tr><td>publishivy</td><td>True to publish delivered ivy file, false 
otherwise</td>
-        <td>No. Defaults to true</td></tr>
-    <tr><td>conf</td><td>A comma separated list of configurations to publish  
<span class="since">(since 1.4.1)</span>. Accepts wildcards <span 
class="since">(since 2.2)</span>.</td>
-        <td>No. Defaults to all configurations</td></tr>
-    <tr><td>overwrite</td><td>True to overwrite files in repository if the 
revision already exist, false to let it as is</td>
-        <td>No. Defaults to false</td></tr>
-    <tr><td>warnonmissing</td><td>True to warn when artifacts to be published 
are missing</td>
-        <td>No. Defaults to true</td></tr>
-    <tr><td>haltonmissing</td><td>True to halt build when artifacts to be 
published are missing</td>
-        <td>No. Defaults to true</td></tr>
-    <tr><td>srcivypattern</td><td>the pattern to use to find ivy file to 
publish, and even deliver if necessary <span class="since">(since 
1.2)</span></td>
-        <td>No. Defaults to the value of artifactspattern</td></tr>
-    <tr><td>pubdate</td><td>the publication date to use for the delivery, if 
necessary. This date should be either 'now', or a date given with the following 
pattern: yyyyMMddHHmmss</td>
-        <td>No. Defaults to 'now'</td></tr>
-    <tr><td>status</td><td>the status to use for the delivery, if 
necessary</td>
-        <td>No. Defaults to ${ivy.status}</td></tr>
-    <tr><td>delivertarget</td><td>the target to call for recursive 
delivery</td>
-        <td>No. No recursive delivery is done by default</td></tr>
-    <tr><td>settingsRef</td><td>A reference to the ivy settings that must be 
used by this task <span class="since">(since 2.0)</span></td><td>No, 
'ivy.instance' is taken by default.</td></tr></tbody>
-</table>
-<h1>Child elements</h1>
-<table class="ivy-children">
-<thead>
-    <tr><th class="ivy-chld">Element</th><th 
class="ivy-chld-desc">Description</th><th 
class="ivy-chld-card">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td>artifact</td>
-        <td>Describe additional artifacts to publish<br/>These elements can 
have any attribute: standard artifact attributes and (since 2.2) extra 
attributes are supported.</td>
-        <td>0..n</td></tr>
-    <tr><td>artifacts</td>
-        <td>Specify the pattern used to find the artifact.<br/>These elements 
have a <i>pattern</i> attribute containing the pattern used to find the 
artifact.</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<ivy:publish resolver="local" pubrevision="1.0">
-   <artifacts pattern="build/artifacts/jars/[artifact].[ext]" />
-   <artifacts pattern="build/artifacts/zips/[artifact].[ext]" />
-</ivy:publish>
-</code>
-Publishes the last resolved module in the local resolver with revision 1.0, 
looking for artifacts in directories <i>build/artifacts/jars</i> and 
<i>build/artifacts/zips</i>.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/report.html
----------------------------------------------------------------------
diff --git a/doc/use/report.html b/doc/use/report.html
deleted file mode 100644
index a94f18e..0000000
--- a/doc/use/report.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-Generates reports of dependency resolving. One report per configuration is 
generated, but all reports generated together are hyperlinked one to each other.
-
-This task should be used only after a call to resolve, even if the call was 
not done during the same ant build.
-In fact, this task uses xml report generated by resolve in cache. So if you 
call resolve on a module for a given configuration, you can call report safely 
on this module and this configuration as long as you do not clean your ivy 
cache.
-
-If you want to have an idea of what reports look like, check this very simple 
<a href="../samples/jayasoft-ivyrep-example-default.html">example</a>.
-The task also generates a graphml file which can be loaded with the free <a 
href="http://www.yworks.com/en/products_yed_about.htm";>yEd</a> graph editor.
-Then following a few <a href="../yed.html">simple steps</a> you can obtain a 
graph like this <a 
href="../samples/jayasoft-ivyrep-example-default.jpg">one</a>.
-
-<div class="since">since 1.4</div> If a custom XSL is specified, it's possible 
to specify additional parameters to the stylesheet.
-
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>todir</td><td>the directory to which reports should be 
generated</td>
-        <td>No, defaults to ${ivy.report.todir}, or execution directory if not 
defined</td></tr>
-    <tr><td>outputpattern</td><td>the generated report names pattern</td>
-        <td>No, defaults to ${ivy.report.output.pattern}, or 
[organisation]-[module]-[conf].[ext] if not defined</td></tr>
-    <tr><td>xsl</td><td>true to generate a report (by default html report) 
using xslt, false otherwise <span class="since">since 1.3</span></td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>xml</td><td>true to generate a xml report, false otherwise <span 
class="since">since 1.3</span></td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>graph</td><td>true to generate graphml files, false otherwise</td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>dot</td><td>true to generate <a 
href="http://www.graphviz.org/";>graphviz dot</a> files, false otherwise <span 
class="since">since 1.4</span></td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>conf</td><td>a comma separated list of the configurations for 
which a report should be generated</td>
-        <td>No. Defaults to the configurations resolved by the last resolve 
call (during same ant build), or ${ivy.resolved.configurations} if no resolve 
was called</td></tr>
-    <tr><td>organisation</td><td>the name of the organisation of the module 
for which report should be generated</td>
-        <td>No, unless resolveId has not been specified and no resolve was 
called during the build. Defaults to last resolved module 
organisation.</td></tr>
-    <tr><td>module</td><td>the name of the module for which report should be 
generated</td>
-        <td>No, unless resolveId has not been specified and no resolve was 
called during the build. Defaults to last resolved module.</td></tr>
-    <tr><td>validate</td><td>true to force ivy files validation against 
ivy.xsd, false to force no validation</td>
-        <td>No. Defaults to default ivy value (as configured in configuration 
file)</td></tr>
-    <tr><td>xslfile</td><td>indicates which xsl file should be used to 
generate the report</td>
-        <td>No, defaults to ivy provided xsl which generates html 
report</td></tr>
-    <tr><td>settingsRef</td><td>A reference to the ivy settings that must be 
used by this task <span class="since">(since 2.0)</span></td><td>No, 
'ivy.instance' is taken by default.</td></tr>
-    <tr><td>resolveId</td><td>The id which was used for a previous resolve 
<span class="since">(since 2.0)</span></td><td>No, defaults to 
'[org]-[module]'.</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-To generate a HTML and graphml report:
-<code type="xml">
-<report conf="compile" />
-</code>
-
-<hr/>
-To generate a HTML report only:
-<code type="xml">
-<report conf="compile" graph="false" />
-</code>
-
-<hr/>
-To generate an XML report using a custom stylesheet:
-<code type="xml">
-<report conf="compile" xslfile="my-custom-stylesheet.xsl" xslext="xml" />
-</code>
-
-To generate an XML report using a custom stylesheet which needs some 
parameters:
-<code type="xml">
-<report conf="compile" xslfile="my-custom-stylesheet.xsl" xslext="xml">
-    <param name="param1" expression="value1" /> 
-    <param name="param2" expression="value2" /> 
-</report>
-</code>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/repreport.html
----------------------------------------------------------------------
diff --git a/doc/use/repreport.html b/doc/use/repreport.html
deleted file mode 100644
index 60d76ef..0000000
--- a/doc/use/repreport.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-Generates reports about dependencies among several modules in the repository 
(repreport stands for repository report).<span class="since">since 1.4</span>
-
-This task is similar to the [[ant:report]] task, except that instead of 
working on a single module you just resolved, it works with a set of modules in 
your repository.
-
-Note that the set of modules for which you generate the report is determined 
by setting organisation module and revision and using a matcher, but also by 
the dependencies of these modules. No dependency is excluded.
-
-Usually the most useful report is a graph, you can generate either a graphml 
file that you can then easily <a href="../yed.html">layout using yEd</a>, or a 
dot file which is the format recognized by graphviz, which is a free tool which 
does automatic graph layout, and can thus be used to generate automatically a 
GIF or PNG of the dependencies between all your modules.
-
-<strong>Limitation</strong>: this task requires to be able to browse the 
repository, and is thus limited to resolvers supporting repository listing. In 
particular, it means it doesn't work to report all organizations in a 
repository using m2compatible mode.
-Moreover, to be able to list organizations, this task requires an 
[organisation] token in the resolver(s) used.
-
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>organisation</td><td>A pattern matching the organisation of the 
modules for which the report should be generated</td>
-        <td>No, defaults to '*'</td></tr>
-    <tr><td>module</td><td>A pattern matching the name of the modules for 
which the report should be generated</td>
-        <td>No, defaults to '*'</td></tr>
-    <tr><td>branch</td><td>The name of the branch of the modules for which the 
report should be generated</td>
-        <td>No, defaults to no branch specified</td></tr>
-    <tr><td>revision</td><td>The revision of the modules for which the report 
should be generated. Only one revision per module will be used, so most of the 
time keeping the default (latest.integration) is the best thing to do, because 
it's not very easy to specify only one revision for several modules.</td>
-        <td>No, defaults to 'latest.integration'</td></tr>
-    <tr><td>todir</td><td>the directory to which reports should be 
generated</td>
-        <td>No, defaults to execution directory</td></tr>
-    <tr><td>outputname</td><td>the name to use for the generate file (without 
extension)</td>
-        <td>No, defaults to ivy-repository-report</td></tr>
-    <tr><td>xml</td><td>true to generate a xml report, false otherwise</td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>xsl</td><td>true to generate a report using xslt, false 
otherwise</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>xslfile</td><td>indicates which xsl file should be used to 
generate the report</td>
-        <td>Yes if you want to use xsl transformation</td></tr>
-    <tr><td>xslext</td><td>indicates the extension to use when generating 
report using xsl</td>
-        <td>No defaults to 'html'</td></tr>
-    <tr><td>graph</td><td>true to generate graphml file, false otherwise</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>dot</td><td>true to generate graphviz dot format file, false 
otherwise</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>matcher</td><td>the name of the matcher to use for matching 
modules names and organisations in your repository</td>
-        <td>No. Defaults to exactOrRegexp</td></tr>
-    <tr><td>validate</td><td>true to force ivy files validation against 
ivy.xsd, false to force no validation</td>
-        <td>No. Defaults to default ivy value (as configured in configuration 
file)</td></tr>
-    <tr><td>settingsRef</td><td>A reference to the ivy settings that must be 
used by this task <span class="since">(since 2.0)</span></td><td>No, 
'ivy.instance' is taken by default.</td></tr></tbody>
-</table>
-
-<h1>Examples</h1>
-To generate a xml report for all the latest versions of all the modules in 
your repository:
-<code type="xml">
-<ivy:repreport />
-</code>
-
-<hr/>
-To generate a graphml report for all the latest versions of all the modules in 
your repository:
-<code type="xml">
-<ivy:repreport xml="false" graph="true" />
-</code>
-
-<hr/>
-To generate a xml report for all the latest versions of the modules from the 
organisation foo in your repository:
-<code type="xml">
-<ivy:repreport organisation="foo" />
-</code>
-
-<hr/>
-To generate a xml report for all the versions on the 1.x stream of the modules 
named bar* from the organisation foo in your repository:
-<code type="xml">
-<ivy:repreport organisation="foo" module="bar*" revision="1.+" matcher="glob" 
/>
-</code>
-
-<hr/>
-To generate an XML report using a custom stylesheet:
-<code type="xml">
-<ivy:repreport xsl="true" xslfile="my-custom-stylesheet.xsl" xslext="xml" />
-</code>
-
-<hr/>
-To generate an XML report using a custom stylesheet which needs some 
parameters:
-<code type="xml">
-<ivy:repreport xsl="true" xslfile="my-custom-stylesheet.xsl" xslext="xml">
-    <param name="param1" expression="value1" /> 
-    <param name="param2" expression="value2" /> 
-</report>
-</code>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/resolve.html
----------------------------------------------------------------------
diff --git a/doc/use/resolve.html b/doc/use/resolve.html
deleted file mode 100644
index 030b3ae..0000000
--- a/doc/use/resolve.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-The resolve task actually resolve dependencies described in an <a 
href="../ivyfile.html">ivy file</a>, and put the resolved dependencies in the 
ivy cache.
-If configure has not been called before resolve is called, a default 
configuration will be used (equivalent to call configure with no attributes).
-
-After the call to this task, four properties are set in ant:
-<ul>
-<li>ivy.organisation</li>
-set to the organisation name found in the ivyfile which was used for resolve
-<li>ivy.module</li>
-set to the module name found in the ivyfile which was used for resolve
-<li>ivy.revision</li>
-set to the revision name found in the ivyfile which was used for resolve, or a 
generated revision name if no revision was specified in the file
-<li>ivy.resolved.configurations</li>
-set to the comma separated list of configurations resolved
-</ul>
-<b>Since 1.2:</b>
-An additional property is set to true if the resolved dependencies are changes 
since the last resolve, and to false otherwise: <code>ivy.deps.changed</code>
-<b>Since 2.0:</b>
-The property ivy.deps.changed will not be set (and not be computed) if you set 
the parameter <i>checkIfChanged</i> to false. (by default it is true to keep 
backward compatibility).  This allow to optimize your build when you have 
multi-module build with multiple configurations.
-
-<b>Since 2.0:</b>
-In addition, if the <i>resolveId</i> attribute has been set, the following 
properties are set as well:
-<ul>
-<li>ivy.organisation.${resolveId}</li>
-<li>ivy.module.${resolveId}</li>
-<li>ivy.revision.${resolveId}</li>
-<li>ivy.resolved.configurations.${resolveId}</li>
-<li>ivy.deps.changed.${resolveId}</li>
-</ul>
-
-<b>Since 2.4</b>
-If current module extends other modules 
-<ul>
-<li>ivy.parents.count</li>
-number of parents module
-<li>ivy.parent[index].organisation</li>
-set to the organisation name found in the parent ivyfile which was used for 
resolve
-<li>ivy.parent[index].module</li>
-set to the module name found in the parent ivyfile which was used for resolve
-<li>ivy.parent[index].revision</li>
-set to the revision name found in the parent ivyfile which was used for resolve
-<li>ivy.parent[index].branch</li>
-set to the branch name found in the parent ivyfile which was used for resolve
-</ul>
-Where <i>index</i> represent the index of extends module.
-
-When ivy has finished the resolve task, it outputs a summary of what has been 
resolved. This summary looks like this:
-<pre>
----------------------------------------------------------------------
-|                  |            modules            ||   artifacts   |
-|       conf       | number| search|dwnlded|evicted|| number|dwnlded|
----------------------------------------------------------------------
-|      default     |   4   |   0   |   0   |   0   ||   4   |   0   |
----------------------------------------------------------------------
-</pre>
-This table gives some statistics about the dependency resolution. Each line 
correspond to a configuration resolved. Then the table is divided in two parts:
-<ul>
-<li>modules</li>
-<ul>
-<li>number</li>
-This is the total number of dependency modules resolved in this configuration, 
including transitive ones
-<li>search</li>
-This is the number of dependency modules that required a repository access. 
The repository access is needed if the module is not yet in cache, or if a 
latest version is required, or in some other cases (depending on checkModified, 
for instance)
-<li>dwnlded</li>
-This is the number of dependency ivy files downloaded from the repository. 
This number can be less than the total number of modules even with a clean 
cache, if no ivy file is provided for some dependencies.
-<li>evicted</li>
-This is the number of dependency module evicted by conflict managers.
-</ul>
-<li>artifacts</li>
-<ul>
-<li>number</li>
-This is the total number of artifacts resolved in the given configuration.
-<li>dwnlded</li>
-This is the number of artifacts actually downloaded from the repository.
-</ul>
-</ul>
-
-<h2>Inline mode</h2>
-<span class="since">since 1.4</span> The inline mode allow to call a resolve 
without an ivy file, by setting directly the module which should be resolved 
from the repository. It is particularly useful to install released software, 
like an ant task for example. When inline is set to true, the organisation 
module and revision attributes are used to specify which module should be 
resolved from the repository. 
-
-<b>Remark:</b> if you want the standard ivy properties to be set or to reuse 
the results of an inline resolve by other post-resolve tasks like retrieve, 
cachepath, report, ..., you must set the keep attribute to true!
-
-<h2>Resolve mode</h2>
-<span class="since">since 2.0</span> The resolve mode allows to define how Ivy 
should use dependency revision constraints when performing the resolution.
-
-Two modes are available:
-<ul>
-<li>default</li> In this mode the default revision constraint (expressed with 
the rev attribute in the [[ivyfile/dependency]] element) is used.
-<li>dynamic</li> In this mode the dynamic revision constraint (expressed with 
the revConstraint attribute in the [[ivyfile/dependency]] element) is used.
-</ul>
-
-<h2>Concurrency</h2>
-During resolve, Ivy creates a file in the [[settings/caches resolution 
cache]]. The creation of this file is not aimed to support concurrency, meaning 
that you can't have two concurrent resolve of the same module, in the same 
resolution cache, with the same resolveId. 
-
-<i>Note for developers:
-After the call to this task, a reference to the module descriptor resolved is 
put in the ant project under the id <code>"ivy.resolved.descriptor"</code>.</i>
-
-<h1>Attributes</h1>
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>file</td><td>path to the ivy file to use for resolution</td>
-        <td>No. Defaults to ${ivy.dep.file} or nothing in inline mode</td></tr>
-
-    <tr><td>conf</td><td>a comma separated list of the configurations to 
resolve, or '*'.  
-<span class="since">Since 2.0</span>, you can also use '*(private)', 
'*(public)'.  Note that when inline is true, the configuration '*' is 
equivalent as '*(public)'.</td><td>No. Defaults to 
${ivy.configurations}</td></tr>
-
-    <tr><td>refresh</td><td>true to force Ivy to resolve dynamic revision in 
this resolve process, false to use cached resolved revision <span 
class="since">since 2.0</span></td><td>No. defaults to false</td></tr>
-
-    <tr><td>resolveMode</td><td>the resolve mode to use for this dependency 
resolution process <span class="since">since 2.0</span></td><td>No. defaults to 
using the resolve mode set in the [[settings settings]]</td></tr>
-
-    <tr><td>inline</td><td>true to use inline mode, false to resolve an ivy 
file <span class="since">since 1.4</span></td><td>No. defaults to 
false</td></tr>
-
-    <tr><td>keep</td><td>true to keep the results of the resolve in memory, 
false to discard them. When this is false, the standard ivy properties won't be 
set and other postresolve-tasks (like retrieve and cachepath) won't be able to 
resuse the results of this resolve!</td><td>No. defaults to false for an inline 
resolve and to true in any other case</td></tr>
-
-    <tr><td>organisation</td><td>the organisation of the module to resolve in 
inline mode <span class="since">since 1.4</span></td><td>Yes in inline mode, no 
otherwise.</td></tr>
-
-    <tr><td>module</td><td>the name of the module to resolve in inline mode 
<span class="since">since 1.4</span></td><td>Yes in inline mode, no 
otherwise.</td></tr>
-
-    <tr><td>revision</td><td>the revision constraint to apply to the module to 
resolve in inline mode <span class="since">since 1.4</span></td><td>No. 
Defaults to "latest.integration" in inline mode, nothing in standard 
mode.</td></tr>
-
-    <tr><td>branch</td><td>the name of the branch to resolve in inline mode 
<span class="since">(since 2.1.0)</span></td><td>Defaults to no branch in 
inline mode, nothing in standard mode.</td></tr>
-
-    <tr><td>changing</td><td>indicates that the module may change when 
resolving in inline mode. See <a href="../concept.html#change">cache and change 
management</a> for details. Ignored when resolving in standard mode. <span 
class="since">(since 1.4)</span></td><td>No. Defaults to false.</td></tr>
-
-    <tr><td>type</td><td>comma separated list of accepted artifact types 
(<span class="since">since 1.2</span>)</td><td>No. defaults to 
${ivy.resolve.default.type.filter}</td></tr>
-
-    <tr><td>haltonfailure</td><td>true to halt the build on ivy failure, false 
to continue</td><td>No. Defaults to true</td></tr>
-
-    <tr><td>failureproperty</td><td>the name of the property to set if the 
resolve failed <span class="since">since 1.4</span></td><td>No. No property is 
set by default.</td></tr>
-
-    <tr><td>transitive</td><td>true to resolve dependencies transitively, 
false otherwise <span class="since">since 1.4</span></td><td>No. Defaults to 
true</td></tr>
-
-    <tr><td>showprogress</td><td>true to show dots while downloading, false 
otherwise</td><td>No. Defaults to true</td></tr>
-
-    <tr><td>validate</td><td>true to force ivy files validation against 
ivy.xsd, false to force no validation</td><td>No. Defaults to default ivy value 
(as configured in configuration file)</td></tr>
-
-    <tr><td>settingsRef</td><td>A reference to the ivy settings that must be 
used by this task <span class="since">(since 2.0)</span></td><td>No, 
'ivy.instance' is taken by default.</td></tr>
-
-    <tr><td>resolveId</td><td>An id which can be used later to refer to the 
results of this resolve <span class="since">(since 2.0)</span></td><td>No, 
defaults to '[org]-[module]'.</td></tr>
-
-    <tr><td>log</td><td>the log setting to use during the resolve process. 
<span class="since">(since 2.0)</span><br/>
-Available options are:
-<ul><li>default</li> the default log settings, where all usual messages are 
output to the console
-<li>download-only</li> disable all usual messages but download ones. A resolve 
with everything in cache won't output any message.
-<li>quiet</li> disable all usual messages, making the whole resolve process 
quiet unless errors occur
-</ul></td><td>No, defaults to 'default'.</td></tr>
-
-     <tr><td>checkIfChanged</td><td>When set to true, the resolve will compare 
the result with the last resolution done on this module, with those 
configurations in order to define the property ivy.deps.changed.  Put it to 
false may provides slightly better performance. <span class="since">(since 
2.0)</span></td><td>No, default to 'true'</td></tr>
-
-     <tr><td>useCacheOnly</td><td>When set to true, it forces the resolvers to 
only use their caches and not their actual contents.<span class="since">(since 
2.0)</span></td><td>No, default to 'false'</td></tr>
-
-</tbody>
-</table>
-
-<h1>Child elements</h1>
-
-<b><i>(Since 2.3)</i></b>
-
-These child elements are defining an inlined ivy.xml's <a 
href="../ivyfile/dependencies.html">dependencies</a> elements. Thus these child 
elements cannot be used together with the <i>inline</i> or <i>file</i> 
attributes.
-There is one important difference with the ivy.xml's <a 
href="../ivyfile/dependencies.html">dependencies</a>: there is no master 
configuration to handle here. There is actually only one, the one on which the 
resolve will run. So every attribute in <a 
href="../ivyfile/dependency.html">dependency</a>, <a 
href="../ivyfile/exclude.html">exclude</a>,  <a 
href="../ivyfile/override.html">override</a> or <a 
href="../ivyfile/conflict.html">conflict</a> which is about a master 
configuration is not supported. And every attribute about a mapping of a master 
configuration on a dependency configuration is now expecting only the 
dependency configuration. 
-
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Element</th><th 
class="ant-desc">Description</th><th class="ant-req">Cardinality</th></tr>
-</thead>
-<tbody>
-    <tr><td><a 
href="../ivyfile/dependency.html">dependency</a></td><td>declares a dependency 
to resolve</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/exclude.html">exclude</a></td><td>excludes 
artifacts, modules or whole organizations from the set of dependencies to 
resolve</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/override.html">override</a></td><td>specify an 
override mediation rule, overriding the revision and/or branch requested for a 
transitive dependency <span class="since">since 2.0</span></td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/conflict.html">conflict</a></td><td>specify a 
a conflict manager for one or several dependencies <span class="since">since 
2.0</span></td>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<ivy:resolve file="path/to/ivy.xml"/>
-</code>
-Resolve all dependencies declared in path/to/ivy.xml file.
-
-<hr/>
-
-<code type="xml">
-<ivy:resolve file="path/to/ivy.xml" transitive="false" />
-</code>
-Same as above, but with transitive dependencies disabled.
-
-<hr/>
-
-<code type="xml">
-<ivy:resolve file="path/to/ivy.xml" conf="default, test"/>
-</code>
-Resolve the dependencies declared in the configuration default and test of the 
path/to/ivy.xml file.
-
-<hr/>
-
-<code type="xml">
-<ivy:resolve file="path/to/ivy.xml" type="jar"/>
-</code>
-Resolve all dependencies declared in path/to/ivy.xml file, but download only 
jar artifacts.
-
-<hr/>
-<code type="xml">
-<ivy:resolve organisation="apache" module="commons-lang" revision="2+" 
inline="true" />
-</code>
-Resolve the commons-lang module revision 2+ from the repository, with its 
dependencies.
-
-<hr/>
-<code type="xml">
-<ivy:resolve>
-    <dependency org="apache" name="commons-lang" rev="2+" />
-    <dependency org="apache" name="commons-logging" rev="1.1" />
-    <exclude org="apache" module="log4j" />
-</ivy:resolve>
-</code>
-Resolve of both commons lang and commons logging, with their dependencies but 
not log4j.
-
-<hr/>
-<code type="xml">
-<ivy:resolve>
-    <dependency org="org.slf4j" module="slf4j" rev="1.6" conf="api,log4j" />
-</ivy:resolve>
-</code>
-Resolve the configurations "api" and "log4j" of "slf4j".
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/resources.html
----------------------------------------------------------------------
diff --git a/doc/use/resources.html b/doc/use/resources.html
deleted file mode 100644
index 042c77b..0000000
--- a/doc/use/resources.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<b><i>(since 2.3) (Ant 1.7 required)</i></b>
-<tt>ivy:resources</tt> is an Ant <a 
href="http://ant.apache.org/manual/Types/resources.html#collection";>resource 
collection</a>, which files are based on an Ivy resolve, and then can be used 
with any task which is working with resources like <tt>copy</tt> or 
<tt>import</tt>.
-
-This datatype share the same attributes, child elements and behaviour of a 
[[ant:postresolvetask post resolve task]]. It is not expected to be used as an 
Ant task though, only as a resource collection.
-
-<h1>Examples</h1>
-<code type="xml">
-<ivy:resources file="path/to/ivy.xml"/>
-</code>
-Build a resource collection of every artifacts of all dependencies declared in 
path/to/ivy.xml file.
-
-<hr/>
-
-<code type="xml">
-<ivy:resources file="path/to/ivy.xml" transitive="false" />
-</code>
-Same as above, but with transitive dependencies disabled.
-
-<hr/>
-
-<code type="xml">
-<ivy:resources file="path/to/ivy.xml" conf="default, test"/>
-</code>
-Build a resource collection of every artifacts of the dependencies declared in 
the configuration default and test of the path/to/ivy.xml file.
-
-<hr/>
-
-<code type="xml">
-<ivy:resources file="path/to/ivy.xml" type="jar"/>
-</code>
-Build a resource collection of every jar artifact of all dependencies declared 
in path/to/ivy.xml file.
-
-<hr/>
-<code type="xml">
-<ivy:resources organisation="apache" module="commons-lang" revision="2+" 
inline="true" />
-</code>
-Build a resource collection of every artifacts of commons-lang module revision 
2+ from the repository, with its dependencies.
-
-<hr/>
-<code type="xml">
-<ivy:resources>
-    <dependency org="apache" module="commons-lang" rev="2+" />
-    <dependency org="apache" module="commons-logging" rev="1.1" />
-    <exclude org="apache" module="log4j" />
-</ivy:resources>
-</code>
-Build a resource collection of every artifacts of both commons lang and 
commons logging, with their dependencies but not log4j.
-
-<hr/>
-<code type="xml">
-<ivy:resources>
-    <dependency org="org.slf4j" module="slf4j" rev="1.6" conf="api,log4j" />
-</ivy:resources>
-</code>
-Build a resource collection of every artifacts of the configurations "api" and 
"log4j" of "slf4j".
-
-</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/retrieve.html
----------------------------------------------------------------------
diff --git a/doc/use/retrieve.html b/doc/use/retrieve.html
deleted file mode 100644
index a6256c1..0000000
--- a/doc/use/retrieve.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-The retrieve task copies resolved dependencies anywhere you want in your file 
system.
-
-This is a [[ant:postresolvetask post resolve task]], with all the behaviour 
and attributes common to all post resolve tasks.
-
-<span class="since">since 1.4</span> This task can even be used to synchronize 
the destination directory with what should actually be in according to the 
dependency resolution. This means that by setting sync="true", Ivy will not 
only copy the necessary files, but it will also remove the files which do not 
need to be there.
-
-The synchronisation actually consists in deleting all filles and directories 
in the root destination directory which are not required by the retrieve.
-
-The root destination directory is the the directory denoted by the first level 
up the first token in the destination pattern.
-Example:
-pattern: lib/[conf]/[artifact].[ext]
-root: lib
-
-<span class="since">since 2.3</span> A nested <a 
href="http://ant.apache.org/manual/Types/mapper.html";>mapper</a> element can be 
used to specify more complex filename transformations of the retrieved files. 
See the examples below.
-
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>pattern</td><td>the pattern to use to copy the dependencies</td>
-        <td>No. Defaults to ${ivy.retrieve.pattern}</td></tr>
-    <tr><td>ivypattern</td><td>the pattern to use to copy the ivy files of 
dependencies <span class="since">since 1.3</span></td>
-        <td>No. Dependencies ivy files are not retrieved by default.</td></tr>
-    <tr><td>conf</td><td>a comma separated list of the configurations to 
retrieve</td>
-        <td>No. Defaults to the configurations resolved by the last resolve 
call, or * if no resolve was explicitly called</td></tr>
-    <tr><td>sync</td><td>true to synchronize the destination, false to just 
make a copy <span class="since">since 1.4</span></td>
-        <td>No. Defaults to false</td></tr>
-    <tr><td>type</td><td>comma separated list of accepted artifact types <span 
class="since">since 1.4</span></td>
-        <td>No. All artifact types are accepted by default.</td></tr>
-    <tr><td>overwriteMode</td><td>option to configure when the destination 
file should be overwritten if it exist <span class="since">(since 2.2.0)</span>.
-Possible values are:
-<ul><li><b>newer</b> (default)</li> overwrite the destination file if a more 
recent one is available (based on timestamp)
-<li><b>different</b></li> overwrite the destination file if the timestamp is 
different
-<li><b>always</b></li> always overwrite the destination file
-<li><b>never</b></li> never overwrite the destination file
-</ul></td><td>No. Defaults to 'newer'.</td></tr>
-    <tr><td>symlink</td><td>true to create symbolic links, false to copy the 
artifacts.
-    The destination of the symbolic links depends on the value of the 
useOrigin attribute.
-    (requires "ln" to be a valid command, and to support the options -s and -f 
(works on UNIX/Linux, on other systems you may need to script "ln")
-    <span class="since">(since 2.0)</span></td><td>No. Defaults to 
false</td></tr>
-    <tr><td>symlinkmass</td><td>true to create symbolic links in mass, false 
to copy the artifacts.
-    "symlinkmass" overrides "symlink" if both are set to "true".
-    "symlinkmass" will create the same symbolic links "symlink" does, but with 
a single process call to "sh" with batched "ln" commands passed in as standard 
input (works on UNIX/Linux, on other systems you may need to script it)
-    Far large lists of resolved jars, this can be dramatically faster.
-    The destination of the symbolic links depends on the value of the 
useOrigin attribute.
-    The events "StartRetrieveArtifactEvent" and EndRetrieveEvent are NOT fired 
by this activity, because it is not clear when they should be called.
-    <span class="since">(since 2.4)</span></td><td>No. Defaults to 
false</td></tr>
-    <tr><td>settingsRef</td><td>A reference to the ivy settings that must be 
used by this task <span class="since">(since 2.0)</span></td><td>No, 
'ivy.instance' is taken by default.</td></tr></tbody>
-    <tr><td>log</td><td>the log setting to use during the resolve and retrieve 
process. <span class="since">(since 2.0)</span><br/>
-Available options are the same as for [[ant:resolve]] when used to trigger 
resolve automatically (see [[ant:postresolvetask]]), or the following for the 
retrieve process only:
-<ul><li><b>default</b></li> the default log settings, where all usual messages 
are output to the console
-<li><b>quiet</b></li> disable all usual messages, making the whole retrieve 
process quiet unless errors occur
-</ul></td><td>No, defaults to 'default'.</td></tr>
-    <tr><td>pathId</td><td>the id of the path to create containing the 
retrieved artifacts. <span class="since">since 2.3</span></td>
-        <td>No. No path is created by default.</td></tr>
-    <tr><td>setId</td><td>the id of the fileset to create containing the 
retrieved artifacts. <span class="since">since 2.3</span></td>
-        <td>No. No fileset is created by default.</td></tr>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivy:retrieve />
-</code>
-Retrieves dependencies using default parameters. This usually retrieves all 
the dependencies of the last resolve call to a lib directory.
-
-<hr/>
-<code type="xml">
-<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"/>
-</code>
-Retrieves all dependencies of the last resolve call to a lib directory, 
dependencies being separated in directories named by configuration, each conf 
directory containing corresponding artifacts without the revision.
-For instance, if the ivy file declares two configurations default and test, 
the resulting lib dir could look like this:
-<code>
-lib
-  default
-    commons-lang.jar
-    commons-logging.jar
-  test
-    junit.jar
-</code>
-Note that if a dependency is required in the two configurations, it will be 
copied in the two directories. The download of the dependency is however only 
made once at resolve time.
-
-<hr/>
-<code type="xml">
-<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]" sync="true" />
-</code>
-Same as before, but with synchronisation enabled.
-
-For instance, if the ivy file declares two configurations default and test, 
the resulting lib dir could look like this:
-<code>
-lib
-  default
-    commons-lang.jar
-    commons-logging.jar
-  test
-    junit.jar
-</code>
-And now suppose commons-logging is no longer part of the dependencies of the 
default configuration, then a new call to retrieve will result in:
-<code>
-lib
-  default
-    commons-lang.jar
-  test
-    junit.jar
-</code>
-With no synchronisation, commons-logging would not have been removed by the 
call.
-
-<hr/>
-<code type="xml">
-<ivy:retrieve pattern="${lib.dir}/[type]/[artifact]-[revision].[ext]" 
conf="runtime"/>
-</code>
-Retrieves only the dependencies of the <code>runtime</code> configuration in 
directories named by artifact type. The resulting lib dir could look like this:
-<code>
-lib
-  jar
-    commons-lang-1.0.jar
-    looks-1.1.jar
-  source
-    looks-1.1.zip
-</code>
-
-<hr/>
-<code type="xml">
-<ivy:retrieve pattern="${lib.dir}/[organisation]/[artifact]-[revision].[ext]" 
/>
-</code>
-Retrieves all dependencies of the last resolve call to a lib directory. The 
[organisation] token will get the unmodified organisation value. The resulting 
lib dir could look like this:
-<code>
-lib
-  org.apache
-    commons-lang-1.0.jar
-  org.junit
-    junit-4.1.jar
-    junit-4.1.zip
-</code>
-
-<code type="xml">
-<ivy:retrieve pattern="${lib.dir}/[orgPath]/[artifact]-[revision].[ext]" />
-</code>
-Retrieves all dependencies of the last resolve call to a lib directory. The 
[orgPath] token will get a tree structure. The resulting lib dir could look 
like this:
-<code>
-lib
-  org
-    apache
-      commons-lang-1.0.jar
-    junit
-      junit-4.1.jar
-      junit-4.1.zip
-</code>
-
-<hr/>
-<code type="xml">
-<ivy:retrieve organisation="foo" module="bar" inline="true" 
pattern="${my.install.dir}/[artifact].[ext]"/>
-</code>
-Resolves and retrieve the latest version of the module bar and its 
dependencies in the directory pointed by ${my.install.dir}.
-<hr/>
-<code type="xml">
-<ivy:retrieve pattern="lib/[artifact]-[revision].[ext]">
-    <firstmatchmapper>
-        <globmapper from="lib/*-SNAPSHOT.jar" 
to="lib/snapshots/*-SNAPSHOT.jar" />
-        <globmapper from="lib/*" to="lib/releases/*"/>
-    </firstmatchmapper>
-</ivy:retrieve>
-</code>
-Retrieves all dependencies of the last resolve call to a lib directory. The 
jar files with a version equal to 'SNAPSHOT' are retrieved in a 'snapshots' 
directory. The other ones are retrieved in a 'releases' directory.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/settings.html
----------------------------------------------------------------------
diff --git a/doc/use/settings.html b/doc/use/settings.html
deleted file mode 100644
index 9cab19f..0000000
--- a/doc/use/settings.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<span class="since">(since 2.0)</span>
-
-The settings declaration is used to configure ivy with an xml settings file. 
The difference with the [[ant:configure]] task is that when using the settings 
declaration, the configuration of Ivy will be done when the settings are first 
needed (for instance when you do a resolve), while the configure task will 
perform a configuration of Ivy instantly, which makes it easier to see the 
problem if something goes wrong.
-
-See [[settings]] for details about the settings file itself.<br/><br/>
-
-Multiple settings can be defined in a build script. Every task can reference 
its own settings.
-
-All Ivy variables set during the settings are available in the Ant project as 
long as they were not set in Ant before (Ant properties are immutable). 
-Moreover, the variables are exposed under two names: the variable name, and 
the variable name suffixed by dot + the settings id. 
-For instance, if you load a settings with the id 'myid', and define a variable 
my.variable=my.value in the Ivy settings, both my.variable and my.variable.myid 
will now be available as properties in Ant and equal to 'my.value'. If you 
later load another settings with the id 'yourid', and in this settings assign 
the variable 'my.variable' the value 'your.value', in the Ant project you will 
have:
-<code>
-my.variable=my.value
-my.variable.myid=my.value
-my.variable.yourid=your.value
-</code>
-
-<h2>Attributes</h2>
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>id</td><td>The settings id useable in the settingsRef attributes 
of the ivy task that needs a setting.  Note that the ivy tasks will search by 
default for the settings with the id "ivy.instance", which is the default 
value.</td><td>No, defaults to "ivy.instance"</td></tr>
-    <tr><td>file</td><td>path to the settings file to use</td>
-        <td rowspan="2">No. If a file is provided, url is ignored. If none are 
provided, then it attempts to find a file at ${ivy.settings.file}, and if this 
file does not exist, it uses a [[tutorial/defaultconf default settings 
file]]</td></tr>
-    <tr><td>url</td><td>url of the settings file to use</td></tr>
-    <tr><td>host</td><td>http authentication host</td><td rowspan="4">No, 
unless authentication is required</td></tr>
-    <tr><td>realm</td><td>http authentication realm</td></tr>
-    <tr><td>username</td><td>http authentication user name</td></tr>
-    <tr><td>passwd</td><td>http authentication password</td></tr>
-</tbody>
-</table>
-<h2>HTTP Authentication</h2>
-<i>Note: HTTP Authentication can be used only if <a 
href="http://jakarta.apache.org/commons/httpclient/";>commons-httpclient.jar</a> 
is in your classpath</i>
-If any of the url you use in ivy (especially in dependency resolvers) need http
-authentication, then you have to provide the host, realm, username and passwd
-attributes of the configure task. These settings will then be used in any
-further call to ivy tasks.<br/><br/>
-
-<h2>Multiple classloader</h2>
-A special attention should be applied when you have a multi-project build with 
<i>subant</i> call, using ivy task loaded by a <i>typedef</i>.  Indeed in this 
situation, it is possible to pass settings reference to a subbuild.  When you 
do that, you should take of the classloader.  The ivy task of your subant 
should not be defined in a different classloader than the parent one.  This can 
be achieved by using the <i>loader</i> parameter of the antlib declaration, or 
avoid to reload the ivy antlib in the subbuild (place the taskdef in a target 
only executed when the antlib is not yet loaded).<br/><br/>
-
-
-<h2>Examples</h2>
-<h3>Simplest settings</h3>
-<code><ivy:settings /></code>
-Use either ${ivy.settings.file} if it exists, or the <a 
href="../samples/ivysettings-default.xml">default settings file</a><br>
-This simplest setting is implicit.
-<h3>Configure with a file</h3>
-<code><ivy:settings file="mysettings.xml" /></code>
-<h3>Configure with an url</h3>
-<code><ivy:settings url="http://mysite.com/mysettings.xml"; /></code>
-<h3>Configure multiple realms which require autentication</h3>
-<code>
-<ivy:settings file="path/to/my/ivysettings.xml">
-  <credentials host="myhost.com" realm="My Realm" username="myuser" 
passwd="mypasswd" />
-  <credentials host="yourhost.com" realm="Your Realm" username="myuser" 
passwd="myotherpasswd" />
-</ivy:settings> 
-</code>
-<h3>Configure 2 different settings</h3>
-You can use multiple ivy settings during a build. Then every ivy task should 
specify the settings it uses using the settingsRef attribute.
-<code>
- <ivy:settings id="ivy.normal.settings" file="normal_settings.xml" />
- <ivy:settings id="ivy.release.settings" file="release_settings.xml" />
-
- <ivy:resolve settingsRef="ivy.normal.settings" />
- <ivy:resolve settingsRef="ivy.release.settings" />
-</code>
-</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/use/var.html
----------------------------------------------------------------------
diff --git a/doc/use/var.html b/doc/use/var.html
deleted file mode 100644
index 4d7b724..0000000
--- a/doc/use/var.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.    
--->
-<html>
-<head>
-       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-       <script type="text/javascript">var xookiConfig = {level: 1};</script>   
-       <script type="text/javascript" src="../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-Sets a variable (by name and value), or set of variables (from file or url) in 
ivy. <br/>
-Variables are case sensitive.<br/><br/>
-Contrary to ant properties, ivy variables are mutable. But a problem with this 
is that you do not control when 
-variables are substituted, and usually it is done as soon as possible. So 
changing the value of a variable will
-have no effect if it has already been substituted. Consequently, <b>using this 
task is NOT recommended</b>.
-See <a href="../reference.html">reference</a> page for details about ivy 
variables.
-<br/><br/>
-  
-<table class="ant">
-<thead>
-    <tr><th class="ant-att">Attribute</th><th 
class="ant-desc">Description</th><th class="ant-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the variable to set</td>
-        <td>No</td></tr>
-    <tr><td>value</td><td>the value of the variable to set</td>
-        <td>Yes when using the name attribute</td></tr>
-    <tr><td>file</td><td>the filename of the property file to load as ivy 
variables</td>
-        <td rowspan="2">One of these, when <b>not</b> using the name 
attribute</td></tr>
-    <tr><td>url</td><td>the url from which to read ivy variables</td></tr>
-    <tr><td>prefix</td><td>Prefix to apply to variables. A "." is appended to 
the prefix if not specified.</td>
-        <td>No</td></tr>
-    <tr><td>settingsRef</td><td>A reference to the ivy settings that must be 
used by this task <span class="since">(since 2.0)</span></td><td>No, 
'ivy.instance' is taken by default.</td></tr>
-</tbody>
-</table>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/xooki
----------------------------------------------------------------------
diff --git a/doc/xooki b/doc/xooki
deleted file mode 160000
index 38eff00..0000000
--- a/doc/xooki
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 38eff00e65ec74803838b52a111cab542cb80bca

Reply via email to