http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/ivyfile/configurations.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/configurations.html b/doc/ivyfile/configurations.html
deleted file mode 100644
index 92d8ee5..0000000
--- a/doc/ivyfile/configurations.html
+++ /dev/null
@@ -1,114 +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">
-<b>Tag:</b> configurations <b>Parent:</b> <a 
href="../ivyfile.html">ivy-module</a>
-
-A container for configuration elements. If this container is not present, it 
is assumed that the module has one public configuration called 'default'.
-
-<span class="since">since 2.2</span> You can define the default conf on this 
container by specifying the defaultconf attribute.  This attribute defines the 
conf mapping to use when no conf mapping is specified for a dependency in this 
ivy file.
-
-<span class="since">since 1.3</span> You can define a default conf mapping on 
this container by specifying the defaultconfmapping attribute.
-
-This attribute modifies the way ivy interprets conf mapping with no mapped 
conf. In this case, Ivy will look in the default conf mapping and use the conf 
mapping defined in the default conf mapping for the conf for which there is no 
mapped conf.
-
-In order to maintain backwards compatibility with Ivy 2.1.0 and earlier, the 
defaultconfmapping also provides one additional function.  If no defaultconf is 
specified (on either the configurations tag or the dependencies tag), the 
defaultconfmapping becomes the default configuration for dependencies in this 
ivy file when no configuration is specified.  In other words, in addition to 
altering the interpretation of individual configurations with no mapping, 
defaultconfmapping also performs exactly like defaultconf in the absence of a 
definition for defaultconf.
-
-If several defaultconfmapping or defaultconf attributes are defined (in the 
configurations tag, one or several in an included configurations file, and/or 
in the dependency tag, then it's only the last definition of each property 
which is taken into account.  The others will have no effect at all.
-
-See <a href="#defaultconfmapping">examples below</a> to clarify the behavior 
of these two attributes together.
-
-<span class="since">since 1.4</span> You can activate a confmappingoverride 
mode for all configurations, in which case the extending configurations will 
override the mappings of the configurations they extend from.
-
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>defaultconf</td><td>the default conf to use in this ivy file <span 
class="since">since 2.2</span></td><td>No, defaults to no default conf</td></tr>
-    <tr><td>defaultconfmapping</td><td>the default conf mapping to use in this 
ivy file <span class="since">since 1.3</span></td>
-        <td>No, defaults to no default conf mapping</td></tr>
-    <tr><td>confmappingoverride</td><td>true to activate configuration mapping 
override, false otherwise <span class="since">since 1.4</span></td>
-        <td>No, defaults to false</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><a href="../ivyfile/conf.html">conf</a></td><td>declares a 
configuration of this module</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/include.html">include</a></td><td>include 
configurations from another file</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>Configuration mappings details</h1>
-When Ivy parses your Ivy file, it will create (internally) modify the 
configuration mapping of your dependencies.
-For instance, say you have:
-<code type="xml">
-<configurations defaultconfmapping="conf1->other1;conf2->other2">
-   <conf name="conf1" />
-   <conf name="conf2" extends="conf1" />
-</configurations>
-<dependencies>
-   <dependency name="other-module" conf="conf1" />
-</dependencies>
-</code>
-When Ivy parses this file, it will construct the following dependency 
(in-memory only):
-<code type="xml"><dependency name="other-module" conf="conf1->other1" /></code>
-
-So, if you now resolve the conf2 configuration, you will only get the other1 
dependencies of your other-module.
-
-But when you set confmappingoverride to true, Ivy will construct the following 
dependency in memory:
-<code type="xml"><dependency name="other-module" 
conf="conf1->other1;conf2->other2" /></code>
-As you can see, the defaultmappings of the extending configurations are also 
added (although you didn't explicitly defined them)
-
-When you now resolve the conf2 configuration, you'll get the other2 
dependencies of your other-module. 
-
-<h1>Examples involving defaultconf and defaultconfmapping</h1>
-The table below indicates how Ivy interprets the conf attribute according to 
how [[ivyfile/configurations defaultconfmapping]] and [[ivyfile/configurations 
defaultconf]] are set:<table 
class="ivy-attributes"><thead><tr><th>defaultconf</th><th>defaultconfmapping</th><th>conf</th><th>ivy
 interpretation</th></tr>
-</thead>
-<tbody>
-<tr><td></td><td></td><td></td><td><code>*->*</code></td></tr>
-<tr><td></td><td></td><td>runtime</td><td><code>runtime->runtime</code></td></tr>
-<tr><td></td><td></td><td>test</td><td><code>test->test</code></td></tr>
-<tr><td><code>runtime</code></td><td></td><td></td><td><code>runtime->runtime</code></td></tr>
-<tr><td><code>runtime</code></td><td><code>runtime->*;test->default</code></td><td></td><td>runtime->*</td></tr>
-<tr><td><code>runtime</code></td><td><code>runtime->*;test->default</code></td><td>test</td><td>test->default</td></tr>
-<tr><td></td><td><code>runtime->*;test->default</code></td><td></td><td><code>runtime->*;test->default</code></td></tr>
-<tr><td></td><td><code>runtime->*;test->default</code></td><td>runtime</td><td><code>runtime->*</code></td></tr>
-<tr><td></td><td><code>runtime->*;test->default</code></td><td>test</td><td><code>test->default</code></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/ivyfile/conflict.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/conflict.html b/doc/ivyfile/conflict.html
deleted file mode 100644
index a4c3027..0000000
--- a/doc/ivyfile/conflict.html
+++ /dev/null
@@ -1,66 +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">
-<b>Tag:</b> conflict <b>Parent:</b> <a 
href="../ivyfile/dependencies.html">dependencies</a><br/>
-<br/>
-<span class="since">(since 2.0)</span>
-
-Specify a a conflict manager for one or several dependencies.
-The way to specify a conflict manager is by giving indication to which 
dependencies the conflict manager applies (by giving organisation and module 
names or name regexp), and then specifying the conflict manager, either by 
giving its name or by specifying a fixed revision list, in which case a fixed 
conflicts manager is used.
-
-The list of built-in conflict managers available is listed on the 
[[settings/conflict-managers conflict manager configuration page]].
-
-Conflicts manager are used during the resolve operation, i.e. when ivy analyse 
the graph of dependencies and download corresponding ivy files and artifacts. 
The fact to manage conflict at resolve time enables to minimize downloads: when 
a module is evicted by a conflict manager, it is not downloaded.
-
-There are two things optimized during conflict resolution: download of 
artifacts and download of ivy files. The first is always ensured by ivy, i.e. 
artifacts of a module evicted will never be downloaded. The second is not as 
simple to handle because to know what are the conflicts ivy needs to know the 
dependency graph, and to know the dependency graph, it has to download ivy 
files. But ivy is highly optimized on this too, and it tries to evict modules 
as soon as possible.
-That's why the order of dependencies is important for download optimization. 
Indeed ivy traverses the dependency graph in the order in which dependencies 
are declared in the ivy files, and each time it encounters a dependency on a 
module, it first check if there is a conflict on this module, and if this is 
the case, it asks the conflict manager to resolve the conflict. Then if the 
module is evicted, it does not download its ivy file, and the whole branch is 
not traversed, which can saves a lot of time.
-
-If no specific conflict manager is defined, a default conflict manager is used 
for all modules.
- 
-The current default conflict manager is the "latest-revision" conflict manager.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>org</td><td>the name, or an expression matching the name of 
organisation to which this conflict manager should apply (see matcher attribute 
below)</td>
-        <td>No, defaults to * (match all)</td></tr>
-    <tr><td>module</td><td>the name, or an expression matching the name of 
module to which this conflict manager should apply (see matcher attribute 
below)</td>
-        <td>No, defaults to * (match all)</td></tr>
-    <tr><td>manager</td><td>the name of the conflict manager to use</td>
-        <td rowspan="2">Exactly one of two</td></tr>
-    <tr><td>rev</td><td>a comma separated list of revisions this conflict 
manager should select</td></tr>
-    <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a> 
to use to match the modules for which the conflict manager should be used</td>
-        <td>No, defaults to exact</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/ivyfile/conflicts.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/conflicts.html b/doc/ivyfile/conflicts.html
deleted file mode 100644
index 478a4ac..0000000
--- a/doc/ivyfile/conflicts.html
+++ /dev/null
@@ -1,69 +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">
-<b>Tag:</b> conflicts <b>Parent:</b> <a 
href="../ivyfile.html">ivy-module</a><br/><br/>
-
-<span class="since">(since 2.0)</span> the conflicts section is deprecated.  
Use the [[ivyfile/conflict]] instead.
-
-Container for conflict manager elements, used to indicate how conflicts should 
be resolved
-for this module. <br/><br/>
-
-The list of built-in conflict managers available is listed on the 
[[settings/conflict-managers conflict manager configuration page]].<br/><br/>
-
-Conflicts manager are used during the resolve operation, i.e. when ivy analyse 
the graph of dependencies
-and download corresponding ivy files and artifacts. The fact to manage 
conflict at resolve time
-enables to minimize downloads: when a module is evicted by a conflict manager, 
it is not downloaded.<br/><br/>
-
-There are two things optimized during conflict resolution: download of 
artifacts and download
-of ivy files. The first is always ensured by ivy, i.e. artifacts of a module 
evicted will never
-be downloaded. The second is not as simple to handle because to know what are 
the conflicts
-ivy needs to know the dependency graph, and to know the dependency graph, it 
has to download
-ivy files. But ivy is highly optimized on this too, and it tries to evict 
modules as soon as possible.<br/>
-That's why the order of dependencies is important for download optimization. 
Indeed ivy
-traverses the dependency graph in the order in which dependencies are declared 
in the ivy files, 
-and each time it encounters a dependency on a module, it first check if there 
is a conflict on this module, 
-and if this is the case, it asks the conflict manager to resolve the conflict. 
Then if the module is evicted,
-it does not download its ivy file, and the whole branch is not traversed, 
which can saves
-a lot of time.<br/><br/>
-
-If this container is not present, a default conflict manager is used for all 
modules. 
-The current default conflict manager is the "latest-revision" conflict manager.
-<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><a href="../ivyfile/manager.html">manager</a></td><td>declares a 
conflict manager for this module</td>
-        <td>1..n</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/ivyfile/dependencies.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/dependencies.html b/doc/ivyfile/dependencies.html
deleted file mode 100644
index 6e28410..0000000
--- a/doc/ivyfile/dependencies.html
+++ /dev/null
@@ -1,76 +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">
-<b>Tag:</b> dependencies <b>Parent:</b> <a 
href="../ivyfile.html">ivy-module</a>
-
-Container for dependency elements, used to describe the dependencies of this 
module. 
-If this container is not present, it is assumed that the module has no 
dependency at all.
-
-This container provides for two similar behaviors.  An overview is given here. 
 (See [[ivyfile/configurations configurations doc page]] for more details about 
these behaviors).
-
-<span class="since">since 1.1</span><code>defaultconf</code>Defines the conf 
attribute to use when no conf is defined for a dependency in this ivy file. It 
is only used when no conf mapping is defined, and has no influence in other 
cases.
-
-<span class="since">since 1.3</span><code>defaultconfmapping</code> Influences 
the way that a conf mapping with no mapped conf is interpreted.
-
-In Ivy 2.1.0 and earlier, if both defaultconf and defaultconfmapping are 
defined, it's the defaultconfmapping that is used. Since Ivy 2.2.0, these 
attributes can be used together.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>defaultconf</td><td>the default configuration to use when none is 
specified in a dependency. <span class="since">since 1.1</span></em></td>
-        <td>No, defaults to *->*</td></tr>
-    <tr><td>defaultconfmapping</td><td>the default configuration mapping to 
use in this ivy file. <span class="since">since 1.3</span></em></td>
-        <td>No, defaults to no default conf mapping</td></tr>
-</tbody>
-</table>
-<h1>Child elements</h1>
-
-Note: as specified by the ivy.xsd, the children elements are ordered; must 
come first the <tt><a href="../ivyfile/dependency.html">dependency</a></tt> 
elements, then the <tt><a href="../ivyfile/exclude.html">exclude</a></tt> 
elements, then the <tt><a href="../ivyfile/override.html">override</a></tt> 
elements, and then the <tt><a href="../ivyfile/conflict.html">conflict</a></tt> 
elements.
-
-<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><a 
href="../ivyfile/dependency.html">dependency</a></td><td>declares a dependency 
for this module</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 of this 
module <span class="since">since 2.0</span></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>
-        <td>0..n</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/ivyfile/dependency-artifact-conf.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/dependency-artifact-conf.html 
b/doc/ivyfile/dependency-artifact-conf.html
deleted file mode 100644
index 0099047..0000000
--- a/doc/ivyfile/dependency-artifact-conf.html
+++ /dev/null
@@ -1,46 +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">
-<b>Tag:</b> conf <b>Parent:</b> <a 
href="../ivyfile/dependency-artifact.html">artifact</a>
-
-Specify a configuration in which the enclosing artifact specification should 
be included.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the master configuration in which the 
enclosing artifact should be included</td>
-        <td>Yes</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/ivyfile/dependency-artifact.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/dependency-artifact.html 
b/doc/ivyfile/dependency-artifact.html
deleted file mode 100644
index fa38e19..0000000
--- a/doc/ivyfile/dependency-artifact.html
+++ /dev/null
@@ -1,109 +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">
-<b>Tag:</b> artifact <b>Parent:</b> <a 
href="../ivyfile/dependency.html">dependency</a>
-
-This feature gives you more control on a dependency for which you do not 
control its ivy file. 
-It enables to specify the artifacts required, if the dependency has no ivy 
file. 
-
-Indeed, when a module has no ivy file, it is assumed that it publishes exactly 
one artifact having the same name as the module itself. But when this module 
publishes more artifacts, or simply does not respect the name rule, and if you 
cannot deliver an ivy file for it (because you do not control the repository, 
for instance - think about maven ibiblio repository, to give no name), then 
this feature let you specify the artifacts names you want to get.
-
-Each artifact specification can be given in the context of particular master 
configurations. By default, if no configuration is specified, artifacts 
specification apply to all master configurations. But you can specify that a 
specification applies only to one or several master configurations, using 
either inline or nested conf specification. In this case, do not forget that if 
you do not specify any specification for a particular configuration, then no 
specification will apply for this configuration and it will be resolved not 
taking into account any specification.
-
-For instance, imagine you have A, B & C master configurations. If you specify 
art1 in A & B and art2 in A, then C will not be specified at all, and will thus 
assume the default artifact. To prevent this, you have to specify a 
configuration mapping for the dependency, mapping only A & B to some or all 
dependency configurations.
-
-Example:
-<code type="xml">
-<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="A,B->default">
-  <artifact name="art1" type="jar" conf="A,B"/>
-  <artifact name="art2" type="jar" conf="A"/>
-</dependency>  
-</code>
-
-<span class="since">since 1.4</span> It's possible to indicate the url at 
which the artifact can be found. This is not mandatory, and even not 
recommended with an enterprise repository. Note that Ivy will always look at 
the location where the artifact should be and only use the url if it cannot be 
found at the standard location in the repository.
-
-<span class="since">since 1.4</span> This tag supports <a 
href="../concept.html#extra">extra attributes</a>.
-
-<span class="since">since 2.0</span> This feature can also be used for modules 
having their own module descriptor, but which doesn't declare an artifact you 
know that is published. Note that in this case artifacts declared to be 
published by the dependency will be ignored, so do not forget to include all 
artifacts you want.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of an artifact of the dependency module</td>
-        <td>Yes</td></tr>
-    <tr><td>type</td><td>the type of the artifact of the dependency module</td>
-        <td>Yes</td></tr>
-    <tr><td>ext</td><td>the extension of the artifact of the dependency 
module</td>
-        <td>No, defaults to type</td></tr>
-    <tr><td>conf</td><td>comma separated list of the master configurations in 
which this artifact should be included.
-    '*' wildcard can be used to designate all configurations of this 
module</td>
-        <td>No, defaults to '*', unless nested conf are specified</td></tr>
-    <tr><td>url</td><td>an url where this artifact can be found if it isn't 
present at the standard location in the repository <span class="since">since 
1.4</span></td>
-        <td>No, defaults to no url</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><a 
href="../ivyfile/dependency-artifact-conf.html">conf</a></td><td>configuration 
in which the artifact should be included</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<dependency org="foo" name="bar" rev="1.0">
-  <artifact name="baz" type="jar"/>
-</dependency>
-</code>
-Declares a dependency on module bar which only publish one artifact: baz.jar.
-
-<hr/>
-<code type="xml">
-<dependency org="foo" name="bar" rev="1.0">
-  <artifact name="baz" type="jar" 
url="http://www.acme.com/repository/bar/baz-1.0-acme.jar"/>
-</dependency>
-</code>
-Same as above, except that if the artifact is not found at its standard 
location, Ivy will use http://www.acme.com/repository/bar/baz-1.0-acme.jar to 
download it.
-
-<hr/>
-<code type="xml">
-<dependency org="foo" name="bar" rev="1.0">
-  <include name="*"/>
-  <artifact name="baz" type="source" ext="jar"/>
-</dependency>
-</code>
-Declares a dependency on module bar for which all artifacts declared will be 
used (thanks to the include tag) plus an artifact baz of type source and ext 
jar (which is not declared in module bar module descriptor).
-</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/ivyfile/dependency-conf.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/dependency-conf.html b/doc/ivyfile/dependency-conf.html
deleted file mode 100644
index c14aab5..0000000
--- a/doc/ivyfile/dependency-conf.html
+++ /dev/null
@@ -1,61 +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">
-<b>Tag:</b> conf <b>Parent:</b> <a 
href="../ivyfile/dependency.html">dependency</a><br/>
-<br/>
-Describes a configuration mapping for a dependency. See also the inline 
configuration mapping
-in dependency element.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the master configuration to map. 
-       '*' wildcard can be used to designate all configurations of this 
module</td>
-        <td>Yes</td></tr>
-    <tr><td>mapped</td><td>a comma separated list of dependency configurations 
to which this
-    master configuration should be mapped</td>
-        <td>No, default to the same configuration as master one, unless nested 
mapped elements are specified</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><a href="../ivyfile/mapped.html">mapped</a></td><td>map dependency 
configurations for this master configuration</td>
-        <td>0..n</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/ivyfile/dependency-include-conf.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/dependency-include-conf.html 
b/doc/ivyfile/dependency-include-conf.html
deleted file mode 100644
index cbe1c7d..0000000
--- a/doc/ivyfile/dependency-include-conf.html
+++ /dev/null
@@ -1,46 +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">
-<b>Tag:</b> conf <b>Parent:</b> <a 
href="../ivyfile/dependency-include.html">include</a>
-
-Specify a configuration in which the enclosing artifact inclusion should be 
included.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the master configuration in which the 
enclosing artifact should be included</td>
-        <td>Yes</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/ivyfile/dependency-include.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/dependency-include.html 
b/doc/ivyfile/dependency-include.html
deleted file mode 100644
index d081bde..0000000
--- a/doc/ivyfile/dependency-include.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">
-<b>Tag:</b> include <b>Parent:</b> <a 
href="../ivyfile/dependency.html">dependency</a>
-
-This feature gives you more control on a dependency for which you do not 
control its ivy file. 
-It enables to restrict the artifacts required by including only the artifacts 
given here, even if configuration does not a good separation of published 
artifacts.
-
-Each artifact restriction can be given in the context of particular master 
configurations. By default, if no configuration is specified, artifacts 
restriction apply to all master configurations. But you can specify that a 
restriction applies only to one or several master configurations, using either 
inline or nested conf specification. In this case, do not forget that if you do 
not specify any restriction for a particular configuration, then no restriction 
will apply for this configuration and it will be resolved not taking into 
account any restriction.
-
-For instance, imagine you have A, B & C master configurations. If you restrict 
to art1 in A & B and art2 in A, then C will not be restricted at all, and will 
thus get all artifacts of all dependency configurations if you do not specify a 
configuration mapping. To prevent this, you have to specify a configuration 
mapping for the dependency, mapping only A & B to some or all dependency 
configurations.
-
-Example:
-<code type="xml">
-<dependency org="yourorg" name="yourmodule9" rev="9.1" conf="A,B->default">
-  <include name="art1" type="jar" conf="A,B"/>
-  <include name="art2" type="jar" conf="A"/>
-</dependency>          
-</code>
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of an artifact of the dependency module to 
add to the include list, or an expression matching this name (see matcher 
attribute below)</td>
-        <td>No, defaults to .*</td></tr>
-    <tr><td>type</td><td>the type of the artifact of the dependency module to 
add to the include list, or an expression matching this name (see matcher 
attribute below)</td>
-        <td>No, defaults to .*</td></tr>
-    <tr><td>ext</td><td>the extension of the artifact of the dependency module 
to add to the include list, or an expression matching this name (see matcher 
attribute below)</td>
-        <td>No, defaults to type</td></tr>
-    <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a> 
to use to match the modules to include <span class="since">since 2.0</span></td>
-        <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 
1.3 and superior</td></tr>
-    <tr><td>conf</td><td>comma separated list of the master configurations in 
which this artifact should be included.
-    '*' wildcard can be used to designate all configurations of this 
module</td>
-        <td>No, defaults to '*', unless nested conf are specified</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><a 
href="../ivyfile/dependency-include-conf.html">conf</a></td><td>configuration 
in which the artifact should be included</td>
-        <td>0..n</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/ivyfile/dependency.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/dependency.html b/doc/ivyfile/dependency.html
deleted file mode 100644
index e66b38c..0000000
--- a/doc/ivyfile/dependency.html
+++ /dev/null
@@ -1,225 +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">
-<b>Tag:</b> dependency <b>Parent:</b> <a 
href="dependencies.html">dependencies</a>
-
-Declares a dependency for this module. A dependency is described by the module 
on which the current module depends (identified by its name, organisation and 
revision), and a mapping of configurations.
-
-<h2><a name="revision">Fixed and dynamic revisions</a></h2>
-The revision can be given as a fixed one (1.5.2, for instance) or as a latest 
(or dynamic) one. Several possibilities for dynamic revisions are implemented 
in Ivy:
-<ul>
-<li>latest.integration</li> selects the latest revision of the dependency 
module.
-<li>latest.[any status] <span class="since">since 1.4</span></li> selects the 
latest revision of the dependency module with at least the specified status. 
-
-For instance latest.milestone will select the latest version being either a 
milestone or a release, and latest.release will only selects the latest 
release. Note that in order to find the latest revision with the appropriate 
status Ivy has to parse all the ivy files in your repository from the last one 
until it finds such a revision. Hence don't be surprised if the resolution slow 
down.
-See also [[settings/statuses]] to see how to configure module statuses.
-<li>end the revision with a +</li> selects the latest sub-revision of the 
dependency module. For instance, 
-if the dependency module exists in revision 1.0.3, 1.0.7 and 1.1.2, "1.0.+" 
will select 1.0.7.
-<li>version ranges <span class="since">since 1.4</span></li> mathematical 
notation for ranges can be used to match a range of version.   
-
-Examples:
-[1.0,2.0] matches all versions greater or equal to 1.0 and lower or equal to 
2.0
-[1.0,2.0[ matches all versions greater or equal to 1.0 and lower than 2.0
-]1.0,2.0] matches all versions greater than 1.0 and lower or equal to 2.0
-]1.0,2.0[ matches all versions greater than 1.0 and lower than 2.0
-[1.0,) matches all versions greater or equal to 1.0
-]1.0,) matches all versions greater than 1.0
-(,2.0] matches all versions lower or equal to 2.0
-(,2.0[ matches all versions lower than 2.0 
-</ul>
-<span class="since">since 1.4</span> If you don't find a way to expression 
your dependency version constraint among these, you can 
[[settings/version-matchers plug your own]].
-The way to determine which revision is the "latest" between two is 
configurable through the use of pluggable LatestStrategy. See <a 
href="../reference.html">ivy main concepts</a> for details about this.
-
-<h2><a name="revision-constraint">Revision constraint</a></h2>
-<span class="since">since 2.0</span> The dependency tag supports two revision 
attributes: rev, corresponding to the default required dependency revision, and 
revConstraint, corresponding to a dynamic revision constraint applied on this 
dependency. 
-
-Depending on the [[ant:resolve resolve mode]] used, the actual revision used 
during dependency resolution may vary. These revisions usually differ only for 
modules published in a repository. When [[ant:deliver]] is used, dynamic 
version constraints are replaced by a stic version constraint, to help build 
reproducibility. However, the information of the original version constraint is 
not lost, but rather put in the revConstraint attribute. This both ensure 
better metadata in the repository while still allowing easier build 
reproducibility. 
-
-<h2>Configurations mapping</h2>
-This mapping indicates which configurations of the dependency are required in 
which configurations of the current module, also called master configurations.
-
-There are several ways to declare this mapping of configurations, choose 
depending more on preference than on possibilities. Try to avoid mixing usage 
in a single dependency element: do not use both nested and inline mapping 
declaration.
-
-The first way to declare this mapping is called the inline mapping. It is 
maybe the less natural at first, but it's powerful and concise. Inline mapping 
can take several forms.
-
-<ul>
-<li>Specify one configuration name</li> This means that in this master 
configuration the same dependency configuration is needed (except if a 
defaultconfmapping has been specified in this ivy file, see 
[[ivyfile/configurations configurations]] for details, or table below for 
examples).
-For instance, if the current module has defined a configuration named 
'runtime', and the dependency too, then having an inline mapping configuration 
set to 'runtime' means that in the runtime master configuration the runtime 
dependency configuration is required.
-
-The <a href="../ivyfile/configurations.html#defaultconfmapping">examples on 
the dependency on the configurations page</a> explain how ivy interprets the 
conf attribute according to how [[ivyfile/configurations defaultconfmapping]] 
and [[ivyfile/configurations defaultconf]] is set.
-<br/>
-<li>Specify a configuration mapping using the '->' operator separating a comma 
separated list of master configurations (left operand) of a comma separated 
list of dependency configurations (right operand).</li>
-A good way to remember which side is for the master configuration (i.e. the 
configuration of the module defining the dependency) and which side is for the 
dependency configuration is to read the '->' as 'depends on'.
-
-In this case, all specified dependency configurations are required in all 
specified master configurations.
-For instance, 'A, B, C -> E, F' means that dependency configurations E & F are 
required in master configurations A, B and C.
-
-Note that you can use the wildcard '*' as a configuration name, meaning that 
all configurations (either master or dependency public ones depending on the 
side) are wanted. For instance, '* -> B, C' means that B & C dependency 
configurations are required in all master configurations.
-
-<span class="since">since 1.4</span> you can use * wildcard followed by 
negated configurations to mean all but xxx. For instance, '*, !A, !B -> X' 
means that X dependency configuration is required in all master configurations 
except A and B.
-
-<span class="since">since 1.2</span> '@' also has a special meaning as a right 
operand of the dependency mapping, it means map to self. This is particularly 
useful with '*', '*->@' meaning that all configurations of the module maps to 
their equivalent (same name) in the dependency.
-
-<span class="since">since 1.4</span> '#' can be used as right side operand to 
mean 'this' configuration, and thus refers to the configuration being resolved. 
It is slightly similar to @, except that it takes into account the 
configuration being actually resolved in case of a configuration extending 
another one.
-
-Example:
-Let's foo be a module with two configurations, A and B, B extending A.
-Then a dependency declaring conf A-># will get A dep conf in its confs A (when 
resolving A, ivy will find interpret the # symbol as A) and B dep conf in its 
conf B (when resolving B, ivy will interpret the # symbol as B, even if this 
dependency is only required because of the A dependency).
-
-If you don't understand really how this works, do not use it :-)
-
-<span class="since">since 1.4</span> '%' can be used as left side operand to 
mean 'all the other configurations'. This can be usefull when you only have a 
specific mapping for some configurations and a default mapping for all the 
others.
-
-Example:
-<code>test->runtime;%->default</code> means that the <code>test</code> 
configuration is mapped to the <code>runtime</code> configuration, but all the 
other configurations are mapped to the <code>default</code> configuration.
-
-<span class="since">since 1.3</span> a fallback mechanism can be used when you 
are not sure that the dependency will have the required conf. You can indicate 
to ivy that you want one configuration, but if it isn't present, use another 
one. 
-The syntax for specifying this adds the fallback conf between parenthesis 
right after the required conf. 
-For instance, <code>test->runtime(default)</code> means that in the test 
configuration of the module the <code>runtime</code> conf of the dependency is 
required, but if doesn't exist, it will use the <code>default</code> conf 
instead. If <code>default</code> conf doesn't exist then it will be considered 
as an error. Note that the <code>*</code> wildcard can be used as fallback conf.
-
-<span class="since">since 2.1</span> It is also possible to define 
dependencies on configurations intersection. A configuration intersection is 
defined using a '+' sign to separate the configuration (eg 'A+B' means the 
intersection of configuration 'A' and 'B'). In that case only artifacts and 
dependencies defined in both configurations in the dependency will be part of 
the master configuration defining the dependency on the configuration 
intersection.
-
-Configuration intersections can also be used when specifying the confs to 
[[ant:resolve]]. 
-
-Moreover, the mapping '*->@' is handled as a specific case with configuration 
intersections: it maps also the intersections. So if one resolve conf A+B in a 
module which defines a dependency with mapping *->@, the mapping *->@ is 
interpreted as A+B->A+B so the intersection of A and B will be resolved in the 
dependency.
-
-<span class="since">since 2.1</span> you can refer to a group of 
configurations sharing the same value for an attribute as left side part of the 
dependency mapping. 
-
-The syntax is 
-<code>*[att=value]</code>
-where <em>att</em> is the name of the attribute shared by the configurations 
of the group, and <em>value</em> is the value for this attribute that 
configurations must have to be part of the group. This is especially useful 
with extra attributes.
-
-For instance, if you have:
-<code>
-<configurations>
-       <conf name="red" e:axis="color" />
-       <conf name="blue" e:axis="color" />
-               
-       <conf name="windows" e:axis="platform" />
-       <conf name="linux" e:axis="platform"/>
-</configurations>
-</code>
-
-Then you can do:
-<code>
-<dependency org="acme" name="foo" rev="2.0" conf="*[axis=platform]->default"/>
-</code>
-To map the windows and linux configurations (the one which have the attribute 
axis equal to platform) to the default configuration of foo.
-
-<span class="since">since 1.4</span> you can add simple conditions in the 
right side of the dependency mapping. This is done by adding a condition 
between '[' and ']'. If the condition evaluates to <code>true</code>, the 
mapping is performed. If the condition evaluates to <code>false</code>, the 
mapping will be ignored. For instance, 
<code>test->[org=A]runtime,[org=B]default</code> means that the 
<code>test</code> configuration will be mapped to the <code>runtime</code> conf 
for the dependencies of organisation 'A' and to the <code>default</code> conf 
for dependencies of organisation 'B'.
-
-<li>Specify a semi-column separated list of any of the previous specs.</li> In 
this case, it is the union of the mapping which is kept. For instance, 'A -> B; 
* -> C' means that B conf is needed in A conf and C conf is need in all master 
conf... so both B & C dep conf are required in A master conf
-</ul>
-
-If you prefer more verbose mapping declaration, everything is also possible 
with sub elements mapping declaration. 
-
-<h2>Artifact restriction</h2>
-Moreover, the dependency element also supports an artifact restriction feature 
(since 0.6).
-See <a href="../ivyfile/dependency-artifact.html">dependency artifact</a> for 
details.
-
-<h2>Forcing revision</h2>
-Finally, the dependency element also supports an a force attribute (since 
0.8), which gives an indication
-to conflicts manager to force the revision of a dependency to the one given 
here.
-See <a href="../ivyfile/conflicts.html">conflicts manager</a> for details. 
-
-<span class="since">since 1.4</span> this tag supports <a 
href="../concept.html#extra">extra attributes</a>
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>org</td><td>the name of the organisation of the dependency.</td>
-        <td>No, defaults to the master module organisation</td></tr>
-    <tr><td>name</td><td>the module name of the dependency</td>
-        <td>Yes</td></tr>
-    <tr><td>branch</td><td>the branch of the dependency. <span 
class="since">since 1.4</span></td>
-        <td>No, defaults to the default branch [[settings/conf.html setting]] 
for the dependency.</td></tr>
-    <tr><td>rev</td><td>the revision of the dependency. See <a 
href="#revision">above</a> for details.</td>
-        <td>Yes</td></tr>
-    <tr><td>revConstraint</td><td>the dynamic revision constraint originally 
used for this dependency. See <a href="#revision-constraint">above</a> for 
details.</td>
-        <td>No, defaults to the value of rev</td></tr>
-    <tr><td>force</td><td>a boolean to give an indication to conflict manager 
that this dependency 
-     should be forced to this revision (see <a 
href="../ivyfile/conflicts.html">conflicts manager</a>)</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>conf</td><td>an inline mapping configuration spec (see above for 
details)</td>
-        <td>No, defaults to defaultconf attribute of dependencies element if 
neither conf attribute nor conf children element is given</td></tr>
-    <tr><td>transitive</td><td>true to resolve this dependency transitively, 
false otherwise (<span class="since">since 1.2</span>)</td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>changing</td><td>true if the dependency artifacts may change 
without revision change, false otherwise (<span class="since">since 
1.2</span>). See <a href="../concept.html#change">cache and change 
management</a> for details.</td>
-        <td>No, defaults to false</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><a href="../ivyfile/dependency-conf.html">conf</a></td><td>defines 
configuration mapping has sub element</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/dependency-artifact.html">artifact / 
include</a></td><td>defines artifacts inclusion - use only if you do not 
control dependency ivy file</td>
-        <td>0..n</td></tr>
-    <tr><td><a 
href="../ivyfile/artifact-exclude.html">exclude</a></td><td>defines artifacts 
exclusion - use only if you do not control dependency ivy file</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code type="xml">
-<dependency org="jayasoft" name="swtbinding" revision="0.2"/>
-</code>
-Declares a dependency on the module swtbinding from jayasoft in its revision 
0.2. All the configuration of this dependency will be included in all 
configurations of the module in which the dependency is declared.
-<hr/>
-<code type="xml">
-<dependency org="jayasoft" name="swtbinding" branch="fix-103" 
revision="latest.integration"/>
-</code>
-Same as above except that it will take the latest revision on the branch 
'fix-103' instead of revision '0.2'.
-<hr/>
-<code type="xml">
-<dependency name="mymodule" revision="latest.integration" 
conf="test->default"/>
-</code>
-Declares a dependency on the module <code>mymodule</code> from the same 
organisation as the module in which the dependency is declared. The latest 
available revision of this dependency will be used. This dependency will only 
be included in the test configuration of the module, and it's only the default 
configuration of the dependency which will be included.
-<hr/>
-<code type="xml">
-<dependency org="apache" name="commons-lang" revision="2.0" force="true" 
conf="default"/>
-</code>
-Declares a dependency on the module <code>commons-lang</code> from apache, in 
revision 2.0. The revision 2.0 will be used even if another dependency declares 
itself a dependency on another version of commons-lang. Moreover, if no 
defaultconfmapping is defined, only the <code>default</code> conf of 
commons-lang will be used in the <code>default</code> conf of the master 
module. If <code>*->runtime</code> was declared as defaultconfmapping, then the 
runtime conf of commons-lang would be included in the default conf of the 
master module. Note that whatever the defaultconfmapping is, the dependency 
only be included in the default conf of the master module. The 
defaultconfmapping only changes the required dependency confs.
-<hr/>
-<code type="xml">
-<dependency org="foo" name="bar" revision="3.0" transitive="false" 
conf="default->@;runtime,test->runtime"/>
-</code>
-Declares a dependency on the module <code>bar</code> from foo, in revision 
3.0. The dependencies of bar will themselves not be included due to the setting 
of transitive. The default dependency conf will be included in the default 
master conf, and the runtime dependency conf will be included in both the 
runtime and test master conf.
-<hr/>
-<code type="xml">
-<dependency org="foo" name="bar" revision="3.0" changing="true" 
conf="compile->runtime(default)"/>
-</code>
-Declares a dependency on the module <code>bar</code> from foo, in revision 
3.0. This revision is considered to be able to change 
(<code>changing="true"</code>), so even if it is already in ivy cache, Ivy will 
check if a revision is a more recent last modified date is available on the 
repository. The runtime conf of bar is required in the compile conf of the 
master module, but if bar doesn't define a runtime conf, then the 
<code>default</code> conf will be used.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/ivyfile/description.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/description.html b/doc/ivyfile/description.html
deleted file mode 100644
index 30e5e0e..0000000
--- a/doc/ivyfile/description.html
+++ /dev/null
@@ -1,49 +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">
-<b>Tag:</b> description <b>Parent:</b> <a 
href="../ivyfile/info.html">info</a><br/>
-<br/>
-Describes the current module. This tag is the only one which can contain free 
text,
-including html. It is used to describe the module itself, usually in a single 
short phrase
-(it is not meant to replace the module description on the corresponding web 
site), and then
-gives all information necessary to use the module, especially information about
-public configurations, how and when to use them.
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>homepage</td><td>the url of the homepage of the module</td>
-        <td>No, but it's recommended to indicate it.</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/ivyfile/exclude.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/exclude.html b/doc/ivyfile/exclude.html
deleted file mode 100644
index 16d9bf9..0000000
--- a/doc/ivyfile/exclude.html
+++ /dev/null
@@ -1,60 +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">
-<b>Tag:</b> exclude <b>Parent:</b> <a 
href="../ivyfile/dependencies.html">dependencies</a>
-
-<span class="since">since 2.0</span> This feature gives you more control on a 
dependency for which you do not control its ivy file. 
-It allows to exclude artifacts, modules or organizations from the list of 
dependencies for the whole module.
-
-It is very similar to the [[ivyfile/artifact-exclude dependency exclude]] 
element, except that it applies to a whole module, which can be very useful 
when a lot of dependencies transitively bring a module you don't want.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>org</td><td>the organization of the dependency module or artifact 
to exclude, or a regexp matching this organization</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>module</td><td>the name of the dependency module or the artifact 
to exclude, or a regexp matching this module name</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>artifact</td><td>the name of an artifact of the dependency module 
to add to the exclude list, or an expression matching this name (see matcher 
attribute below)</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>type</td><td>the type of the artifact of the dependency module to 
add to the exclude list, or a regexp matching this name</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>ext</td><td>the extension of the artifact of the dependency module 
to add to the exclude list, or an expression matching this name (see matcher 
attribute below)</td>
-        <td>No, defaults to type</td></tr>
-    <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a> 
to use to match the modules to excludes</td>
-        <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 
1.3 and superior</td></tr>
-    <tr><td>conf</td><td>comma separated list of the master configurations in 
which this artifact should be included.
-    '*' wildcard can be used to designate all configurations of this 
module</td>
-        <td>No, defaults to '*', unless nested conf are specified</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/ivyfile/extends.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/extends.html b/doc/ivyfile/extends.html
deleted file mode 100644
index 587cfeb..0000000
--- a/doc/ivyfile/extends.html
+++ /dev/null
@@ -1,67 +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">
-<b>Tag:</b> extends <b>Parent:</b> <a href="../ivyfile/info.html">info</a>
-
-<span class="since">since 2.2</span> Identifies an optional parent descriptor 
for this module.  For complicated projects composed of many modules that have 
common configurations or dependencies, inheritance allows modules to share this 
information.  Which parts of the parent descriptor are inherited can be 
controlled with the <i>extendType</i> attribute.  Supported <i>extendType</i> 
values are:
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Value</th><th 
class="ivy-att-desc">Description</th></tr>
-</thead>
-<tbody>
-    <tr><td>info</td><td>Attributes of the <a 
href="../ivyfile/info.html">info</a> element are inherited from the parent.  
When an attribute appears in both child and parent, the child value is 
used.</td></tr>
-    <tr><td>description</td><td>The content of the <a 
href="../ivyfile/description.html">info/description</a> element is inherited 
from the parent.</td></tr>
-    <tr><td>configurations</td><td><a 
href="../ivyfile/conf.html">Configurations</a> defined in the parent descriptor 
are added to any configurations defined in the child descriptor.</td></tr>
-    <tr><td>dependencies</td><td><a 
href="../ivyfile/dependency.html">Dependencies</a> defined in the parent 
descriptor are added to any dependencies defined in the child 
descriptor.</td></tr>
-    <tr><td>licenses</td><td><a href="../ivyfile/license.html">Licenses</a> 
defined in the parent descriptor are added to any licenses defined in the child 
descriptor.</td></tr>
-    <tr><td>all</td><td>info, description, configurations, licenses and 
dependencies from the parent descriptor are merged into the child 
descriptor.</td></tr>
-</tbody>
-</table>
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>organisation</td><td>the organisation of the parent module</td>
-        <td>Yes</td></tr>
-    <tr><td>module</td><td>the name of the parent module</td>
-        <td>Yes</td></tr>
-    <tr><td>revision</td><td>the revision of the parent module.  Can be fixed, 
a dynamic value, or range of revisions; see <a 
href="../ivyfile/dependency.html">dependency</a> for information on specifying 
revisions.</td>
-        <td>Yes</td></tr>
-    <tr><td>extendType</td><td>which part(s) of the parent descriptor are 
inherited.  Valid values are <i>info</i>, <i>description</i>,
-<i>configurations</i>, <i>dependencies</i>, and <i>all</i>.</td>
-        <td>No, default is <i>all</i></td></tr>
-    <tr><td>location</td><td><p>A local filesystem path that should be 
searched for the parent descriptor.  If the parent descriptor cannot be found 
at this location, it will be located using dependency resolvers like any normal 
dependency.</p><p>This attribute is intended for development use.  For example, 
child module descriptors appear in a source control directory with the parent 
module descriptor at a higher level.  <i>location</i> will then contain the 
relative path to the parent descriptor for use during development 
builds.</p></td>
-        <td>No, as long as the parent descriptor exists in an Ivy 
resolver</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/ivyfile/include.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/include.html b/doc/ivyfile/include.html
deleted file mode 100644
index 63cc6cb..0000000
--- a/doc/ivyfile/include.html
+++ /dev/null
@@ -1,75 +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">
-<b>Tag:</b> include <b>Parent:</b> [[ivyfile/configurations]]
-
-Include configurations specified in another file. <span class="since">since 
1.3</span>
-
-The included file should have a configurations tag as root tag, which follow 
the same specification as the <a 
href="../ivyfile/configurations.html">configurations</a> tag of the ivy file. 
-
-This means that it can contain conf declarations, other file inclusion, and 
also a defaultconfmapping.
-
-When delivering an ivy file with such an inclusion, the included configuration 
file is inlined, i.e. ivy remove the dependency on the external file.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>file</td><td>the file to include</td>
-        <td>Yes</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivy-module version="1.0">
-  <info organisation="myorg"
-         module="mymodule"
-  />
-  <configurations>
-    <include file="path/to/included-configurations.xml"/>
-    <conf name="conf3"/>
-  </configurations>
-  <dependencies>
-    <dependency name="mymodule1" rev="1.0"/>
-    <dependency name="mymodule2" rev="2.0" conf="conf2,conf3->*"/>
-  </dependencies>
-</ivy-module>
-</code>
-with included-configurations.xml like this:
-<code type="xml">
-<configurations defaultconfmapping="*->@">
-  <conf name="conf1" visibility="public"/>
-  <conf name="conf2" visibility="private"/>
-</configurations>
-</code>
-Defines 3 configurations, conf1, conf2 and conf3. mymodule1 is required in 
each configuration, with for each the same configuration (conf1 is needed in 
conf1, conf2 in conf2, and conf3 in conf3) due to the defaultconfmapping 
defined in the included file.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/ivyfile/info.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/info.html b/doc/ivyfile/info.html
deleted file mode 100644
index 28bc447..0000000
--- a/doc/ivyfile/info.html
+++ /dev/null
@@ -1,77 +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">
-<b>Tag:</b> info <b>Parent:</b> <a href="../ivyfile.html">ivy-module</a>
-
-Gives identification and basic information about the module this ivy file 
describes.
-
-<span class="since">since 1.4</span> This tag supports <a 
href="../concept.html#extra">extra attributes</a>.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>organisation</td><td>the name of the organisation that is the 
owner of this module.</td>
-        <td>Yes</td></tr>
-    <tr><td>module</td><td>the name of the module described by this ivy 
file.</td>
-        <td>Yes</td></tr>
-    <tr><td>branch</td><td>the branch of this module. <span 
class="since">since 1.4</span></td>
-        <td>No, defaults to the default branch [[settings/conf setting]], or 
nothing if no default branch is configured</td></tr>
-    <tr><td>revision</td><td>the revision of this module.</td>
-        <td>Yes in repository ivy files, no in ivy files to resolve</td></tr>
-    <tr><td>status</td><td>the status of this module. See <a 
href="../reference.html">terminology</a> section for details</td>
-        <td>No, default to 'integration'</td></tr>
-    <tr><td>publication</td><td>the date of publication of this module. It 
should be given in this format: yyyyMMddHHmmss</td>
-        <td>No, but it's a good practice to set it with delivered ivy 
files</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><a href="../ivyfile/extends.html">extends</a></td><td>identifies a 
parent Ivy file from which this descriptor inherits content</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="../ivyfile/license.html">license</a></td><td>contains 
information about the licenses of the described module</td>
-        <td>0..n</td></tr>
-    <tr><td><a 
href="../ivyfile/ivyauthor.html">ivyauthor</a></td><td>describes who has 
contributed to write the ivy file</td>
-        <td>0..n</td></tr>
-    <tr><td><a 
href="../ivyfile/repository.html">repository</a></td><td>describes on which 
public repositories this module can be found</td>
-        <td>0..n</td></tr>
-    <tr><td><a 
href="../ivyfile/description.html">description</a></td><td>describes how to use 
the module</td>
-        <td>0..1</td></tr>
-</tbody>
-</table>
-After the description, you can also place your own tags in your own namespace. 
 This allow to provide some custom information about the module.
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/ivyfile/ivyauthor.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/ivyauthor.html b/doc/ivyfile/ivyauthor.html
deleted file mode 100644
index 7cc11e9..0000000
--- a/doc/ivyfile/ivyauthor.html
+++ /dev/null
@@ -1,48 +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">
-<b>Tag:</b> ivyauthor <b>Parent:</b> <a 
href="../ivyfile/info.html">info</a><br/>
-<br/>
-Gives information about who has contributed to write this ivy file. It does 
NOT indicate who 
-is the author of the module itself.
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the author, as a person or a company.</td>
-        <td>Yes</td></tr>
-    <tr><td>url</td><td>an url pointing to where the author can bea 
reached.</td>
-        <td>No, but it's a good practice to indicate it</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/ivyfile/license.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/license.html b/doc/ivyfile/license.html
deleted file mode 100644
index 17b832e..0000000
--- a/doc/ivyfile/license.html
+++ /dev/null
@@ -1,47 +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">
-<b>Tag:</b> license <b>Parent:</b> <a href="../ivyfile/info.html">info</a><br/>
-<br/>
-Gives information about a license of the described module.
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the license. Try to respect spelling when 
using a classical license.</td>
-        <td>Yes</td></tr>
-    <tr><td>url</td><td>an url pointing to the license text.</td>
-        <td>No, but it's a good practice to indicate it</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/ivyfile/manager.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/manager.html b/doc/ivyfile/manager.html
deleted file mode 100644
index b4504c4..0000000
--- a/doc/ivyfile/manager.html
+++ /dev/null
@@ -1,61 +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">
-<b>Tag:</b> manager <b>Parent:</b> <a 
href="../ivyfile/conflicts.html">conflicts</a><br/>
-<br/>
-<span class="since">(since 2.0)</span> the conflicts section is deprecated.  
Use the [[ivyfile/conflict]] instead.
-
-Specify a a conflict manager for one or several dependencies.<br/>
-The way to specify a conflict manager is by giving indication to which 
dependencies
-the conflict manager applies (by giving organisation and module names or name 
regexp), 
-and then specifying the conflict manager, either by giving its name or by
-specifying a fixed revision list, in which case a fixed conflicts manager is 
used.<br/><br/>
-
-See <a href="../ivyfile/conflicts.html">Conflicts Manager</a> for details on 
conflicts manager in general.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>org</td><td>the name, or an expression matching the name of 
organisation to which this conflict manager should apply (see matcher attribute 
below)</td>
-        <td>No, defaults to * (match all)</td></tr>
-    <tr><td>module</td><td>the name, or an expression matching the name of 
module to which this conflict manager should apply (see matcher attribute 
below)</td>
-        <td>No, defaults to * (match all)</td></tr>
-    <tr><td>name</td><td>the name of the conflict manager to use</td>
-        <td rowspan="2">Exactly one of two</td></tr>
-    <tr><td>rev</td><td>a comma separated list of revisions this conflict 
manager should select</td></tr>
-    <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a> 
to use to match the modules for which the conflict manager should be used <span 
class="since">since 1.3</span></td>
-        <td>No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 
1.3 and superior</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/ivyfile/mapped.html
----------------------------------------------------------------------
diff --git a/doc/ivyfile/mapped.html b/doc/ivyfile/mapped.html
deleted file mode 100644
index 20d9c46..0000000
--- a/doc/ivyfile/mapped.html
+++ /dev/null
@@ -1,47 +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">
-<b>Tag:</b> mapped <b>Parent:</b> <a 
href="../ivyfile/dependency-conf.html">conf</a><br/>
-<br/>
-Describes a mapped dependency configuration for a master configuration.
-
-<h1>Attributes</h1>
-<table class="ivy-attributes">
-<thead>
-    <tr><th class="ivy-att">Attribute</th><th 
class="ivy-att-desc">Description</th><th class="ivy-att-req">Required</th></tr>
-</thead>
-<tbody>
-    <tr><td>name</td><td>the name of the dependency configuration mapped. 
-       '*' wildcard can be used to designate all configurations of this 
module</td>
-        <td>Yes</td></tr>
-</tbody>
-</table>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

Reply via email to