ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject [3/6] ant-ivy git commit: Check spelling; fix whitespace and links; sort entries in .gitignore
Date Sun, 02 Jul 2017 14:57:26 GMT
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/ivysettings-default.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/ivysettings-default.xml b/asciidoc/samples/ivysettings-default.xml
index 9d985c1..3779c5c 100644
--- a/asciidoc/samples/ivysettings-default.xml
+++ b/asciidoc/samples/ivysettings-default.xml
@@ -14,7 +14,7 @@
    "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.    
+   under the License.
 -->
 <ivysettings>
 	<settings defaultResolver="ivyrep"/>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/jayasoft-ivyrep-example-default.html
----------------------------------------------------------------------
diff --git a/asciidoc/samples/jayasoft-ivyrep-example-default.html b/asciidoc/samples/jayasoft-ivyrep-example-default.html
index faa79ec..41668f3 100644
--- a/asciidoc/samples/jayasoft-ivyrep-example-default.html
+++ b/asciidoc/samples/jayasoft-ivyrep-example-default.html
@@ -14,7 +14,7 @@
    "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.    
+   under the License.
 -->
 <html>
 
@@ -32,12 +32,12 @@
 <a href="http://ant.apache.org/ivy/"><img src="../images/logo.png"></a>
 </div>
 <h1>
-<a name="jayasoft-ivyrep-example"></a><span id="module">ivyrep-example</span> 
-        by 
+<a name="jayasoft-ivyrep-example"></a><span id="module">ivyrep-example</span>
+        by
         <span id="organisation">jayasoft</span>
 </h1>
 <div id="date">
-    resolved on 
+    resolved on
       2005-04-08 13:33:40</div>
 <ul id="confmenu">
 <li>
@@ -51,14 +51,14 @@
 <td class="title">Modules</td><td class="value">3</td>
 </tr>
 <tr>
-<td class="title">Revisions</td><td class="value">4  
+<td class="title">Revisions</td><td class="value">4
             (0 searched <img title="module revisions which required a search with a dependency resolver to be resolved" alt="searched" src="../images/searched.gif">,
             0 downloaded <img title="module revisions for which ivy file was downloaded by dependency resolver" alt="downloaded" src="../images/downloaded.gif">,
             1 evicted <img title="module revisions which were evicted by others" alt="evicted" src="../images/evicted.gif">,
             0 errors <img title="module revisions on which error occurred" alt="error" src="../images/error.gif">)</td>
 </tr>
 <tr>
-<td class="title">Artifacts</td><td class="value">3 
+<td class="title">Artifacts</td><td class="value">3
             (0 downloaded,
             0 failed)</td>
 </tr>
@@ -281,7 +281,7 @@
             0 kB in cache)</td>
 </tr>
 <tr>
-<td class="title">Evicted by</td><td class="value">2.0   
+<td class="title">Evicted by</td><td class="value">2.0
             in <b>latest-revision</b> conflict manager
         </td>
 </tr>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/standard-osgi/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/build.xml b/asciidoc/samples/standard-osgi/build.xml
index e4a9dc7..c8ac62b 100644
--- a/asciidoc/samples/standard-osgi/build.xml
+++ b/asciidoc/samples/standard-osgi/build.xml
@@ -14,70 +14,70 @@
    "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.    
+   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 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 following -->
     <!-- taskdef rather than the above one -->
-    <!--path id="ivy.classpath"> 
+    <!--path id="ivy.classpath">
         <fileset dir="${basedir}">
-            <include name="ivy.jar" />
+            <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 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 following -->
     <!-- taskdef rather than the above one -->
-    <!--path id="bnd.classpath"> 
+    <!--path id="bnd.classpath">
         <fileset dir="${basedir}">
-            <include name="bnd.jar" />
+            <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" />
+        <delete dir="${basedir}/target"/>
     </target>
 
     <target name="ivy:configure">
         <!-- classical ivy configuration -->
-        <ivy:configure file="${basedir}/ivysettings.xml" />
+        <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" />
+        <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" />
+        <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" />
+        <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" />
+                <include name="**"/>
+                <exclude name="**/*.java"/>
+                <exclude name="**/package.html"/>
             </fileset>
             <fileset dir="${basedir}">
-                <include name="plugin.xml" />
+                <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" />
+        <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" />
+        <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/b02336b7/asciidoc/samples/standard-osgi/ivy.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/ivy.xml b/asciidoc/samples/standard-osgi/ivy.xml
index ca6411e..158623a 100644
--- a/asciidoc/samples/standard-osgi/ivy.xml
+++ b/asciidoc/samples/standard-osgi/ivy.xml
@@ -14,11 +14,11 @@
    "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.    
+   under the License.
 -->
 <ivy-module version="2.0">
-    <info organisation="com.acme" module="local-osgi-repo" />
+    <info organisation="com.acme" module="local-osgi-repo"/>
     <dependencies>
-        <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" />
+        <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0"/>
     </dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/standard-osgi/ivysettings.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/ivysettings.xml b/asciidoc/samples/standard-osgi/ivysettings.xml
index f5c476c..2411cfd 100644
--- a/asciidoc/samples/standard-osgi/ivysettings.xml
+++ b/asciidoc/samples/standard-osgi/ivysettings.xml
@@ -14,21 +14,21 @@
    "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.    
+   under the License.
 -->
 <ivysettings>
 
     <!-- We need to define the Ivy Osgi latest strategy as the default one -->
-    <settings defaultResolver="osgi-bundles" defaultLatestStrategy="latest-osgi" />
+    <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" />
+        <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" />
+        <obr name="osgi-bundles" repoXmlFile="${ivy.settings.dir}/../repo/repo.xml"/>
     </resolvers>
 
 </ivysettings>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
----------------------------------------------------------------------
diff --git a/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd b/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
index 8dbe365..4b7c7a4 100644
--- a/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
+++ b/asciidoc/samples/standard-osgi/org.apache.ivy.sample.standard-osgi.bnd
@@ -1,18 +1,18 @@
-#    ***************************************************************
-#    * 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.
-#    ***************************************************************
+#    ***************************************************************
+#    * 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/b02336b7/asciidoc/samples/target-platform/build.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/build.xml b/asciidoc/samples/target-platform/build.xml
index 2de015a..0e0f1b5 100644
--- a/asciidoc/samples/target-platform/build.xml
+++ b/asciidoc/samples/target-platform/build.xml
@@ -14,43 +14,43 @@
    "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.    
+   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 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 following -->
     <!-- taskdef rather than the above one -->
-    <!--path id="ivy.classpath"> 
+    <!--path id="ivy.classpath">
         <fileset dir="${basedir}">
-            <include name="ivy.jar" />
+            <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" />
+        <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
+        Two choices: either the jars stays in the cache, or they are retrieved in a dedicated folder
+        Having the bundle retrieved in a folder is helpful to manage target platforms with PDE
     -->
 
     <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" />
+        <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" />
+        <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/b02336b7/asciidoc/samples/target-platform/ivy.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/ivy.xml b/asciidoc/samples/target-platform/ivy.xml
index 8b83950..fb6ff95 100644
--- a/asciidoc/samples/target-platform/ivy.xml
+++ b/asciidoc/samples/target-platform/ivy.xml
@@ -14,11 +14,11 @@
    "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.    
+   under the License.
 -->
 <ivy-module version="2.0">
-    <info organisation="com.acme" module="target-platform" />
+    <info organisation="com.acme" module="target-platform"/>
     <dependencies>
-        <dependency org="bundle" name="org.eclipse.jdt.core" rev="3.8.3.v20130121-145325" />
+        <dependency org="bundle" name="org.eclipse.jdt.core" rev="3.8.3.v20130121-145325"/>
     </dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/samples/target-platform/ivysettings.xml
----------------------------------------------------------------------
diff --git a/asciidoc/samples/target-platform/ivysettings.xml b/asciidoc/samples/target-platform/ivysettings.xml
index 9697b93..db2cde6 100644
--- a/asciidoc/samples/target-platform/ivysettings.xml
+++ b/asciidoc/samples/target-platform/ivysettings.xml
@@ -14,20 +14,20 @@
    "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.    
+   under the License.
 -->
 <ivysettings>
 
-    <settings defaultResolver="eclipse-juno" defaultLatestStrategy="latest-osgi" />
+    <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" />
+        <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" />
+        <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/b02336b7/asciidoc/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings.adoc b/asciidoc/settings.adoc
index fc7729b..3ebd151 100644
--- a/asciidoc/settings.adoc
+++ b/asciidoc/settings.adoc
@@ -29,18 +29,18 @@ Here is an example of the settings file:
 ----
 
 <ivysettings>
-        <properties file="${ivy.settings.dir}/ivysettings-file.properties" />
-        <settings defaultResolver="ibiblio" />
-        <caches  defaultCacheDir="${cache.dir}" checkUpToDate="false" />
+        <properties file="${ivy.settings.dir}/ivysettings-file.properties"/>
+        <settings defaultResolver="ibiblio"/>
+        <caches  defaultCacheDir="${cache.dir}" checkUpToDate="false"/>
         <resolvers>
-                <ibiblio name="ibiblio" />
+                <ibiblio name="ibiblio"/>
                 <filesystem name="internal">
-                        <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml" />
-                        <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]" />
+                        <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" />
+                <module organisation="jayasoft" name=".*" resolver="internal"/>
         </modules>
 </ivysettings>
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/caches.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches.adoc b/asciidoc/settings/caches.adoc
index 3770e67..6d0413e 100644
--- a/asciidoc/settings/caches.adoc
+++ b/asciidoc/settings/caches.adoc
@@ -75,9 +75,9 @@ cache to another place in your filesystem). Usually it is a good thing to check
 ----
 
 <caches>
-  <cache name="mycache" basedir="path/to/my/cache/1" />
-  <cache name="mycache2" basedir="path/to/my/cache/2" />
-</caches> 
+  <cache name="mycache" basedir="path/to/my/cache/1"/>
+  <cache name="mycache2" basedir="path/to/my/cache/2"/>
+</caches>
 
 ----
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/caches/cache.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches/cache.adoc b/asciidoc/settings/caches/cache.adoc
index 8b13d24..decd3ec 100644
--- a/asciidoc/settings/caches/cache.adoc
+++ b/asciidoc/settings/caches/cache.adoc
@@ -40,7 +40,7 @@ By default also, the parsed module descriptor read from the cache are kept in a
 |basedir|the path of the base directory to use to put repository cache data. *This should not point to a directory used as a repository!*|No, defaults to repositoryCacheDir defined in link:../../settings/caches.html[caches]
 |ivyPattern|the pattern to use to store cached ivy files|No, defaults to default cache ivy pattern as configured in link:../../settings/caches.html[caches]
 |artifactPattern|the pattern to use to store cached artifacts|No, defaults to default cache artifact pattern as configured in link:../../settings/caches.html[caches]
-|useOrigin|true to avoid the copy of local artifacts to the cache and use directly their original location, false otherwise. 
+|useOrigin|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.|No. defaults to the default value configured in link:../../settings/caches.html[caches]
 |lockStrategy|the name of the link:../../settings/lock-strategies.html[lock strategy] to use for this cache|No, defaults to default lock strategy as configured in link:../../settings/caches.html[caches]
 |defaultTTL|the default link:../../settings/caches/ttl.html[TTL] to use when no specific one is defined|No, defaults to ${ivy.cache.ttl.default}
@@ -66,19 +66,18 @@ To know if an artifact is local ivy asks to the resolver. Only filesystem resolv
 [source, xml]
 ----
 
-<cache name="mycache" 
+<cache name="mycache"
        basedir="/path/to/mycache"
-       ivyPattern="[module]/ivy-[revision].xml" 
+       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" />
+    <ttl revision="latest.integration" duration="200ms"/>
+    <ttl organisation="org1" duration="10m 20s"/>
+    <ttl organisation="org2" duration="5h"/>
+    <ttl organisation="org3" duration="2d 12h"/>
 </cache>
 
 ----
 
 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.
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/caches/ttl.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/caches/ttl.adoc b/asciidoc/settings/caches/ttl.adoc
index 669691a..575d401 100644
--- a/asciidoc/settings/caches/ttl.adoc
+++ b/asciidoc/settings/caches/ttl.adoc
@@ -21,7 +21,7 @@
 
 *Tag:* ttl
 
-*__Since 2.0__* 
+*__Since 2.0__*
 
 Defines a TTL (Time To Live) rule for resolved revision caching.
 
@@ -42,7 +42,7 @@ XXd XXh XXm XXs XXXms
 
 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. 
+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.
 
@@ -60,5 +60,3 @@ Using a 0ms TTL disable resolved revision caching for the given rule.
 |matcher|the link:../../concept.html#matcher[matcher] to use to match the modules to which the resolver should be applied|No, defaults to exact
 |duration|the TTL to apply (see above for format)|Yes
 |=======
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/conflict-managers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/conflict-managers.adoc b/asciidoc/settings/conflict-managers.adoc
index b164762..19913ee 100644
--- a/asciidoc/settings/conflict-managers.adoc
+++ b/asciidoc/settings/conflict-managers.adoc
@@ -79,4 +79,3 @@ Here is a list of conflict manager types available, which can be used to define
 |Element|Description|Cardinality
 |any conflict manager|adds a conflict manager to the list of available conflict managers|0..n
 |=======
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/credentials.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/credentials.adoc b/asciidoc/settings/credentials.adoc
index 3ecf77f..e1c242e 100644
--- a/asciidoc/settings/credentials.adoc
+++ b/asciidoc/settings/credentials.adoc
@@ -35,4 +35,3 @@ Configures HTTP authentication credentials. *__since 2.0__*.
 |username|the username|Yes
 |passwd|the password|Yes
 |=======
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/include.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/include.adoc b/asciidoc/settings/include.adoc
index 2477583..a6b6d5d 100644
--- a/asciidoc/settings/include.adoc
+++ b/asciidoc/settings/include.adoc
@@ -80,7 +80,7 @@ The included ivysettings defines a resolver named default, which is an ivyrep re
   <resolvers>
     <mymacro name="includeworks" mymainrep="included/myrep" mysecondrep="included/secondrep"/>
   </resolvers>
-</ivysettings> 
+</ivysettings>
 
 ----
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/latest-strategies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/latest-strategies.adoc b/asciidoc/settings/latest-strategies.adoc
index 71dcbb5..3ede771 100644
--- a/asciidoc/settings/latest-strategies.adoc
+++ b/asciidoc/settings/latest-strategies.adoc
@@ -66,7 +66,7 @@ Here is an example of how you can do so:
     <specialMeaning name="QA" value="4"/>
     <specialMeaning name="PROD" value="5"/>
   </latest-revision>
-</latest-strategies> 
+</latest-strategies>
 
 ----
 
@@ -94,7 +94,6 @@ Example:
     <specialMeaning name="rc" value="2"/>
     <specialMeaning name="prod" value="3"/>
   </latest-revision>
-</latest-strategies> 
+</latest-strategies>
 
 ----
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/lock-strategies.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/lock-strategies.adoc b/asciidoc/settings/lock-strategies.adoc
index 504c5bd..971cf53 100644
--- a/asciidoc/settings/lock-strategies.adoc
+++ b/asciidoc/settings/lock-strategies.adoc
@@ -37,7 +37,7 @@ The following strategies are registered by default:
 
 * *artifact-lock* +
  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). 
+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).
 
 
 * *artifact-lock-nio (__since 2.4__)* +

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/macrodef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/macrodef.adoc b/asciidoc/settings/macrodef.adoc
index e0fe47d..b79ccf7 100644
--- a/asciidoc/settings/macrodef.adoc
+++ b/asciidoc/settings/macrodef.adoc
@@ -27,7 +27,7 @@ This task eases the process of creating a new dependency resolver, because it av
 
 It is generally used in combination with the link:../settings/include.html[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: 
+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:
 
 [source]
 ----
@@ -57,14 +57,14 @@ Example:
 <ivysettings>
   <macrodef name="mymacro">
     <chain>
-      <ibiblio name="ex1" />
-      <ibiblio name="ex2.@{name}" m2compatible="true" />
+      <ibiblio name="ex1"/>
+      <ibiblio name="ex2.@{name}" m2compatible="true"/>
     </chain>
   </macrodef>
-	
+
   <resolvers>
-    <mymacro name="default" />
-    <mymacro name="other" />
+    <mymacro name="default"/>
+    <mymacro name="other"/>
    </resolvers>
 </ivysettings>
 
@@ -78,12 +78,12 @@ This is equivalent to:
 <ivysettings>
   <resolvers>
     <chain name="default">
-      <ibiblio name="default-ex1" />
-      <ibiblio name="ex2.default" m2compatible="true" />
+      <ibiblio name="default-ex1"/>
+      <ibiblio name="ex2.default" m2compatible="true"/>
     </chain>
     <chain name="other">
-      <ibiblio name="other-ex1" />
-      <ibiblio name="ex2.other" m2compatible="true" />
+      <ibiblio name="other-ex1"/>
+      <ibiblio name="ex2.other" m2compatible="true"/>
     </chain>
    </resolvers>
 </ivysettings>
@@ -97,7 +97,7 @@ This is equivalent to:
 [options="header",cols="15%,50%,35%"]
 |=======
 |Attribute|Description|Required
-|name|name of the resover type created|Yes
+|name|name of the resolver type created|Yes
 |=======
 
 
@@ -164,15 +164,14 @@ A complete example:
       </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" 
+    <mymacro name="other"
+       mymainrep="path/to/myrep"
+       mysecondrep="path/to/secondrep"
        myseconddirlayout="[module]/[type]s"/>
    </resolvers>
 </ivysettings>
 
 ----
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/macrodef/attribute.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/macrodef/attribute.adoc b/asciidoc/settings/macrodef/attribute.adoc
index 3b6348f..54a6096 100644
--- a/asciidoc/settings/macrodef/attribute.adoc
+++ b/asciidoc/settings/macrodef/attribute.adoc
@@ -32,6 +32,3 @@ Defines a macrodef attribute. See link:../macrodef.html[macrodef] for details.
 |name|the name of the attribute|Yes
 |default|the default value of the attribute if none is specified|No, by default attribute are required
 |=======
-
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/module.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/module.adoc b/asciidoc/settings/module.adoc
index 9966f22..c6865e2 100644
--- a/asciidoc/settings/module.adoc
+++ b/asciidoc/settings/module.adoc
@@ -21,7 +21,7 @@
 
 *Tag:* module
 
-Define a module set rule. 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. 
+Define a module set rule. 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.
 
@@ -107,7 +107,7 @@ Uses `myapachecommonsresolver` for all modules from `apache` beginning with `com
 ----
 
 <modules>
-  <module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/> 
+  <module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/>
 </modules>
 
 ----
@@ -121,10 +121,9 @@ Uses `latest-time` conflict manager for all modules from `apache` whose name beg
 ----
 
 <modules>
-  <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/> 
+  <module organisation="apache" name="ivy*" matcher="glob" branch="fix-103"/>
 </modules>
 
 ----
 
 Uses `fix-103` as default branch for all modules from `apache` whose name begins with `ivy`.
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/modules.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/modules.adoc b/asciidoc/settings/modules.adoc
index 0c3ab25..52afad0 100644
--- a/asciidoc/settings/modules.adoc
+++ b/asciidoc/settings/modules.adoc
@@ -38,5 +38,3 @@ NOTE: You can greatly improve the performance of dependency resolution by config
 |Element|Description|Cardinality
 |link:../settings/module.html[module]|defines a module set rule|1..n
 |=======
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace.adoc b/asciidoc/settings/namespace.adoc
index ed02771..8d77a48 100644
--- a/asciidoc/settings/namespace.adoc
+++ b/asciidoc/settings/namespace.adoc
@@ -126,6 +126,3 @@ There are two main possibilities for using these rules. By default, a namespace
 </namespace>
 
 ----
-
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace/dest.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/dest.adoc b/asciidoc/settings/namespace/dest.adoc
index b2aa255..8a16ed8 100644
--- a/asciidoc/settings/namespace/dest.adoc
+++ b/asciidoc/settings/namespace/dest.adoc
@@ -55,4 +55,3 @@ For details about regexp and groups, see the link:https://docs.oracle.com/javase
 ----
 
 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 `system-` of the original name.
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace/fromtosystem.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/fromtosystem.adoc b/asciidoc/settings/namespace/fromtosystem.adoc
index d97ce89..9ce2dca 100644
--- a/asciidoc/settings/namespace/fromtosystem.adoc
+++ b/asciidoc/settings/namespace/fromtosystem.adoc
@@ -32,5 +32,3 @@ Defines a one way translation rule, i.e. a translation from system namespace to
 |link:../../settings/namespace/src.html[src]|defines a source name which can be accepted|1..n
 |link:../../settings/namespace/dest.html[dest]|defines the translation to apply when a name is accepted by an src pattern|1
 |=======
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace/rule.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/rule.adoc b/asciidoc/settings/namespace/rule.adoc
index 045f23d..e1a70b8 100644
--- a/asciidoc/settings/namespace/rule.adoc
+++ b/asciidoc/settings/namespace/rule.adoc
@@ -35,4 +35,3 @@ See the link:../../settings/namespace.html[namespace] doc for details.
 |link:../../settings/namespace/fromtosystem.html[fromsystem]|defines the translation to apply from the system namespace to the defined namespace|1
 |link:../../settings/namespace/fromtosystem.html[tosystem]|defines the translation to apply from the defined namespace to the system namespace|1
 |=======
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespace/src.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespace/src.adoc b/asciidoc/settings/namespace/src.adoc
index 98a840c..515bb75 100644
--- a/asciidoc/settings/namespace/src.adoc
+++ b/asciidoc/settings/namespace/src.adoc
@@ -33,5 +33,3 @@ Defines the acceptation part of a translation rule. If a name matches this src,
 |module|the module name to match as a regexp|No, defaults to .*
 |rev|the revision to match as a regexp|No, defaults to .*
 |=======
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/namespaces.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/namespaces.adoc b/asciidoc/settings/namespaces.adoc
index d6b16ae..a872a02 100644
--- a/asciidoc/settings/namespaces.adoc
+++ b/asciidoc/settings/namespaces.adoc
@@ -45,5 +45,3 @@ This very powerful feature is thoroughly used in the link:../tutorial/build-repo
 |Element|Description|Cardinality
 |link:../settings/namespace.html[namespace]|defines a new namespace|0..n
 |=======
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/outputters.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/outputters.adoc b/asciidoc/settings/outputters.adoc
index 932c604..d284a53 100644
--- a/asciidoc/settings/outputters.adoc
+++ b/asciidoc/settings/outputters.adoc
@@ -21,7 +21,7 @@
 
 *Tag:* outputters
 
-Defines a list of report outputters usable in ivy. 
+Defines a list of report outputters usable in ivy.
 
 A report outputter is used at the end of the resolve process to generate a report of how the resolve has been performed.
 
@@ -61,4 +61,3 @@ To see how to define your own report outputter see link:../extend.html[Extending
 |Element|Description|Cardinality
 |any report outputter|adds a report outputter to the list of available ones|0..n
 |=======
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/parsers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/parsers.adoc b/asciidoc/settings/parsers.adoc
index 5208b66..ce07ba6 100644
--- a/asciidoc/settings/parsers.adoc
+++ b/asciidoc/settings/parsers.adoc
@@ -44,5 +44,3 @@ this parser is able to parse Maven2 `pom` files
 |Element|Description|Cardinality
 |any module descriptor parser|adds a module descriptor parser to the list of available parsers|0..n
 |=======
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/properties.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/properties.adoc b/asciidoc/settings/properties.adoc
index 977cb80..e276eb5 100644
--- a/asciidoc/settings/properties.adoc
+++ b/asciidoc/settings/properties.adoc
@@ -33,11 +33,8 @@ Loads a properties file into ivy variables. See the variables chapter above for
 [options="header",cols="15%,50%,35%"]
 |=======
 |Attribute|Description|Required
-|file|a path to a properties file to load 
+|file|a path to a properties file to load
 .2+|One of these
 |environment|the prefix to use when retrieving environment variables *__(since 2.0)__*
 |override|indicates if the variable found in the properties file should override its previous value, if any *__(since 1.3)__*|No, defaults to true
 |=======
-
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/property.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/property.adoc b/asciidoc/settings/property.adoc
index 9989290..bfbd998 100644
--- a/asciidoc/settings/property.adoc
+++ b/asciidoc/settings/property.adoc
@@ -21,7 +21,7 @@
 
 *Tag:* property
 
-Defines an ivy variable. 
+Defines an ivy variable.
 
 *__since 1.3__*: The optional override attribute enables you to avoid overriding the previous value of the variable, which makes the definition behave like an ant property, which is particularly useful to define default values (values which are used only if they haven't been defined yet).
 
@@ -33,7 +33,7 @@ Defines an ivy variable.
 |Attribute|Description|Required
 |name|the name of the variable to define|Yes
 |value|the new value the variable must take|Yes
-|override|true if the previous value (if any) of the variable should overriden, false otherwise|No, defaults to true
+|override|true if the previous value (if any) of the variable should overridden, false otherwise|No, defaults to true
 |ifset|the variable will be set only if the provided 'ifset' variable is already set (Since 2.4)|No
 |unlessset|the variable will not be set unless the provided 'unlessset' variable is set (Since 2.4)|No
 |=======
@@ -70,7 +70,7 @@ Sets the variable myvar to the value myvalue only if myvar has not been set yet.
 ----
 
  <properties environment="env"/>
- <property name="ivy.repos.server" value="${env.IVY_SERVER}" override="false" ifset="env.IVY_SERVER" />
+ <property name="ivy.repos.server" value="${env.IVY_SERVER}" override="false" ifset="env.IVY_SERVER"/>
  <property name="ivy.repos.server" value="http://ivy:8081" override="false"/>
 
 ----

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/resolvers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/resolvers.adoc b/asciidoc/settings/resolvers.adoc
index 5faf33a..b1fe1aa 100644
--- a/asciidoc/settings/resolvers.adoc
+++ b/asciidoc/settings/resolvers.adoc
@@ -108,10 +108,10 @@ By using such a resolver at the beginning of a chain, you can be sure that Ivy w
 ==== Maven
 
 
-Any resolver which is able to parse a Maven pom.xml file has to detect the related sources or javadocs artifacts. This often involves sevrals network connection even if neither the sources nor the javadoc are requested to be downloaded.
+Any resolver which is able to parse a Maven pom.xml file has to detect the related sources or javadocs artifacts. This often involves several network connections even if neither the sources nor the javadoc are requested to be downloaded.
 
-*__since 2.5__* Setting the property `ivy.maven.lookup.sources` to `false` disable the lookup of the sources artifact. 
-And setting the property `ivy.maven.lookup.javadoc` to `false` disable the lookup of the javadoc artifact. 
+*__since 2.5__* Setting the property `ivy.maven.lookup.sources` to `false` disable the lookup of the sources artifact.
+And setting the property `ivy.maven.lookup.javadoc` to `false` disable the lookup of the javadoc artifact.
 
 
 === Attributes
@@ -127,7 +127,7 @@ And setting the property `ivy.maven.lookup.javadoc` to `false` disable the looku
 |changingPattern|Indicates for which revision pattern this resolver should check lastmodified date to know if an artifact file is up to date. *__since 1.4__*. See link:../concept.html#change[cache and change management] for details.|No, defaults to none|Yes|Yes
 |changingMatcher|The name of the link:../concept.html#matcher[pattern matcher] to use to match a revision against the configured changingPattern. *__since 1.4__*. See link:../concept.html#change[cache and change management] for details.|No, defaults to exactOrRegexp|Yes|Yes
 |alwaysCheckExactRevision|Indicates if this resolver should check the given revision even if it's a special one (like latest.integration). *__since 1.3__*|No, defaults to ${ivy.default.always.check.exact.revision}|No|Yes
-|namespace|The name of the namespace to which this resolver belons *__since 1.3__*|No, defaults to 'system'|Yes|Yes
+|namespace|The name of the namespace to which this resolver belongs *__since 1.3__*|No, defaults to 'system'|Yes|Yes
 |checkconsistency|true to check consistency of module descriptors found by this resolver, false to avoid consistency check *__since 1.3__*|No, defaults to true|No|Yes
 |descriptor|'optional' if a module descriptor (usually an ivy file) is optional for this resolver, 'required' to refuse modules without module descriptor *__since 2.0__*|No, defaults to 'optional'|No (except dual)|Yes
 |allownomd|_DEPRECATED. Use descriptor="required | optional" instead._
@@ -164,4 +164,3 @@ And setting the property `ivy.maven.lookup.javadoc` to `false` disable the looku
 ----
 
 Defines a filesystem resolver, named `1`, which is then used in two chains, the first which combines the filesystem resolver with an ivyrep resolver, and second which combines the filesystem resolver with an ibiblio resolver, and which returns the first module found, and uses the whole chain to download artifacts (see corresponding resolvers documentation for details about them).   Resolver `1` will use a cache named `cache-1` which should have been defined under the caches element.
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/settings.adoc b/asciidoc/settings/settings.adoc
index 9b84985..6fbea28 100644
--- a/asciidoc/settings/settings.adoc
+++ b/asciidoc/settings/settings.adoc
@@ -31,7 +31,7 @@ _validate_ indicates if ivy files should generally be validated against the xsd
 
     1. in ant tasks
     2. in resolvers
-    
+
 So if there is a setting in the resolver, it always wins against all other settings.
 
 
@@ -59,4 +59,3 @@ So if there is a setting in the resolver, it always wins against all other setti
 |[line-through]#cacheArtifactPattern#|a pattern to indicate where artifact files should be put in cache. +
     	__Deprecated, we recommend using artifactPattern on the link:../settings/caches.html[caches] tag instead__|No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]
 |=======
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/signers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/signers.adoc b/asciidoc/settings/signers.adoc
index eb04532..a83e1e5 100644
--- a/asciidoc/settings/signers.adoc
+++ b/asciidoc/settings/signers.adoc
@@ -26,7 +26,7 @@
 Defines a list of detached signature generators usable in ivy. Each generator is identified by its name, given as an attribute.
 The child tags used to configure the signature generator must be equal to the name of a signature generator type (either built-in or added with the typedef tag).
 
-Ivy supports the following signature generator out of the box: 
+Ivy supports the following signature generator out of the box:
 
 
 * pgp +
@@ -75,7 +75,7 @@ This generator is capable of generating an OpenPGP compatible ASCII armored deta
 ----
 
 <signers>
-    <pgp name="mypgp" password="my-password" />
+    <pgp name="mypgp" password="my-password"/>
 </signers>
 
 ----

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/status.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/status.adoc b/asciidoc/settings/status.adoc
index a657d40..4131e37 100644
--- a/asciidoc/settings/status.adoc
+++ b/asciidoc/settings/status.adoc
@@ -35,4 +35,3 @@ See link:../settings/statuses.html[statuses] page for details about how statuses
 |name|name of status defined|Yes
 |integration|true if this is an integration status, false otherwise|No, defaults to false
 |=======
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/statuses.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/statuses.adoc b/asciidoc/settings/statuses.adoc
index 5c9e4ed..1c0c6d0 100644
--- a/asciidoc/settings/statuses.adoc
+++ b/asciidoc/settings/statuses.adoc
@@ -62,9 +62,9 @@ NOTE: The statuses order is important, the first is considered the more mature,
   <status name="gold" integration="false"/>
   <status name="silver" integration="false"/>
   <status name="bronze" integration="true"/>
-</statuses> 
+</statuses>
 
 ----
 
-Defines 3 statuses, `gold`, `silver` and `bronze`. The default status used when none is declared in an ivy file will be `bronze`. 
-It is also considered as an integration status, and thus doesn't trigger any recrusive delivery.
+Defines 3 statuses, `gold`, `silver` and `bronze`. The default status used when none is declared in an ivy file will be `bronze`.
+It is also considered as an integration status, and thus doesn't trigger any recursive delivery.

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/triggers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/triggers.adoc b/asciidoc/settings/triggers.adoc
index 64283df..acfd5ac 100644
--- a/asciidoc/settings/triggers.adoc
+++ b/asciidoc/settings/triggers.adoc
@@ -26,14 +26,14 @@
 Defines a list of triggers to activate on some Ivy events.
 
 A trigger is an action which is performed whenever a particular event occurs.
-Ivy supports 3 type of triggers out of the box: 
+Ivy supports 3 type of triggers out of the box:
 
 
     * ant-call +
-     calls a target in the same build as the original one whenever a particular event occurs. 
+     calls a target in the same build as the original one whenever a particular event occurs.
 
     * ant-build +
-     calls an ant build which may be in another ant build script. 
+     calls an ant build which may be in another ant build script.
 
     * log +
      echo a message, usually in a file
@@ -47,385 +47,385 @@ The following events are available in Ivy:
 |=======
 |Name|Attributes|Description
 |pre-resolve|
-          
-            
+
+
 * organisation +
 the organisation of the module for which the dependencies will be resolved
-            
+
 * module +
 the name of the module for which the dependencies will be resolved
-            
+
 * revision +
 the revision of the module for which the dependencies will be resolved
-            
+
 * conf +
 comma separated list of configurations which will be resolved
-          
+
         |Fired at the beginning of the resolve process, before module dependencies and transitive dependencies are resolved.
 |pre-resolve-dependency|
-          
-            
+
+
 * organisation +
 the organisation of the dependency resolved
-            
+
 * module +
 the name of the dependency resolved
-            
+
 * req-revision +
 the requested revision for the dependency *__since 2.0__* (provided for consistency with post-resolve-dependency)
-            
+
 * req-revision-default +
 the default requested revision constraint for the dependency *__since 2.0__*
-            
+
 * req-revision-dynamic +
 the requested revision dynamic constraint for the dependency *__since 2.0__*
-            
+
 * revision +
 the requested revision for the dependency
-            
+
 * resolver +
 the name of the resolver used to resolve the dependency
-          
+
         |Fired before each dependency is resolved. In this case resolved means resolving the actual revision if the requested revision is a version constraint and not a static version, and downloading all necessary metadata information.
 |post-resolve-dependency|
-          
-            
+
+
 * organisation +
 the organisation of the dependency resolved
-            
+
 * module +
 the name of the dependency resolved
-            
+
 * req-revision +
 the requested revision for the dependency *__since 2.0__*
-            
+
 * req-revision-default +
 the default requested revision constraint for the dependency *__since 2.0__*
-            
+
 * req-revision-dynamic +
 the requested revision dynamic constraint for the dependency *__since 2.0__*
-            
+
 * revision +
 the revision of the dependency resolved, or the requested revision if the resolution was not successful
-            
+
 * resolved +
 true if the resolution was successful, false otherwise
-            
+
 * duration +
 the time elapsed to resolve the dependency (in ms) *__since 2.0__*
-            
+
 * resolver +
 the name of the resolver used to resolve the dependency
-            
+
 * any extra attribute +
 all extra attributes found on the info tag of the resolved dependency are available *__since 2.0__*
-          
+
         |Fired after each dependency is resolved
 |post-resolve|
-          
-            
+
+
 * organisation +
 the organisation of the module for which the dependencies have been resolved
-            
+
 * module +
 the name of the module for which the dependencies have been resolved
-            
+
 * revision +
 the revision of the module for which the dependencies have been resolved
-            
+
 * conf +
 comma separated list of configurations resolved
-            
+
 * resolve-id +
 the identifier of the resolution process *__since 2.0__*
-            
+
 * nb-dependencies +
 total number of dependencies, including transitive and evicted ones *__since 2.0__*
-            
+
 * nb-artifacts +
 total number of artifacts resolved, excluding metadata artifacts *__since 2.0__*
-            
+
 * resolve-duration +
-the time (in ms) elapsed to resolve dependencies, before dowloading artifacts *__since 2.0__*
-            
+the time (in ms) elapsed to resolve dependencies, before downloading artifacts *__since 2.0__*
+
 * download-duration +
 the time (in ms) elapsed to download all artifacts, excluding metadata artifacts downloaded during the first phase of the resolution process *__since 2.0__*
-            
+
 * download-size +
 the total size (in bytes) of all downloaded artifacts, excluding metadata artifacts. Only artifacts actually downloaded (not in cache or used from their original location) are considered *__since 2.0__*
-          
+
         |Fired at the end of the resolve process, when all module dependencies have been resolved
 |pre-download-artifact|
-          
-            
+
+
 * organisation +
 the organisation of the artifact which is about to be downloaded
-            
+
 * module +
 the name of the module of the artifact which is about to be downloaded
-            
+
 * revision +
 the revision of the the artifact which is about to be downloaded
-            
+
 * artifact +
 the name of the the artifact which is about to be downloaded
-            
+
 * type +
 the type of the the artifact which is about to be downloaded
-            
+
 * ext +
 the extension of the the artifact which is about to be downloaded
-            
+
 * metadata +
 true if the artifact to be downloaded is a metadata artifact, false for published artifacts *__since 2.0__*
-            
+
 * resolver +
 the name of the resolver used to download the artifact
-            
+
 * origin +
 the origin location from which it will be downloaded
-            
+
 * local +
 true if it's a local artifact, false otherwise
-          
+
         |Fired before an artifact is downloaded from a repository to the cache
 |post-download-artifact|
-          
-            
+
+
 * organisation +
 the organisation of the artifact which was just downloaded
-            
+
 * module +
 the name of the module of the artifact which was just downloaded
-            
+
 * revision +
 the revision of the the artifact which was just downloaded
-            
+
 * artifact +
 the name of the the artifact which was just downloaded
-            
+
 * type +
 the type of the the artifact which was just downloaded
-            
+
 * ext +
 the extension of the the artifact which was just downloaded
-            
+
 * metadata +
 true if the downloaded artifact is a metadata artifact, false for published artifacts *__since 2.0__*
-            
+
 * resolver +
 the name of the resolver used to download the artifact
-            
+
 * origin +
 the origin location from which it was downloaded
-            
+
 * local +
 true if it's a local artifact, false otherwise
-            
+
 * size +
 the size in bytes of the downloaded artifact
-            
+
 * duration +
 the time elapsed to download the artifact (in ms) *__since 2.0__*
-            
+
 * file +
 the file to which it has been downloaded
-          
+
         |Fired after an artifact has been downloaded from a repository to the cache
-|pre-retrieve 
+|pre-retrieve
 *__since 2.0__*|
-          
-            
+
+
 * organisation +
 the organisation of the module for which the dependencies will be retrieved
-            
+
 * module +
 the name of the module for which the dependencies will be retrieved
-            
+
 * revision +
 the revision of the module for which the dependencies will be retrieved
-            
+
 * conf +
 comma separated list of configurations which will be retrieved
-            
+
 * symlink +
 true if Ivy will use symbolic links instead of copies on supported platforms, false otherwise
-            
+
 * sync +
 true if the retrieve process will be performed in sync mode, false otherwise
-          
+
         |Fired at the beginning of the retrieve process.
-|post-retrieve 
+|post-retrieve
 *__since 2.0__*|
-          
-            
+
+
 * organisation +
 the organisation of the module for which the dependencies have been retrieved
-            
+
 * module +
 the name of the module for which the dependencies will be retrieved
-            
+
 * revision +
 the revision of the module for which the dependencies have been retrieved
-            
+
 * conf +
 comma separated list of configurations which have been retrieved
-            
+
 * symlink +
 true if Ivy used symbolic links instead of copies on supported platforms, false otherwise
-            
+
 * sync +
 true if the retrieve process has been performed in sync mode, false otherwise
-            
+
 * duration +
 the time elapsed in ms during the retrieve process
-            
+
 * size +
 the total size of artifacts which have actually been copied (or symlinked)
-            
+
 * nbCopied +
 the number of artifacts copied or symlinked
-            
+
 * nbUptodate +
 the number of artifacts which were already present and up to date at the destination location
-          
+
         |Fired at the end of the retrieve process.
-|pre-retrieve-artifact 
+|pre-retrieve-artifact
 *__since 2.1__*|
-          
-            
+
+
 * organisation +
 the organisation of the artifact which is about to be retrieved
-            
+
 * module +
 the name of the module of the artifact which is about to be retrieved
-            
+
 * revision +
 the revision of the the artifact which is about to be retrieved
-            
+
 * artifact +
 the name of the the artifact which is about to be retrieved
-            
+
 * type +
 the type of the the artifact which is about to be retrieved
-            
+
 * ext +
 the extension of the the artifact which is about to be retrieved
-            
+
 * metadata +
-true if the retrieved artifact is a metadata artifact, false for published artifacts 
-            
+true if the retrieved artifact is a metadata artifact, false for published artifacts
+
 * size +
 the size in bytes of the retrieved artifact
-            
+
 * from +
 the absolute path from which it will be retrieved (usually a location in cache)
-            
+
 * to +
 the absolute path to which it will be retrieved
-          
+
         |Fired before an artifact is retrieved from the cache to a local location
-|post-retrieve-artifact 
+|post-retrieve-artifact
 *__since 2.1__*|
-          
-            
+
+
 * organisation +
 the organisation of the artifact which has just been retrieved
-            
+
 * module +
 the name of the module of the artifact which has just been retrieved
-            
+
 * revision +
 the revision of the the artifact which has just been retrieved
-            
+
 * artifact +
 the name of the the artifact which has just been retrieved
-            
+
 * type +
 the type of the the artifact which has just been retrieved
-            
+
 * ext +
 the extension of the the artifact which has just been retrieved
-            
+
 * metadata +
-true if the retrieved artifact is a metadata artifact, false for published artifacts 
-            
+true if the retrieved artifact is a metadata artifact, false for published artifacts
+
 * size +
 the size in bytes of the retrieved artifact
-            
+
 * from +
 the absolute path from which it has just been retrieved (usually a location in cache)
-            
+
 * to +
 the absolute path to which it has just been retrieved
-          
+
         |Fired after an artifact is retrieved from the cache to a local location
-|pre-publish-artifact 
+|pre-publish-artifact
 *__since 2.0__*|
-          
-            
+
+
 * organisation +
 the organisation of the artifact which is about to be published
-            
+
 * module +
 the name of the module of the artifact which is about to be published
-            
+
 * revision +
 the revision of the the artifact which is about to be published
-            
+
 * artifact +
 the name of the the artifact which is about to be published
-            
+
 * type +
 the type of the the artifact which is about to be published
-            
+
 * ext +
 the extension of the the artifact which is about to be published
-            
+
 * resolver +
 the name of the resolver into which the artifact is about to be published
-            
+
 * file +
 the absolute path of the source file for the artifact
-            
+
 * overwrite +
 "true" if the new data will overwrite existing artifacts, "false" otherwise
-          
+
         |Fired before an artifact is published into a repository
-|post-publish-artifact 
+|post-publish-artifact
 *__since 2.0__*|
-          
-            
+
+
 * organisation +
 the organisation of the artifact that was published
-            
+
 * module +
 the name of the module of the artifact that was published
-            
+
 * revision +
 the revision of the the artifact that was published
-            
+
 * artifact +
 the name of the the artifact that was published
-            
+
 * type +
 the type of the the artifact that was published
-            
+
 * ext +
 the extension of the the artifact that was published
-            
+
 * resolver +
 the name of the resolver into which the artifact was published
-            
+
 * file +
 the absolute path of the source file for the artifact
-            
+
 * overwrite +
 "true" if the new data overwrote existing artifacts, "false" otherwise
-            
+
 * status +
 "successful" if the artifact published successfully; "failed" if the artifact failed to publish, or if the status is unknown
-          
+
         |Fired after an artifact is published into a repository.  Note that this event is fired whether or not the publication succeeded.  The "status" property can be checked to verify success.
 |=======
 
@@ -447,7 +447,7 @@ The child tag used for the dependency resolver must be equal to a name of a trig
 
 == Built-in Triggers
 
-Ivy comes with 3 built-in triggers: 
+Ivy comes with 3 built-in triggers:
 
 
 [options="header",cols="15%,50%"]
@@ -465,9 +465,9 @@ Ivy comes with 3 built-in triggers:
 
 All triggers share some common attributes detailed here.
 
-Among these attributes, you will find how to select when the trigger should be performed. You have to provide an event name, which is simple, but you can also use a filter expression. The syntax for this expression is very simple and limited: 
+Among these attributes, you will find how to select when the trigger should be performed. You have to provide an event name, which is simple, but you can also use a filter expression. The syntax for this expression is very simple and limited:
 
-    - you can use the = operator to compare an attribute (left operande) with a value (right operande).
+    - you can use the = operator to compare an attribute (left operand) with a value (right operand).
     - you can use AND OR NOT as boolean operators
     - you cannot use parenthesis to change the precedence
 
@@ -507,7 +507,7 @@ Note that by default the ant build is triggered only once per build file. See be
 <triggers>
     <ant-build antfile="${ivy.settings.dir}/[module]/build.xml" target="publish"
            event="pre-resolve-dependency" filter="revision=latest.integration"
-           onlyonce="false" />
+           onlyonce="false"/>
 </triggers>
 
 ----
@@ -535,9 +535,9 @@ Here is how the target can look like:
 
 <target name="unzip">
      <echo>
-        unzipping artifact: 
-        organisation=${dep.organisation} 
-        module=${dep.module} 
+        unzipping artifact:
+        organisation=${dep.organisation}
+        module=${dep.module}
         revision=${dep.revision}
         artifact=${dep.artifact}
         type=${dep.type}
@@ -561,7 +561,7 @@ Here is how the target can look like:
 ----
 
 <triggers>
-    <log file="ivy.log" 
+    <log file="ivy.log"
           message='downloaded "${origin}" to "${file}" (${duration}ms - ${size}B)'
           event="post-download-artifact" filter="status=successful"/>
 </triggers>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/typedef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/typedef.adoc b/asciidoc/settings/typedef.adoc
index 872aa67..a956dcf 100644
--- a/asciidoc/settings/typedef.adoc
+++ b/asciidoc/settings/typedef.adoc
@@ -33,5 +33,3 @@ See link:../extend.html[how to write and plug your own dependency resolver] for
 |name|the name of the type to define. This name is then used as an xml tag.|Yes
 |classname|the fully qualified class name of the type to define.|Yes
 |=======
-
-

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/settings/version-matchers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/version-matchers.adoc b/asciidoc/settings/version-matchers.adoc
index 6b9de5a..5406510 100644
--- a/asciidoc/settings/version-matchers.adoc
+++ b/asciidoc/settings/version-matchers.adoc
@@ -21,7 +21,7 @@
 
 *Tag:* version-matchers
 
-Defines a list of version matchers. *__since 1.4__* 
+Defines a list of version matchers. *__since 1.4__*
 
 The child tag used for the version matcher must be equal to a name of a report outputter type (added with the `typedef` tag).
 
@@ -33,7 +33,7 @@ A version matcher is used to evaluate if a dependency version constraint matches
 
 [options="header",cols="15%,50%,35%"]
 |=======
-|Attribute|Descrition|Required
+|Attribute|Description|Required
 |usedefaults|when set to true, includes the built-in version matchers (Latest, Sub Revision, and Version Ranger Matcher). Exact Revision Matcher is always included|No, defaults to false
 |=======
 
@@ -52,7 +52,7 @@ A version matcher is used to evaluate if a dependency version constraint matches
 == Built-in Version Matchers
 
 
-=== Exact Revesion Matcher
+=== Exact Revision Matcher
 
 A matcher that matches a dependency revision id to the module revision id using simple string equality.
 
@@ -101,10 +101,10 @@ Range types are exhaustively listed by example in the table below.
 | [1.0,2.0[ | all versions greater or equal to 1.0 and lower than 2.0
 | ]1.0,2.0] | all versions greater than 1.0 and lower or equal to 2.0
 | ]1.0,2.0[ | all versions greater than 1.0 and lower than 2.0
-| [1.0,) | all versions greater or equal to 1.0 
+| [1.0,) | all versions greater or equal to 1.0
 | ]1.0,) | all versions greater than 1.0
 | (,2.0] | all versions lower or equal to 2.0
-| (,2.0[ | all versions lower than 2.0 
+| (,2.0[ | all versions lower than 2.0
 |=======
 
 
@@ -122,7 +122,7 @@ The version pattern matcher allows for more flexibility in pattern matching at t
 ----
 
 <pattern-vm>
-  <match revision="foo" pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" />
+  <match revision="foo" pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp"/>
 </pattern-vm>
 
 ----
@@ -134,7 +134,7 @@ The version pattern matcher allows for more flexibility in pattern matching at t
 [source, xml]
 ----
 
-<dependency org="acme" name="tool" rev="foo(1, 3)" />
+<dependency org="acme" name="tool" rev="foo(1, 3)"/>
 
 ----
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/standalone.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/standalone.adoc b/asciidoc/standalone.adoc
index 5789e7a..6eac03b 100644
--- a/asciidoc/standalone.adoc
+++ b/asciidoc/standalone.adoc
@@ -44,7 +44,7 @@ usage: ivy
 ==== resolve options
  -ivy <ivyfile>               use given file as ivy file
  -refresh                     refresh dynamic resolved revisions
- -dependency <organisation> <module> <revision> 
+ -dependency <organisation> <module> <revision>
                               use this instead of ivy file to do the rest of the
                                work with this as a dependency.
  -confs <configurations>      resolve given configurations
@@ -142,7 +142,7 @@ java -jar ivy.jar -settings path/to/myivysettings.xml -dependency apache commons
 
 ----
 
-calls ivy with given ivysettings file and resolve apache `commons-lang 2.0`. 
+calls ivy with given ivysettings file and resolve apache `commons-lang 2.0`.
 
 This is equivalent to:
 
@@ -161,8 +161,7 @@ with `ivy.xml` like this:
 <ivy-module version="1.0">
   <info organisation="org"
        module="standalone"
-       revision="working"
-   />
+       revision="working"/>
   <dependencies>
     <dependency org="apache" name="commons-lang" rev="2.0" conf="default->*"/>
   </dependencies>
@@ -182,7 +181,7 @@ java -jar ivy.jar -settings path/to/myivysettings.xml -ivy path/to/myivy.xml -ca
 
 ----
 
-calls ivy with given ivysettings file and resolves the dependencies found in the given ivy file, and then outputs the classpath of resolved artifacts in cache in a file. This file can then be used to define a classpath corresponding to all the resolved dependencies for any java program. 
+calls ivy with given ivysettings file and resolves the dependencies found in the given ivy file, and then outputs the classpath of resolved artifacts in cache in a file. This file can then be used to define a classpath corresponding to all the resolved dependencies for any java program.
 
 
 '''
@@ -196,4 +195,4 @@ java -jar ivy.jar -settings path/to/myivysettings.xml -dependency bar foo 2.0 -m
 
 ----
 
-calls ivy with given ivysettings file and resolves the depedency `bar` `foo` `2.0`, and then runs `org.foo.FooMain` class with the resolved artifacts as classpath
+calls ivy with given ivysettings file and resolves the dependency `bar` `foo` `2.0`, and then runs `org.foo.FooMain` class with the resolved artifacts as classpath

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/style/style.css
----------------------------------------------------------------------
diff --git a/asciidoc/style/style.css b/asciidoc/style/style.css
index 033ea75..3d0948e 100644
--- a/asciidoc/style/style.css
+++ b/asciidoc/style/style.css
@@ -17,242 +17,225 @@
  */
 
 body  {
-  margin: 0;
-  padding: 0;
-  background-color: #5a7418;
+    margin: 0;
+    padding: 0;
+    background-color: #5a7418;
 }
 #body  {
-  display: table;
-  margin: 8px auto;
-  padding: 0;
-  width: 98%;
-  color: #000;
-  background-color: #fff;
-  border-radius: 5px;
-  padding-top: 5px;
-  padding-bottom: 5px;
+    display: table;
+    margin: 8px auto;
+    padding: 0;
+    width: 98%;
+    color: #000;
+    background-color: #fff;
+    border-radius: 5px;
+    padding-top: 5px;
+    padding-bottom: 5px;
 }
 body, p, td, li, ul, ol  {
-  font-family: Verdana, Helvetica, Arial, sans-serif;
-  font-size: small;
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-size: small;
 }
 li p {
-  margin: 0;
+    margin: 0;
 }
 h1, h2, h3, h4, h5, h6 {
-  color: #7a9438;
-  font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+    color: #7a9438;font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
 }
 h1 {
-  color: #7a9438;
-  background-color: #fff;
-  background: none;
+    color: #7a9438;
+    background-color: #fff;
+    background: none;
 }
 h2 {
-  color: #fff;
-  background-color: #7a9438;
-  padding-left: 10px;
-  font-size: 1.6em;
-  border-radius: 5px;
+    color: #fff;
+    background-color: #7a9438;
+    padding-left: 10px;
+    font-size: 1.6em;
+    border-radius: 5px;
 }
 h3 {
-  font-size: 1.4em;
+    font-size: 1.4em;
 }
 h4 {
-  font-size: 1.2em;
+    font-size: 1.2em;
 }
 h5 {
-  font-size: 1.1em;
+    font-size: 1.1em;
 }
 tr.dark td, tr.light td {
-  padding: 0.3em;
+    padding: 0.3em;
 }
 a:link {
-  text-decoration: none;
-  font-weight: bold;
-  color: #7a9438;
+    text-decoration: none;
+    font-weight: bold;
+    color: #7a9438;
 }
 a:visited {
-  text-decoration: none;
-  font-weight: bold;
-  color: #7a9438;
+    text-decoration: none;
+    font-weight: bold;
+    color: #7a9438;
 }
 a:hover, a:active {
-  font-weight: bold;
-  text-decoration: underline;
-  color: #7a9438;
+    font-weight: bold;
+    text-decoration: underline;
+    color: #7a9438;
 }
 p {
-  margin: 0 0 1.3em 0;
-  padding: 0;
+    margin: 0 0 1.3em 0;
+    padding: 0;
 }
 blockquote {
-  padding: 0 15px 0 15px;
-  margin: 15px 50px 15px 50px;
-  text-align: left;
-  font-size: 1.2em;
-  line-height: 1.3em;
-  font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+    padding: 0 15px 0 15px;
+    margin: 15px 50px 15px 50px;
+    text-align: left;
+    font-size: 1.2em;
+    line-height: 1.3em;
+    font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
   color: #696969;
 }
 pre {
-  padding: 0.75em 1.5em;
-  font-size: 1em;
-  background-color: #eee;
-  border: 1px solid #ddd;
+    padding: 0.75em 1.5em;
+    font-size: 1em;
+    background-color: #eee;
+    border: 1px solid #ddd;
 }
 code {
-  background-color: #EEE;
+    background-color: #EEE;
 }
 #home img {
-  padding: 5px 20px 10px 10px;
+    padding: 5px 20px 10px 10px;
 }
 .product img {
-  padding: 5px 20px 10px 10px;
+    padding: 5px 20px 10px 10px;
 }
 #navcontainer  {
-  color: white;
-  margin-left: 20px;
-  background-color:#7a9438;
+    color: white;
+    margin-left: 20px;
+    background-color:#7a9438;
 }
 #navcontainer  a {
-  color: white;
-  text-decoration: none;
+    color: white;
+    text-decoration: none;
 }
 #nav {
-  background-color:#7a9438;
+    background-color:#7a9438;
 }
 #nav ul {
-  background-color:#7a9438;
-  border-top: 1px solid #7a9438;
-  border-right: 1px solid #7a9438;
-  border-bottom: 1px solid #7a9438;
-  border-left: 0.75em solid #7a9438;
+    background-color:#7a9438;
+    border-top: 1px solid #7a9438;
+    border-right: 1px solid #7a9438;
+    border-bottom: 1px solid #7a9438;
+    border-left: 0.75em solid #7a9438;
 }
 #nav li a {
-  color: #fff;
+    color: #fff;
 }
 #nav .title {
-  color: #fff;
-  background: #7a9438;
-  border-top: 0;
-  border-right: 0;
-  border-bottom: 1px solid #7a9438;
-  border-left: 0;
+    color: #fff;
+    background: #7a9438;
+    border-top: 0;
+    border-right: 0;
+    border-bottom: 1px solid #7a9438;
+    border-left: 0;
 }
-
 #nav li li a {
-  background: #fff;
-  color: #7a9438;
-  border-top: 0;
-  border-right: 0;
-  border-bottom: 1px solid #7a9438;
-  border-left: 0;
+    background: #fff;
+    color: #7a9438;
+    border-top: 0;
+    border-right: 0;
+    border-bottom: 1px solid #7a9438;
+    border-left: 0;
 }
-
-#nav a:hover,
-#nav a:active {
-  background: #9ebf47;
+#nav a:hover, #nav a:active {
+    background: #9ebf47;
 }
-
 #top-menu {
-  background-color:#7a9438;
-  border-top: 3px solid #9ebf47;
-  border-bottom: 3px solid #9ebf47;
+    background-color:#7a9438;
+    border-top: 3px solid #9ebf47;
+    border-bottom: 3px solid #9ebf47;
 }
-
 #top-menu tr {
-  padding: 0;
-  margin: 0;
+    padding: 0;
+    margin: 0;
 }
-
 #top-menu td {
-  padding: 0;
-  margin: 0;
+    padding: 0;
+    margin: 0;
 }
-
 #search {
-  padding: 0 1em 0 1em;
-  margin: 0;
+    padding: 0 1em 0 1em;
+    margin: 0;
 }
 #search .form-text, #search .form-submit {
-  padding: 0;
-  margin: 0;
-  font-size: 0.85em;
-  border: 1px solid #7a9438;
+    padding: 0;
+    margin: 0;
+    font-size: 0.85em;
+    border: 1px solid #7a9438;
 }
 #search .form-submit {
-  background-color: #9ebf47;
+    background-color: #9ebf47;
 }
 #search .form-text {
-  width: 8em;
-  padding: 0;
-  margin: 0;
+    width: 8em;
+    padding: 0;
+    margin: 0;
 }
-
 #sidebar-left, #sidebar-right {
-  width: 260px;
-  /* padding in px not ex because IE messes up 100% width tables otherwise */
-  padding: 15px 5px 75px 10px;
-  vertical-align: top;
+    width: 260px;
+    /* padding in px not ex because IE messes up 100% width tables otherwise */
+    padding: 15px 5px 75px 10px;
+    vertical-align: top;
 }
 #sidebar-left li, #sidebar-right li {
-  font-size: 1em;
+    font-size: 1em;
 }
 .sidebar-title {
-  margin: 5px 0px 0px 0px;
-  padding: 1px 5px 1px 30px;
-  font-size: 1.2em;
-  font-weight: 700;
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
-  color: #000;
-  background-color: #eee;
-  font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
+    margin: 5px 0px 0px 0px;
+    padding: 1px 5px 1px 30px;
+    font-size: 1.2em;
+    font-weight: 700;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    color: #000;
+    background-color: #eee;
+    font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif;
 }
 #content {
-  table-layout:fixed;
+    table-layout:fixed;
 }
 .block h2 {
-  margin: 5px 0px 0px 0px;
-  padding: 1px 5px 1px 30px;
-  font-size: 1.2em;
-  font-weight: 700;
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
-  color: #000;
-  background-color: #eee;
-} 
-
+    margin: 5px 0px 0px 0px;
+    padding: 1px 5px 1px 30px;
+    font-size: 1.2em;
+    font-weight: 700;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;color: #000;
+    background-color: #eee;
+}
 .block .content {
-  border-bottom-right-radius: 5px;
-  border-bottom-left-radius: 5px;
-  margin-bottom: 10px;
-  background-color: #fff;
-  border: 1px solid #eee;
+    border-bottom-right-radius: 5px;
+    border-bottom-left-radius: 5px;
+    margin-bottom: 10px;background-color: #fff;
+    border: 1px solid #eee;
 }
-
 #main {
-  padding-left: 10px;
-  padding-right: 10px;
-  padding-bottom: 10px;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-bottom: 10px;
 }
-
 .content {
-  padding-top: 0px;
+    padding-top: 0px;
 }
-
 #footer-menu td {
-  padding-top: 3px;
+    padding-top: 3px;
 }
-
 .footer {
-  text-align: center;
-  margin-top: 3pt;
-  margin-bottom: 3pt;
-  font-size: 85%;
+    text-align: center;
+    margin-top: 3pt;
+    margin-bottom: 3pt;
+    font-size: 85%;
 }
-
 table.tableblock {
     border-collapse: collapse;
     width: 90%;
@@ -260,28 +243,23 @@ table.tableblock {
     margin-top: 10px;
     margin-bottom: 10px;
 }
-
 table.tableblock thead {
-	background-color: #DEE4CD;
-	border: 1px solid #7A9437;
+    background-color: #DEE4CD;
+    border: 1px solid #7A9437;
 }
-
 table.tableblock th {
-	font-family: monospace;
-	border: 1px solid #7A9437;
-	padding: 5px;
+    font-family: monospace;
+    border: 1px solid #7A9437;
+    padding: 5px;
 }
-
 table.tableblock tbody {
     background-color: #FFFFFF;
     border: 1px solid #7A9437;
 }
-
 table.tableblock td {
     border: 1px dotted #7A9437;
     padding: 5px;
 }
-
 table.tableblock td p:last-child {
     margin: 0px;
 }
@@ -291,7 +269,6 @@ table.tableblock .halign-center {
 table.tableblock .valign-middle {
     vertical-align: middle;
 }
-
 .note {
     padding: 15px;
     border-style:solid;
@@ -300,15 +277,12 @@ table.tableblock .valign-middle {
     background-color: #FCFCCA;
     margin: 10px;
 }
-
 .note .title {
-	display:none;
+    display:none;
 }
-
 .warning:before {
     content: url(../images/warning.svg)
 }
-
 .warning {
     border-style:solid;
     border-width:1px;
@@ -316,49 +290,37 @@ table.tableblock .valign-middle {
     background-color: #FCFCCA;
     margin: 10px;
 }
-
 .warning .title {
-	display:none;
+    display:none;
 }
-
-
 #treemenu {
     padding-left: 10px;
 }
-
-.treeview ul{
+.treeview ul {
     margin: 0;
     padding: 0;
 }
-
-.treeview li{
+.treeview li {
     background: white url(../images/bullet.gif) no-repeat left center;
     list-style-type: none;
     padding-left: 22px;
     margin-bottom: 3px;
 }
-
 .treeview li.submenu {
     background: white url(../images/closed.gif) no-repeat left 1px;
 }
-
 .treeview .hitarea {
     cursor: pointer;
 }
-
 .treeview li.collapsable, .treeview li.open {
     background: white url(../images/open.gif) no-repeat left 1px;
 }
-
-
 .treeview ul.closed {
     display: none;
 }
-
-.treeview .submenu ul li{
+.treeview .submenu ul li {
     cursor: default;
 }
-
 #book #title {
     margin: 15px;
     padding: 10px;

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/terminology.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/terminology.adoc b/asciidoc/terminology.adoc
index 49d94de..f5cee6f 100644
--- a/asciidoc/terminology.adoc
+++ b/asciidoc/terminology.adoc
@@ -92,7 +92,7 @@ An artifact is _a single file_ ready for delivery with the publication of a modu
 
 Compressed package formats are often preferred because they are easier to manage, transfer and store. For the same reasons, only one or a few artifacts per module are commonly used. However, artifacts can be of any file type and any number of them can be declared in a single module.
 
-In the Java world, common artifacts are Java archives or JAR files. In many cases, each revision of a module publishes only one artifact (like jakarta-log4j-1.2.6.tar.gz, for instance), but some of them publish many artifacts dependending on the use of the module (like apache-ant binary and source distributions in zip, gz and bz2 package formats, for instance).
+In the Java world, common artifacts are Java archives or JAR files. In many cases, each revision of a module publishes only one artifact (like jakarta-log4j-1.2.6.tar.gz, for instance), but some of them publish many artifacts depending on the use of the module (like apache-ant binary and source distributions in zip, gz and bz2 package formats, for instance).
 
 __Examples: ant-1.7.0-bin.zip, apache-ant-1.7.0-src.tar.gz __
 
@@ -141,20 +141,20 @@ A module's status indicates how stable a module revision can be considered. It c
 Three statuses are defined by default in Ivy:
 
 
-* *integration*: revisions builded by a continuous build, a nightly build, and so on, fall in this category +
+* *integration*: revisions built by a continuous build, a nightly build, and so on, fall in this category +
 
 * *milestone*: revisions delivered to the public but not actually finished fall in this category +
 
 * *release*: a revision fully tested and labelled fall in this category +
 
-*__Since 1.4__* This list is link:configuration/statuses.html[configurable] in your settings file.
+*__Since 1.4__* This list is link:settings/statuses.html[configurable] in your settings file.
 
 == [[configurations]]Configurations of a module
 
 A _module configuration_ is a way to use or construct a module. If the same module has different dependencies based on how it's used, those distinct dependency-sets are called its configurations in Ivy.
 
 Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server).
-Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those different ways to use or build a module are called module configurations in ivy. 
+Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those different ways to use or build a module are called module configurations in ivy.
 
 For more details on configurations and how they are used in ivy, please refer to the link:concept.html[main concepts page].
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b02336b7/asciidoc/textual.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/textual.adoc b/asciidoc/textual.adoc
index 5b1bd83..f9144ae 100644
--- a/asciidoc/textual.adoc
+++ b/asciidoc/textual.adoc
@@ -103,7 +103,7 @@ module C revision 2.5 depends on module D with the version constraint [1.0,1.6].
 
 
 
-As you can see, using text conventions is much more concise. 
+As you can see, using text conventions is much more concise.
 
 Another benefit is that these conventions are usually used in Ivy console output, and can also be used in some cases to be parsed into Ivy objects (we use it for test cases for instance). To make sure text parsing works fine, we recommend using only a limited range of characters for each attributes of your module identifiers.
 
@@ -130,4 +130,3 @@ Here is the recommended characters set for each attribute:
 
 * type +
  a-z A-Z 0-9 - / . _ + =
-


Mime
View raw message