http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/samples/projects-dependencies-graph.jpg
----------------------------------------------------------------------
diff --git a/doc/samples/projects-dependencies-graph.jpg 
b/doc/samples/projects-dependencies-graph.jpg
deleted file mode 100644
index 916226b..0000000
Binary files a/doc/samples/projects-dependencies-graph.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/samples/standard-osgi/build.xml
----------------------------------------------------------------------
diff --git a/doc/samples/standard-osgi/build.xml 
b/doc/samples/standard-osgi/build.xml
deleted file mode 100644
index e4a9dc7..0000000
--- a/doc/samples/standard-osgi/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
-   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.    
--->
-<project name="standard-osgi" xmlns:ivy="ivy" xmlns:bnd="bnd">
-
-    <!-- Load Ivy ant tasks -->
-    <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" />
-    <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the 
folowing -->
-    <!-- taskdef rather than the above one -->
-    <!--path id="ivy.classpath"> 
-        <fileset dir="${basedir}">
-            <include name="ivy.jar" />
-        </fileset>
-    </path>
-    <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" 
classpathref="ivy.classpath" /-->
-
-    <!-- Load Bnd ant tasks -->
-    <taskdef uri="bnd" resource="org/apache/ivy/ant/antlib.xml" />
-    <!-- If Bnd is not in Ant's classpath, get the jar of Bnd and use the 
folowing -->
-    <!-- taskdef rather than the above one -->
-    <!--path id="bnd.classpath"> 
-        <fileset dir="${basedir}">
-            <include name="bnd.jar" />
-        </fileset>
-    </path>
-    <taskdef uri="bnd" resource="aQute/bnd/ant/taskdef.properties" 
classpathref="bnd.classpath" /-->
-
-    <target name="clean" description="Clean the build directory">
-        <delete dir="${basedir}/target" />
-    </target>
-
-    <target name="ivy:configure">
-        <!-- classical ivy configuration -->
-        <ivy:configure file="${basedir}/ivysettings.xml" />
-    </target>
-
-    <target name="ivy:resolve" depends="ivy:configure">
-        <ivy:resolve file="ivy.xml" conf="*" />
-        <ivy:cachepath pathid="compile.classpath" conf="default" 
useOrigin="true" />
-    </target>
-
-    <target name="compile" depends="ivy:resolve" description="Compile the OSGi 
bundle">
-        <mkdir dir="${basedir}/target/classes" />
-        <!-- simple javac (WARNING: contrary to the JDT, javac doesn't 
understand OSGi's accessibility (private packages)) -->
-        <javac srcdir="${basedir}/src" classpathref="compile.classpath" 
destdir="${basedir}/target/classes" debug="true" includeAntRuntime="false" />
-        <copy todir="${basedir}/target/classes">
-            <fileset dir="${basedir}/src">
-                <include name="**" />
-                <exclude name="**/*.java" />
-                <exclude name="**/package.html" />
-            </fileset>
-            <fileset dir="${basedir}">
-                <include name="plugin.xml" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="generate-manifest" depends="ivy:resolve">
-        <mkdir dir="META-INF" />
-        <bnd:bnd classpath="${toString:compile.classpath}" 
sourcepath="${basedir}/src" eclipse="false" 
files="org.apache.ivy.sample.standard-osgi.bnd" />
-    </target>
-
-    <target name="build" depends="compile,generate-manifest" 
description="Build the OSGi app">
-        <!-- simple jaring -->
-        <jar basedir="${basedir}/target/classes" 
destfile="${basedir}/target/${ant.project.name}.jar" 
manifest="META-INF/MANIFEST.MF" />
-    </target>
-
-</project>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/samples/standard-osgi/ivy.xml
----------------------------------------------------------------------
diff --git a/doc/samples/standard-osgi/ivy.xml 
b/doc/samples/standard-osgi/ivy.xml
deleted file mode 100644
index ca6411e..0000000
--- a/doc/samples/standard-osgi/ivy.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-   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.    
--->
-<ivy-module version="2.0">
-    <info organisation="com.acme" module="local-osgi-repo" />
-    <dependencies>
-        <dependency org="javax.servlet" name="com.springsource.javax.servlet" 
rev="2.4.0" />
-    </dependencies>
-</ivy-module>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/samples/standard-osgi/ivysettings.xml
----------------------------------------------------------------------
diff --git a/doc/samples/standard-osgi/ivysettings.xml 
b/doc/samples/standard-osgi/ivysettings.xml
deleted file mode 100644
index f5c476c..0000000
--- a/doc/samples/standard-osgi/ivysettings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-   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.    
--->
-<ivysettings>
-
-    <!-- We need to define the Ivy Osgi latest strategy as the default one -->
-    <settings defaultResolver="osgi-bundles" 
defaultLatestStrategy="latest-osgi" />
-
-    <!-- These are usual cache setup -->
-    <caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" 
useOrigin="true">
-        <cache name="osgi-bundles" 
basedir="${ivy.settings.dir}/cache/osgi-bundles" />
-    </caches>
-
-    <!-- We just need to define our Ivy Osgi resolver -->
-    <resolvers>
-        <obr name="osgi-bundles" 
repoXmlFile="${ivy.settings.dir}/../repo/repo.xml" />
-    </resolvers>
-
-</ivysettings>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
----------------------------------------------------------------------
diff --git a/doc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd 
b/doc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
deleted file mode 100644
index 8dbe365..0000000
--- a/doc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
+++ /dev/null
@@ -1,18 +0,0 @@
-#    ***************************************************************
-#    * 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.
-#    ***************************************************************

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/samples/target-platform/build.xml
----------------------------------------------------------------------
diff --git a/doc/samples/target-platform/build.xml 
b/doc/samples/target-platform/build.xml
deleted file mode 100644
index 2de015a..0000000
--- a/doc/samples/target-platform/build.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-   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.    
--->
-<project name="target-platform" xmlns:ivy="ivy">
-
-    <!-- Load Ivy ant tasks -->
-    <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" />
-    <!-- If Ivy is not in Ant's classpath, get the jar of Ivy and use the 
folowing -->
-    <!-- taskdef rather than the above one -->
-    <!--path id="ivy.classpath"> 
-        <fileset dir="${basedir}">
-            <include name="ivy.jar" />
-        </fileset>
-    </path>
-    <taskdef uri="ivy" resource="org/apache/ivy/ant/antlib.xml" 
classpathref="ivy.classpath" /-->
-
-    <target name="update-dependencies" description="Update the dependencies">
-        <ivy:configure file="${basedir}/ivysettings.xml" />
-        <ivy:resolve file="ivy.xml" conf="*" />
-        <ivy:fixdeps tofile="ivy-fixed.xml" />
-    </target>
-
-    <!--
-        Two choices: either the jars stas in the cache, or they are retrive in 
a dedicated folder
-        Having the bundle retrieved in a folder is helpfull to manage target 
platforms with the PDE of Eclipse
-    -->
-
-    <target name="generate-target-platform" description="Generate the obr.xml 
of the target platform">
-        <ivy:configure file="${basedir}/ivysettings.xml" />
-        <ivy:resolve file="ivy-fixed.xml" conf="*" />
-        <ivy:buildobr out="obr.xml" />
-    </target>
-
-    <target name="generate-retrieved-target-platform" description="Generate 
the obr.xml of the retrieved target platform">
-        <ivy:configure file="${basedir}/ivysettings.xml" />
-        <ivy:resolve file="ivy-fixed.xml" conf="*" />
-        <ivy:retrieve 
pattern="${basedir}/bundles/[type]s/[artifact]_[revision].[ext]" />
-        <ivy:buildobr basedir="${basedir}/bundles" out="obr.xml" />
-    </target>
-
-</project>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/samples/target-platform/ivy.xml
----------------------------------------------------------------------
diff --git a/doc/samples/target-platform/ivy.xml 
b/doc/samples/target-platform/ivy.xml
deleted file mode 100644
index 8b83950..0000000
--- a/doc/samples/target-platform/ivy.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-   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.    
--->
-<ivy-module version="2.0">
-    <info organisation="com.acme" module="target-platform" />
-    <dependencies>
-        <dependency org="bundle" name="org.eclipse.jdt.core" 
rev="3.8.3.v20130121-145325" />
-    </dependencies>
-</ivy-module>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/samples/target-platform/ivysettings.xml
----------------------------------------------------------------------
diff --git a/doc/samples/target-platform/ivysettings.xml 
b/doc/samples/target-platform/ivysettings.xml
deleted file mode 100644
index 9697b93..0000000
--- a/doc/samples/target-platform/ivysettings.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-   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.    
--->
-<ivysettings>
-
-    <settings defaultResolver="eclipse-juno" 
defaultLatestStrategy="latest-osgi" />
-
-    <!-- These are usual cache setup -->
-    <caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution" 
useOrigin="true">
-        <cache name="eclipse-juno" 
basedir="${ivy.settings.dir}/cache/eclipse-juno" />
-    </caches>
-
-    <!-- The resolvers from which we will find our bundles -->
-    <resolvers>
-        <updatesite name="eclipse-juno" 
url="http://download.eclipse.org/releases/juno"; cache="eclipse-juno" 
requirementStrategy="first" />
-    </resolvers>
-
-</ivysettings>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings.html
----------------------------------------------------------------------
diff --git a/doc/settings.html b/doc/settings.html
deleted file mode 100644
index 7f978b8..0000000
--- a/doc/settings.html
+++ /dev/null
@@ -1,158 +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: 0};</script>   
-       <script type="text/javascript" src="xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-In order to work as you want, ivy sometimes needs some settings. Actually, ivy 
can work with no specific settings at all, see the <a 
href="tutorial/defaultconf.html">default settings documentation</a> for details 
about that. But ivy is able to work in very different contexts. You just have 
to configure it properly.
-
-Settings are specified through an xml file, usually called ivysettings.xml. To 
configure ivy from ant, you just have to use the [[ant:settings]] datatype with 
the path of your settings file.
-
-Here is an example of the settings file:
-<code type="xml">
-<ivysettings>
-        <properties file="${ivy.settings.dir}/ivysettings-file.properties" />
-        <settings defaultResolver="ibiblio" />
-        <caches  defaultCacheDir="${cache.dir}" checkUpToDate="false" />
-        <resolvers>
-                <ibiblio name="ibiblio" />
-                <filesystem name="internal">
-                        <ivy 
pattern="${repository.dir}/[module]/ivy-[revision].xml" />
-                        <artifact 
pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]" />
-                </filesystem>
-        </resolvers>
-        <modules>
-                <module organisation="jayasoft" name=".*" resolver="internal" 
/>
-        </modules>
-</ivysettings>
-</code>
-
-<br/>
-Mainly, the settings enable you to configure the default cache directory used 
by ivy and the dependency resolvers that it will use to resolve dependencies.
-<i>Note: To work, this settings file needs a property file named 
ivysettings-file.properties in the same directory as the settings file, with 
ivy variables you want in it.</i>
-
-Some useful variables are available in settings files:
-<ul>
-<li>ivy.settings.dir</li> this variable references the directory in which the 
ivysettings itself is. This is available if the settings has been loaded as a 
file. In case of a URL, it takes the part before the last slash of the URL, if 
any. If the URL has no slash, then this variable is not set.
-<li>ivy.settings.file</li> the path of the settings file itself if it has been 
loaded as a file only. If it has been loaded as a URL, this variable is not set
-<li>ivy.settings.url</li> the URL pointing to the settings file. This is set 
both when it has been loaded as a file or a URL
-</ul>
-
-<span class="since">since 1.4</span> Note that all <a 
href="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/System.html#getProperties()">java
 system properties</a> are available as ivy variables in your settings file.
-
-<h1>Settings file structure</h1>
-
-The settings file is structured in some parts and left open in others. Indeed, 
each resolver has its own structure, thus it's not the settings file itself 
which defines the structure for the resolvers.
-
-<pre>
-ivysettings
-    <a href="settings/property.html">property</a>
-    <a href="settings/properties.html">properties</a>
-    <a href="settings/settings.html">settings</a>
-    <a href="settings/include.html">include</a>
-    <a href="settings/classpath.html">classpath</a>
-    <a href="settings/typedef.html">typedef</a>
-    <a href="settings/credentials.html">credentials</a>
-    <a href="settings/lock-strategies.html">lock-strategies</a>
-    <a href="settings/caches.html">caches</a>
-        <a href="settings/caches/cache.html">cache</a>
-    <a href="settings/latest-strategies.html">latest-strategies</a>
-    <a href="settings/version-matchers.html">version-matchers</a>
-    <a href="settings/triggers.html">triggers</a>
-    <a href="settings/parsers.html">parsers</a>
-    <a href="settings/conflict-managers.html">conflict-managers</a>
-    <a href="settings/outputters.html">outputters</a>
-    <a href="settings/namespaces.html">namespaces</a>
-        <a href="settings/namespace.html">namespace</a>
-            <a href="settings/namespace/rule.html">rule</a>
-                <a href="settings/namespace/fromtosystem.html">fromsystem</a>
-                    <a href="settings/namespace/src.html">src</a>
-                    <a href="settings/namespace/dest.html">dest</a>
-                <a href="settings/namespace/fromtosystem.html">tosystem</a>
-                    <a href="settings/namespace/src.html">src</a>
-                    <a href="settings/namespace/dest.html">dest</a>
-    <a href="settings/macrodef.html">macrodef</a>
-        <a href="settings/macrodef/attribute.html">attribute</a>
-        any resolver
-    <a href="settings/resolvers.html">resolvers</a>
-        any resolver
-    <a href="settings/modules.html">modules</a>
-        <a href="settings/module.html">module</a>
-    <a href="settings/statuses.html">statuses</a>
-        <a href="settings/status.html">status</a>
-</pre>
-
-<h1>ivysettings</h1>
-<b>Tag:</b> ivysettings
-
-Root tag of any ivysettings file.
-<h2>Child elements</h2>
-<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="settings/property.html">property</a></td><td>set an ivy 
variable</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="settings/properties.html">properties</a></td><td>loads a 
properties file as ivy variables</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="settings/settings.html">settings</a></td><td>configures 
ivy with some defaults</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/include.html">include</a></td><td>includes 
another settings file</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="settings/classpath.html">classpath</a></td><td>add a 
location in the classpath used to load plugins</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="settings/typedef.html">typedef</a></td><td>defines new 
types in ivy</td>
-        <td>0..n</td></tr>
-    <tr><td><a 
href="settings/lock-strategies.html">lock-strategies</a></td><td>defines lock 
strategies</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/caches.html">caches</a></td><td>defines 
repository cache managers</td>
-        <td>0..1</td></tr>
-    <tr><td><a 
href="settings/latest-strategies.html">latest-strategies</a></td><td>defines 
latest strategies</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/parsers.html">parsers</a></td><td>defines module 
descriptor parsers</td>
-        <td>0..1</td></tr>
-    <tr><td><a 
href="settings/version-matchers.html">version-matchers</a></td><td>defines new 
version matchers</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/triggers.html">triggers</a></td><td>register 
triggers on ivy events</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/namespaces.html">namespaces</a></td><td>defines 
new namespaces</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/macrodef.html">macrodef</a></td><td>defines a 
new macro resolver</td>
-        <td>0..n</td></tr>
-    <tr><td><a href="settings/resolvers.html">resolvers</a></td><td>defines 
dependency resolvers</td>
-        <td>0..1</td></tr>
-    <tr><td><a 
href="settings/conflict-managers.html">conflict-managers</a></td><td>defines 
conflicts managers</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/modules.html">modules</a></td><td>defines rules 
between modules and dependency resolvers</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/outputters.html">outputters</a></td><td>defines 
the list of available report outputters</td>
-        <td>0..1</td></tr>
-    <tr><td><a href="settings/statuses.html">statuses</a></td><td>defines the 
list of available statuses</td>
-        <td>0..1</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/settings/caches.html
----------------------------------------------------------------------
diff --git a/doc/settings/caches.html b/doc/settings/caches.html
deleted file mode 100644
index e80ac89..0000000
--- a/doc/settings/caches.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-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>Tag:</b> caches
-
-<span class="tagdoc" id="ivysettings.caches">Configures the Ivy cache 
system.</span> <span class="since">since 2.0</span>.
-See <a href="../concept.html#cache">cache concept</a> for details on the Ivy 
cache concept.
-
-By default, Ivy defines one repository cache instance, called 'default-cache', 
which uses the default cache settings defined using attributes on this tag. 
This default instance is defined as long as you don't define your own default 
cache using the 'default' attribute, and have at least one dependency resolver 
which doesn't specify which cache instance to use.
-
-<em>defaultCacheDir</em> is the default directory used for both the resolution 
and repository cache(s). It usually points to a directory in your filesystem. 
If you want to isolate resolution cache from repository cache, we recommend 
setting both the resolutionCacheDir and repositoryCacheDir attributes on this 
tag instead of using defaultCacheDir.
-
-Since repository cache implementations are pluggable, you can either define 
new cache instances based on the default implementation provided in Ivy using 
the [[settings/caches/cache]] child element, or use custom cache 
implementations using child elements as you have defined using 
[[settings/typedef]].
-
-<em>ivyPattern</em> and <em>artifactPattern</em> are used to configure the 
default way Ivy stores ivy files and artifacts in repository cache(s). Usually 
you do not have to change this, unless you want to use the cache directly from 
another tool, which is not recommended. These patterns are relative to the 
repository cache base directory.
-
-<em>checkUpToDate</em> indicates to ivy if it must check date of artifacts 
before retrieving them (i.e. copying them from
-cache to another place in your filesystem). Usually it is a good thing to 
check date to avoid unnecessary copy, even if it's most of the time a local 
copy.
-
-<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>default</td><td>the name of the default cache to use on all 
resolvers not defining the cache instance to use</td>
-        <td>No, defaults to a default cache manager instance named 
'default-cache'</td></tr>
-    <tr><td>defaultCacheDir</td><td>a path to a directory to use as default 
basedir for both resolution and repository cache(s)</td>
-        <td>No, defaults to .ivy2/cache in the user's home directory</td></tr>
-    <tr><td>resolutionCacheDir</td><td>the path of the directory to use for 
all resolution cache data</td>
-        <td>No, defaults to defaultCacheDir</td></tr>
-    <tr><td>repositoryCacheDir</td><td>the path of the default directory to 
use for repository cache data. <strong>This should not point to a directory 
used as a repository!</strong></td>
-        <td>No, defaults to defaultCacheDir</td></tr>
-    <tr><td>ivyPattern</td><td>default pattern used to indicate where ivy 
files should be put in the repository cache(s)</td>
-        <td>No, defaults to 
[organisation]/[module]/ivy-[revision].xml</td></tr>
-    <tr><td>artifactPattern</td><td>default pattern used to indicate where 
artifact files should be put in the repository cache(s)</td>
-        <td>No, defaults to 
[organisation]/[module]/[type]s/[artifact]-[revision].[ext]</td></tr>
-    <tr><td><s>checkUpToDate</s></td><td>Indicates if date should be checked 
before retrieving artifacts from cache.
-       <i>Deprecated, we recommend using overwriteMode on the [[use/retrieve]] 
task instead</i></td>
-        <td>No, defaults to true</td></tr>
-    <tr><td>useOrigin</td><td>the default value to use for useOrigin for 
caches in which it isn't specifically defined.
-       Use true to avoid the copy of local artifacts to the cache and use 
directly their original location.</td>
-        <td>No, defaults to false</td></tr>
-    <tr><td>lockStrategy</td><td>the name of the default 
[[settings/lock-strategies lock strategy]] to use when accessing repository 
cache(s)</td>
-        <td>No, defaults to <em>no-lock</em></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="caches/cache.html">cache</a></td><td>defines a new 
repository cache instance, based on the default repository cache 
implementation</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<caches>
-  <cache name="mycache" basedir="path/to/my/cache/1" />
-  <cache name="mycache2" basedir="path/to/my/cache/2" />
-</caches> 
-</code>
-Define 2 cache instances, named mycache and mycache2, using two different 
directories as base directory, and using the default patterns and lock 
strategies. The default cache instance will still be defined as long as at 
least one dependency resolver does not declare which cache manager to use.
-<hr/></textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings/caches/cache.html
----------------------------------------------------------------------
diff --git a/doc/settings/caches/cache.html b/doc/settings/caches/cache.html
deleted file mode 100644
index 571f9f2..0000000
--- a/doc/settings/caches/cache.html
+++ /dev/null
@@ -1,92 +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: 2};</script>   
-       <script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<b>Tag:</b> cache
-
-<span class="since">Since 2.0</span>.
-
-<span class="tagdoc" id="ivysettings.caches.cache">Defines a repository cache 
instance based on the default repository cache implementation.</span>
-
-The default repository cache implementation caches files on the local 
filesystem in subdirectories of a configured base directory.
-
-By default also, the parsed module descriptor read from the cache are kept in 
a memory cache in case they are reused.  This may enhance the performance of 
multi-module build, provided that all modules are build using the same ivy 
instance.  The size of this memory cache is configurable in term of number of 
module descriptors.  A size of 0 means no memory caching.
-
-<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>name of the cache instance</td>
-        <td>Yes</td></tr>
-    <tr><td>basedir</td><td>the path of the base directory to use to put 
repository cache data. <strong>This should not point to a directory used as a 
repository!</strong></td>
-        <td>No, defaults to repositoryCacheDir defined in 
[[settings/caches]]</td></tr>
-    <tr><td>ivyPattern</td><td>the pattern to use to store cached ivy 
files</td>
-        <td>No, defaults to default cache ivy pattern as configured in 
[[settings/caches]]</td></tr>
-    <tr><td>artifactPattern</td><td>the pattern to use to store cached 
artifacts</td>
-        <td>No, defaults to default cache artifact pattern as configured in 
[[settings/caches]]</td></tr>
-    <tr><td>useOrigin</td><td>true to avoid the copy of local artifacts to the 
cache and use directly their original location, false otherwise. 
-To know if an artifact is local ivy asks to the resolver. Only filesystem 
resolver is considered local by default, but this can be disabled if you want 
to force the copy on one filesystem resolver and use the original location on 
another. Note that it is safe to use useOrigin even if you use the cache for 
some non local resolvers. In this case the cache will behave as usual, copying 
files to the cache. Note also that this only applies to artifacts, not to ivy 
files, which are still copied in the cache.</td>
-        <td>No. defaults to the default value configured in 
[[settings/caches]]</td></tr>
-    <tr><td>lockStrategy</td><td>the name of the [[settings/lock-strategies 
lock strategy]] to use for this cache</td>
-        <td>No, defaults to default lock strategy as configured in 
[[settings/caches]]</td></tr>
-    <tr><td>defaultTTL</td><td>the default [[settings/caches/ttl TTL]] to use 
when no specific one is defined</td>
-        <td>No, defaults to ${ivy.cache.ttl.default}</td></tr>
-    <tr><td>memorySize</td><td>the number of parsed module descriptors to keep 
in a memory cache.</td><td>No, default to 150</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>[[settings/caches/ttl]]</td><td>defines a TTL rule</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>Examples</h1>
-<code>
-<cache name="mycache" 
-       basedir="/path/to/mycache"
-       ivyPattern="[module]/ivy-[revision].xml" 
-       artifactPattern="[module]/[artifact]-[revision].[ext]"
-       lockStrategy="no-lock"
-       defaultTTL="1s">
-    <ttl revision="latest.integration" duration="200ms" />
-    <ttl organisation="org1" duration="10m 20s" />
-    <ttl organisation="org2" duration="5h" />
-    <ttl organisation="org3" duration="2d 12h" />
-</cache>
-</code>
-Defines a cache called 'mycache', storing files in the '/path/to/mycache' 
directory using '[module]/ivy-[revision].xml' as pattern to store Ivy files and 
'[module]/[artifact]-[revision].[ext]' as pattern to store other artifacts.
-The lock strategy used by this cache is the 'no-lock' strategy, which does not 
perform any locking. 
-The defaultTTL used is of 1s, meaning that by default dynamic revision result 
will be stored and used for one second. TTL rules then define that all 
'latest.integration' revisions will be stored and used for 200ms, while other 
dynamic revisions from org1 org2 and org3 modules will be stored respectively 
for 10 minutes 20 seconds; 5 hours; and 2 days and 12 hours.</textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings/caches/ttl.html
----------------------------------------------------------------------
diff --git a/doc/settings/caches/ttl.html b/doc/settings/caches/ttl.html
deleted file mode 100644
index 8876f6f..0000000
--- a/doc/settings/caches/ttl.html
+++ /dev/null
@@ -1,71 +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: 2};</script>   
-       <script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<b>Tag:</b> ttl
-
-<span class="since">Since 2.0</span> <span class="tagdoc" 
id="ivysettings.caches.cache.TTL">Defines a TTL (Time To Live) rule for 
resolved revision caching.</span>
-
-When Ivy resolves a dynamic version constraint (like latest.integration or a 
version range), it can store the result of the resolution (like 
latest.integration=1.5.1) for a given time, called TTL. It means that Ivy will 
reuse this dynamic revision resolution result without accessing the 
repositories for the duration of the TTL, unless running [[ant:resolve]] in 
refresh mode.
-
-This tag let you define a rule to define a TTL specific to a set of dynamic 
revision, based on the whole module revision information (organization, module 
name, revision, ...). The revision considered in the rule is the revision 
before the resolution (for instance 'latest.integration') and not the resolved 
revision (for instance '1.5.1').
-
-The rules are evaluated in order, the first matching rule being used to define 
the TTL. If no rule matches, the cache defaultTTL will be used.
-
-The format used to specify the TTL is of the form:
-<code>
-XXd XXh XXm XXs XXXms
-</code>
-Where 'd' stands for days, 'h' for hours, 'm' for minutes, 's' for seconds and 
'ms' for milliseconds. Any part of the specification can be omitted, so '12d', 
'2h 5m' and '1d 5ms' are all valid.
-
-The TTL duration can also be set to 'eternal', in which case once resolved the 
revision is always use, except when resolving in refresh mode. 
-
-Using a 0ms TTL disable resolved revision caching for the given rule.
-
-<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 to match to apply the 
rule.</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>module</td><td>the module's name to match to apply the rule.</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>revision</td><td>the module's revision to match to apply the rule. 
Note that the version is not resolved when evaluating the rule 
('latest.integration' for instance).</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td><em>any extra attribute</em></td><td>an extra attribute to match 
to apply the rule.</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>matcher</td><td>the <a 
href="../../concept.html#matcher">matcher</a> to use to match the modules to 
which the resolver should be applied</td>
-        <td>No, defaults to exact</td></tr>
-    <tr><td>duration</td><td>the TTL to apply (see above for format)</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/settings/classpath.html
----------------------------------------------------------------------
diff --git a/doc/settings/classpath.html b/doc/settings/classpath.html
deleted file mode 100644
index e46689a..0000000
--- a/doc/settings/classpath.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-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>Tag:</b> classpath
-
-<span class="tagdoc" id="ivysettings.classpath">Includes a jar in the 
classpath used to load plugins.</span> <span class="since">since 1.4</span>
-
-This let you add ivy plugins without relying on an external classpath (the ant 
classpath for instance), therefore easing the use of ivy in multiple execution 
environments (ant, standalone, IDE plugins, ...).
-
-<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>url</td><td>the url of a jar to add to the classpath</td>
-        <td>Yes, unless file is specified</td></tr>
-    <tr><td>file</td><td>a jar to add to the classpath</td>
-        <td>Yes, unless url is specified</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivysettings>
-  <classpath file="${ivy.settings.dir}/custom-resolver.jar"/>
-  <typedef name="custom" classname="org.apache.ivy.resolver.CustomResolver"/>
-  <resolvers>
-    <custom name="custom"/>
-  </resolvers>
-</ivysettings>
-</code>
-Adds the custom-resolver.jar (found in the same directory as the 
ivysettings.xml file) to the classpath, then defines a custom resolver and uses 
it.
-
-<hr/>
-<code type="xml">
-<ivysettings>
-  <classpath url="http://www.myserver.com/ivy/custom-resolver.jar"/>
-  <typedef name="custom" classname="org.apache.ivy.resolver.CustomResolver"/>
-  <resolvers>
-    <custom name="custom"/>
-  </resolvers>
-</ivysettings>
-</code>
-Same as above, but finds the jar on a web server.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings/conflict-managers.html
----------------------------------------------------------------------
diff --git a/doc/settings/conflict-managers.html 
b/doc/settings/conflict-managers.html
deleted file mode 100644
index 5249a67..0000000
--- a/doc/settings/conflict-managers.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-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>Tag:</b> conflict-managers
-
-<span class="tagdoc" id="ivysettings.conflict-managers">Defines a list of <a 
href="../concept.html#conflict">conflicts managers</a> usable in Ivy.</span> 
Each conflict manager is identified by its name, given as an attribute.
-The child tag used for the conflict manager must be equal to a name of a 
conflict manager type (either built-in or added with the typedef tag).
-
-Here is a list of built-in conflicts managers (which do not require anything 
in the configuration file):
-<ul>
-<li>all</li> this conflicts manager resolve conflicts by selecting all 
revisions. Also called the NoConflictManager, it doesn't evict any modules.
-<li>latest-time</li> this conflict manager selects only the 'latest' revision, 
latest being defined as the latest in time. Note that latest in time is costly 
to compute, so prefer latest-revision if you can.
-<li>latest-revision</li> this conflict manager selects only the 'latest' 
revision, latest being defined by a string comparison of revisions.
-<li>latest-compatible</li> this conflict manager selects the latest version in 
the conflicts which can result in a compatible set of dependencies. This means 
that in the end, this conflict manager does not allow any conflicts (similar to 
the strict conflict manager), except that it follows a best effort strategy to 
try to find a set of compatible modules (according to the version constraints)
-<li>strict</li> this conflict manager throws an exception (i.e. causes a build 
failure) whenever a conflict is found.
-</ul>
-The two "latest" conflict managers also take into account the force attribute 
of the dependencies.
-Indeed direct dependencies can declare a force attribute (see <a 
href="../ivyfile/dependency.html">dependency</a>), which indicates that the 
revision given in the direct dependency should be preferred over indirect 
dependencies.
-
-Here is a list of conflict manager types available, which can be used to 
define your own custom conflict managers:
-<ul>
-<li>latest-cm</li>The latest conflict manager uses a latest strategy to select 
the latest revision among several ones. Both latest-time and latest-revision 
conflict managers are based on this conflict manager type. It takes 'latest' as 
attribute to define which latest strategy should be used. Example:
-<code><latest-cm name="mylatest-conflict-manager" 
latest="my-latest-strategy"/></code>
-<li>compatible-cm</li>The latest compatible conflict manager uses a latest 
strategy to select the latest revision among several ones. It takes 'latest' as 
an attribute to define which latest strategy should be used. Example:
-<code><compatible-cm name="my-latest-compatible-conflict-manager" 
latest="my-latest-strategy"/></code>
-<li>regexp-cm</li>This conflict manager is based on a regular expression and 
throws an exception (i.e. causes a build failure) when a conflict is found with 
versions with different matching group. For instance if a conflict is found 
between 1.2.x and 1.3.y it will throw an exception if the regular expression is 
(.*)\.\d, because the matching group will match different strings (1.2 and 
1.3). 1.2.1 and 1.2.2 won't throw an exception with the same regular 
expression. The regular expression is set using the 'regexp' attribute. A 
'ignoreNonMatching' attribute can also be set to simply warn when a version is 
found which does not match the regular expression, instead of throwing an 
exception.
-</ul>
-
-<h3>Child elements</h3>
-<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>any conflict manager</td><td>adds a conflict manager to the list 
of available conflict managers</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/settings/credentials.html
----------------------------------------------------------------------
diff --git a/doc/settings/credentials.html b/doc/settings/credentials.html
deleted file mode 100644
index f4ec96a..0000000
--- a/doc/settings/credentials.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-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>Tag:</b> credentials
-
-<span class="tagdoc" id="ivysettings.credentials">Configures HTTP 
authentication credentials.</span> <span class="since">since 2.0</span>.
-
-<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>host</td><td>the name of the host</td>
-        <td>Yes</td></tr>
-    <tr><td>realm</td><td>the name of the realm</td>
-        <td>No</td></tr>
-    <tr><td>username</td><td>the username</td>
-        <td>Yes</td></tr>
-    <tr><td>passwd</td><td>the password</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/settings/include.html
----------------------------------------------------------------------
diff --git a/doc/settings/include.html b/doc/settings/include.html
deleted file mode 100644
index b2463f5..0000000
--- a/doc/settings/include.html
+++ /dev/null
@@ -1,80 +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>Tag:</b> include
-
-<span class="tagdoc" id="ivysettings.include">Includes another ivysettings 
file as if it were part of this one.</span> <span class="since">since 1.3</span>
-
-The included ivysettings file has to be a complete well formed ivysettings 
file, i.e. it does have to include the <code><ivysettings></code> tag.
-
-<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>url</td><td>a URL to the ivysettings file to include</td>
-        <td>Yes, unless file is specified</td></tr>
-    <tr><td>file</td><td>a path to the ivysettings file to include</td>
-        <td>Yes, unless url is specified</td></tr>
-    <tr><td>optional</td><td>indicates whether Ivy should throw an error if 
the specified file doesn't exist. <span class="since">(Since 2.4)</span>.</td>
-        <td>No, default to false</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<ivysettings>
-  <property name="myrepository" value="path/to/my/real/rep"/>
-  <settings defaultResolver="default"/>
-  <include file="path/to/ivysettings-default.xml"/>
-</ivysettings>
-</code>
-with ivysettings-default.xml:
-<code type="xml">
-<ivysettings>
-  <property name="myrepository" value="path/to/rep" overwrite="false"/>
-  <resolvers>
-    <ivyrep name="default" ivyroot="${myrepository}"/>
-  </resolvers>
-</ivysettings>
-</code>
-
-The included ivysettings defines a resolver named default, which is an ivyrep 
resolver, with its root configured as being the value of myrepository variable. 
This variable is given the value path/to/rep in the included file, but because 
the attribute overwrite is set to false, it will not override the value given 
in the main ivysettings including this one, so the value used for myrepository 
will be path/to/my/real/rep.
-<hr/>
-<code type="xml">
-<ivysettings>
-  <include file="ivysettings-macro.xml"/>
-  <resolvers>
-    <mymacro name="includeworks" mymainrep="included/myrep" 
mysecondrep="included/secondrep"/>
-  </resolvers>
-</ivysettings> 
-</code>
-with ivysettings-macro.xml being the ivysettings example given on the 
[[settings/macrodef macrodef documentation page]].
-This lets us easily reuse the custom macro resolver.
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings/latest-strategies.html
----------------------------------------------------------------------
diff --git a/doc/settings/latest-strategies.html 
b/doc/settings/latest-strategies.html
deleted file mode 100644
index fbf5612..0000000
--- a/doc/settings/latest-strategies.html
+++ /dev/null
@@ -1,88 +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>Tag:</b> latest-strategies
-
-<span class="tagdoc" id="ivysettings.latest-strategies">Defines a list of <a 
href="../concept.html#latest">latest strategies</a> usable in Ivy.</span> Each 
latest strategy is identified by its name, given as an attribute.
-The child tag used for the latest strategy must be equal to a name of a latest 
strategy type (usually added with the typedef tag).
-
-The latest strategies which are included in Ivy by default are:
-<ul>
-<li>latest-time</li> compares the revisions date to know which is the latest. 
While this is often a good strategy in terms of pertinence, it's drawback is 
that it can be slow when dealing with remote repositories. If you use ivyrep, 
-for example, Ivy has to ask the http server for the date of each ivy file 
before knowing which is the latest.
-<li>latest-revision</li> compares the revisions as strings, using an algorithm 
close to the one used in php's version_compare function.
-This algorithm takes into account the special meaning of some text. For 
instance, with this strategy, 1.0-dev1 is considered before 1.0-alpha1, which 
in turn is before 1.0-rc1, which is before 1.0, which is before 1.0.1.
-<li>latest-lexico</li> compares the revisions as strings, using lexicographic 
order (the one used by java string comparison).
-</ul>
-
-<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>any latest strategy</td><td>adds a latest strategy to the list of 
available strategies</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-
-<h1>latest-revision</h1>
-<span class="since">since 1.4</span> The latest-revision can now be configured 
to handle more words with special meanings than the one defined in php 
version_compare function.
-
-Here is an example of how you can do so:
-<code type="xml">
-<latest-strategies>
-  <latest-revision name="mylatest-revision">
-    <specialMeaning name="PRE" value="-2"/>
-    <specialMeaning name="QA" value="4"/>
-    <specialMeaning name="PROD" value="5"/>
-  </latest-revision>
-</latest-strategies> 
-</code>
-Knowing that the default "special meaning" words are the following:
-<code type="xml">
-    <specialMeaning name="dev" value="-1"/>
-    <specialMeaning name="rc" value="1"/>
-    <specialMeaning name="final" value="2"/>
-</code>
-You can even remove or redefine the default special meanings by setting 
usedefaultspecialmeanings="false" on the latest-revision tag.
-Example:
-<code type="xml">
-<latest-strategies>
-  <latest-revision name="mylatest-revision" usedefaultspecialmeanings="false">
-    <specialMeaning name="pre" value="-2"/>
-    <specialMeaning name="m" value="1"/>
-    <specialMeaning name="rc" value="2"/>
-    <specialMeaning name="prod" value="3"/>
-  </latest-revision>
-</latest-strategies> 
-</code>
-
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings/lock-strategies.html
----------------------------------------------------------------------
diff --git a/doc/settings/lock-strategies.html 
b/doc/settings/lock-strategies.html
deleted file mode 100644
index 458564d..0000000
--- a/doc/settings/lock-strategies.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>
-       <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> lock-strategies <span class="since">since 2.0</span>
-
-<span class="tagdoc" id="ivysettings.lock-strategies">Defines a list of lock 
strategies usable in Ivy.</span>
-
-A lock strategy is used by a cache manager to decide when and how locking 
should be performed (see [[settings/cache]] to see how to configure the lock 
strategy to use).
-
-The following strategies are registered by default:
-<ul>
-<li><b>no-lock</b></li> This lock strategy actually performs no locking at 
all, and thus should not be used in an environment where the cache is shared by 
multiple processes.
-
-<li><b>artifact-lock</b></li> This strategy acquires a lock whenever a module 
descriptor or an artifact is downloaded to the cache, which makes a good 
solution when you want to share your repository cache.
-Note that this strategy is based on file locking, performed by default using 
the java.io.File.createNewFile() atomicity (which is documented as atomic in 
the javadoc, but not recommended to perform locks). 
-
-<li><b>artifact-lock-nio (<span class="since">since 2.4</span>)</b></li> Like 
the <i>artifact-lock</i>-strategy, this one also acquires a lock whenever a 
module descriptor or artifact is downloaded to the cache. But here the 
implementation is done with a java.nio.FileLock.
-</ul>
-
-The child tag used for the lock strategy must be equal to a name of a lock 
strategy type (added with the typedef tag).
-
-<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>any lock strategy</td><td>adds a lock strategy to the list of 
available ones</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/settings/macrodef.html
----------------------------------------------------------------------
diff --git a/doc/settings/macrodef.html b/doc/settings/macrodef.html
deleted file mode 100644
index 6ce0dd6..0000000
--- a/doc/settings/macrodef.html
+++ /dev/null
@@ -1,151 +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>Tag:</b> macrodef
-
-<span class="tagdoc" id="ivysettings.macrodef">Defines a new dependency 
resolver type based upon another.</span> This definition is very similar to the 
macrodef feature of ant for defining macro tasks. <span class="since">since 
1.3</span>
-
-This task eases the process of creating a new dependency resolver, because it 
avoids writing java code.
-
-It is generally used in combination with the [[settings/include]] feature to 
help reuse a macro in multiple settings files.
-
-A macro is defined by declaring an existing resolver within it. Then you can 
use attributes to pass parameters to the newly defined resolver type. 
Attributes are defined with a name, and optionally a default value, and are 
used using the following syntax: 
-<code>@{attributename}</code>
-<h2>Resolvers names</h2>
-Since you can use the same macro several times it can define several resolvers 
(in a chain for instance), the resolver names need to be chosen carefully to 
avoid name conflicts (each resolver must have a unique name).
-
-Here is how Ivy deals with the names of the resolvers defined in a macro:
-<ul>
-<li>if there is no name attribute on a resolver in the macrodef, then Ivy will 
use the name given when using the macro. This is what usually should be done 
for the main resolver defined in the macro</li>
-<li>if there is a name attribute on a resolver in the macrodef, but this name 
doesn't contain a @{name} inside, then Ivy will use the provided name prefixed 
with the name of the macro separated by a dash</li>
-<li>if there is a name attribute on a resolver in the macrodef, and this name 
contains @{name} somewhere, then Ivy will use this name, and replace @{name} 
with the name provided when using the macro.</li>
-</ul>
-
-Example:
-<code type="xml">
-<ivysettings>
-  <macrodef name="mymacro">
-    <chain>
-      <ibiblio name="ex1" />
-      <ibiblio name="ex2.@{name}" m2compatible="true" />
-    </chain>
-  </macrodef>
-       
-  <resolvers>
-    <mymacro name="default" />
-    <mymacro name="other" />
-   </resolvers>
-</ivysettings>
-</code>
-This is equivalent to:
-<code type="xml">
-<ivysettings>
-  <resolvers>
-    <chain name="default">
-      <ibiblio name="default-ex1" />
-      <ibiblio name="ex2.default" m2compatible="true" />
-    </chain>
-    <chain name="other">
-      <ibiblio name="other-ex1" />
-      <ibiblio name="ex2.other" m2compatible="true" />
-    </chain>
-   </resolvers>
-</ivysettings>
-</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>name of the resover type created</td>
-        <td>Yes</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>[[settings/macrodef/attribute]]</td><td>defines an attribute for 
the macro resolver</td>
-        <td>0..n</td></tr>
-    <tr><td>any resolver</td><td>defines the base resolver upon which this 
macro is defined</td>
-        <td>1</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-Defining a simple macro:
-<code type="xml">
-  <macrodef name="mymacro">
-    <attribute name="mymainrep"/>
-      <filesystem name="fs1">
-        <ivy 
pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-        <artifact 
pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-      </filesystem>
-  </macrodef>
-</code>
-Using it:
-<code type="xml">
-  <resolvers>
-    <mymacro name="default" mymainrep="path/to/myrep"/>
-  </resolvers>
-</code>
-<hr/>
-A complete example:
-<code type="xml">
-<ivysettings>
-  <macrodef name="mymacro">
-    <attribute name="mymainrep"/>
-    <attribute name="mysecondrep"/>
-    <attribute name="myseconddirlayout" 
default="[organisation]/[module]/[type]s"/>
-    <chain>
-      <filesystem name="fs1">
-        <ivy 
pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-        <artifact 
pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
-      </filesystem>
-      <filesystem name="fs2" latest="latest-time">
-        <ivy pattern="@{mysecondrep}/@{myseconddirlayout}/ivy-[revision].xml"/>
-        <artifact 
pattern="@{mysecondrep}/@{myseconddirlayout}/[artifact]-[revision].[ext]"/>
-      </filesystem>
-    </chain>
-  </macrodef>
-       
-  <resolvers>
-    <mymacro name="default" mymainrep="path/to/myrep" 
mysecondrep="path/to/secondrep"/>
-    <mymacro name="other" 
-       mymainrep="path/to/myrep" 
-       mysecondrep="path/to/secondrep" 
-       myseconddirlayout="[module]/[type]s"/>
-   </resolvers>
-</ivysettings>
-</code>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings/macrodef/attribute.html
----------------------------------------------------------------------
diff --git a/doc/settings/macrodef/attribute.html 
b/doc/settings/macrodef/attribute.html
deleted file mode 100644
index 6f4bb34..0000000
--- a/doc/settings/macrodef/attribute.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>
-       <script type="text/javascript">var xookiConfig = {level: 2};</script>   
-       <script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<b>Tag:</b> attribute
-
-<span class="tagdoc" id="ivysettings.macrodef.attribute">Defines a macrodef 
attribute.</span> See macrodef for details.
-<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 attribute</td>
-        <td>Yes</td></tr>
-    <tr><td>default</td><td>the default value of the attribute if none is 
specified</td>
-        <td>No, by default attribute are required</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/settings/module.html
----------------------------------------------------------------------
diff --git a/doc/settings/module.html b/doc/settings/module.html
deleted file mode 100644
index e80dde0..0000000
--- a/doc/settings/module.html
+++ /dev/null
@@ -1,110 +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>Tag:</b> module
-
-<span class="tagdoc" id="ivysettings.modules.module">Define a module set 
rule.</span> The tag defines a module set, by giving an expression and the 
matcher to use for organisation, name, revision and any extra attribute 
identifying your modules. The rule matching is performed in order, and is using 
a pattern matcher. Hence you can use * to specify all, or simply avoid 
specifying the attribute. 
-
-The revision and extra attributes are only used for rules defining the 
resolver to use. For other settings, use only organisation and module name.
-
-It also gives the specific setting to use for this module set.
-
-For each module set, you can configure:
-<ul>
-<li>the [[settings/resolvers resolver]] to use</li>
-<li>the [[settings/conflict-managers conflict manager]] to use</li>
-<li>the default <a href="../terminology.html#branch">branch</a> to use</li>
-<li>the [[ant:resolve resolve mode]] to use</li>
-</ul>
-
-<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 to match to apply the 
rule.</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>name</td><td>the module's name to match to apply the rule.</td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>revision</td><td>the module's revision to match to apply the rule. 
Note that the version may not be resolved yet (be latest.integration for 
instance), so be very careful when using this attribute. <span 
class="since">since 2.0</span></td>
-        <td>No, defaults to *</td></tr>
-    <tr><td><em>any extra attribute</em></td><td>an extra attribute to match 
to apply the rule. <span class="since">since 2.0</span></td>
-        <td>No, defaults to *</td></tr>
-    <tr><td>matcher</td><td>the <a href="../concept.html#matcher">matcher</a> 
to use to match the modules to which the resolver should be applied <span 
class="since">since 1.3</span></td>
-        <td>No, defaults to exactOrRegexp</td></tr>
-    <tr><td>resolver</td><td>the name of the resolver to apply. The resolver 
must have been defined in the resolvers section of the configuration file.</td>
-        <td>No</td></tr>
-    <tr><td>conflict-manager</td><td>the name of the conflict manager to 
apply. <span class="since">since 1.4</span></td>
-        <td>No</td></tr>
-    <tr><td>branch</td><td>the default branch to apply. <span 
class="since">since 1.4</span></td>
-        <td>No</td></tr>
-    <tr><td>resolveMode</td><td>the resolve mode to use. <span 
class="since">since 2.0</span></td>
-        <td>No</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="*" resolver="myprojectsresolver"/>
-</modules>
-</code>
-Uses myprojectresolver for all modules from <i>apache</i>.
-<hr/>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="commons-*" matcher="glob" 
resolver="myapachecommonsresolver"/>
-</modules>
-</code>
-Uses myapachecommonsresolver for all modules beginning with 'commons-' from 
'apache'.
-<hr/>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="commons-[a-z]+" myextra="val.*" 
matcher="regexp" resolver="myapachecommonsresolver"/>
-</modules>
-</code>
-Uses myapachecommonsresolver for all modules from <i>apache</i> beginning with 
'commons-' followed by any number of alphabetic lowercase characters, and with 
the extra attribute 'myextra' having a value beginning with 'val.'.
-<hr/>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="ivy*" matcher="glob" 
conflict-manager="latest-time"/> 
-</modules>
-</code>
-Uses latest-time conflict manager for all modules from <i>apache</i> whose 
name begins with 'ivy'.
-<hr/>
-<code type="xml">
-<modules>
-  <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/> 
-</modules>
-</code>
-Uses 'fix-103' as default branch for all modules from <i>apache</i> whose name 
begins with 'ivy'.
-
-
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings/modules.html
----------------------------------------------------------------------
diff --git a/doc/settings/modules.html b/doc/settings/modules.html
deleted file mode 100644
index 6a6940f..0000000
--- a/doc/settings/modules.html
+++ /dev/null
@@ -1,51 +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>Tag:</b> modules
-
-<span class="tagdoc" id="ivysettings.modules">Defines per module or module set 
settings.</span>
-
-The rules are given by defining a module set, using a pattern for module 
organisation and name, and giving some settings for the set, like the name of 
the corresponding resolver to use.
-
-If no rules match a given module, the default setting will be used.
-
-Note: You can greatly improve the performance of dependency resolution by 
configuring multiple smaller resolvers instead of one large resolver (i.e. 
chain). For instance, if you have a local repository for your modules and a 
remote repository for third party libraries, it is a good idea to have two 
separate resolvers, one for all of your modules and another for the rest (the 
default one).
-
-<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>[[settings/module]]</td><td>defines a module set rule</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/settings/namespace.html
----------------------------------------------------------------------
diff --git a/doc/settings/namespace.html b/doc/settings/namespace.html
deleted file mode 100644
index dc6ebbb..0000000
--- a/doc/settings/namespace.html
+++ /dev/null
@@ -1,127 +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>Tag:</b> namespace
-
-<span class="tagdoc" id="ivysettings.namespaces.namespace">Defines a new 
namespace. A namespace is identified by a name, which can be referenced by one 
of the [[settings/resolvers]].</span>
-
-An overview of Namespaces is given in the [[settings/namespaces]] 
documentation.
-
-A namespace mainly consists of a list of rules, each rule defining a 
translation between a system namespace and the defined namespace, and vice 
versa.
-
-There are two main possibilities for using these rules. By default, a 
namespace iterates through the rules, and when it finds one that translates the 
given name, it returns the translated name. But the namespace can be configured 
to use the list as a translator chain: in this case, all rules are applied in 
order, the result of the first rule translation being passed to the second, and 
so on.
-<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 namespace name</td>
-        <td>Yes</td></tr>
-    <tr><td>chainrules</td><td>true to indicate that namespaces rules should 
be chained, false otherwise</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>[[settings/namespace/rule]]</td><td>defines a new namespace 
rule</td>
-        <td>0..n</td></tr>
-</tbody>
-</table>
-<h1>Example</h1>
-<code type="xml">
-<namespace name="test">
-  <rule>
-    <fromsystem>
-      <src org="systemorg"/>
-      <dest org="A"/>
-    </fromsystem>
-    <tosystem>
-      <src org="A"/>
-      <dest org="systemorg"/>
-    </tosystem>
-  </rule>
-</namespace>
-</code>
-
-<code type="xml">
-<namespace name="test">
-  <rule>
-    <fromsystem>
-      <src org="systemorg2" module="system\-(.+)"/>
-      <dest org="B" module="$m1"/>
-    </fromsystem>
-    <tosystem>
-      <src org="B" module=".+"/>
-      <dest org="systemorg2" module="system-$m0"/>
-    </tosystem>
-  </rule>
-</namespace>
-</code>
-
-<code type="xml">
-<namespace name="test" chainrules="true">
-  <rule>
-    <fromsystem>
-      <src org="systemorg"/>
-      <dest org="A"/>
-    </fromsystem>
-    <tosystem>
-      <src org="A"/>
-      <dest org="systemorg"/>
-    </tosystem>
-  </rule>
-  <rule>
-    <fromsystem>
-      <src module="systemmod"/>
-      <dest module="A"/>
-    </fromsystem>
-    <tosystem>
-      <src module="A"/>
-      <dest module="systemmod"/>
-    </tosystem>
-  </rule>
-  <rule>
-    <fromsystem>
-      <src module="systemmod2"/>
-      <dest module="B"/>
-    </fromsystem>
-    <tosystem>
-      <src module="B"/>
-      <dest module="systemmod2"/>
-    </tosystem>
-  </rule>
-</namespace>
-</code>
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/0c769150/doc/settings/namespace/dest.html
----------------------------------------------------------------------
diff --git a/doc/settings/namespace/dest.html b/doc/settings/namespace/dest.html
deleted file mode 100644
index 0f5d649..0000000
--- a/doc/settings/namespace/dest.html
+++ /dev/null
@@ -1,62 +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: 2};</script>   
-       <script type="text/javascript" src="../../xooki/xooki.js"></script>
-</head>
-<body>
-       <textarea id="xooki-source">
-<b>Tag:</b> dest
-
-<span class="tagdoc" 
id="ivysettings.namespaces.namespace.rule.fromsystem.dest">Defines the 
translation part of a translation rule. If a name has matched a corresponding 
src, it will be translated using this dest part.</span>
-
-The new names can contain references to groups of the matched name, using a 
slightly modified regexp syntax. Indeed, referenced groups can be part of 
either the organisation, module or revision part of the original name. So, to 
reference the groups, you just have to add a letter identifying the part in 
which the group should be selected: o for organisation, m for module, and r for 
revision.
-
-For instance, $o0 matches the whole matched organisation, and $m0 the whole 
matched module name. $o1 matches the first group of the matched organisation.
-
-For details about regexp and groups, see the <a 
href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html";>Pattern
 class documentation</a> in the jdk.
-<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 new organisation name</td>
-        <td>No, defaults to $o0</td></tr>
-    <tr><td>module</td><td>the new module name</td>
-        <td>No, defaults to $m0</td></tr>
-    <tr><td>rev</td><td>the new revision</td>
-        <td>No, defaults to $r0</td></tr>
-</tbody>
-</table>
-<h1>Examples</h1>
-<code type="xml">
-    <fromsystem>
-      <src org="systemorg2" module="system\-(.+)"/>
-      <dest org="B" module="$m1"/>
-    </fromsystem>
-</code>
-Matches modules from systemorg2 which have a name beginning with system 
followed by a minus and anything else, and translate it to organisation B and 
module the part following <code>system-</code> of the original name.
-
-       </textarea>
-<script type="text/javascript">xooki.postProcess();</script>
-</body>
-</html>

Reply via email to