ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaiki...@apache.org
Subject svn commit: r1808031 [12/25] - in /ant/site/ivy/production/history/master: ./ dev/ ivyfile/ js/ osgi/ resolver/ samples/ samples/eclipse-plugin/ samples/standard-osgi/ settings/ settings/caches/ settings/macrodef/ settings/namespace/ tutorial/ tutorial...
Date Mon, 11 Sep 2017 14:27:23 GMT
Modified: ant/site/ivy/production/history/master/settings/caches/cache.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/settings/caches/cache.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/settings/caches/cache.html (original)
+++ ant/site/ivy/production/history/master/settings/caches/cache.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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 L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>cache | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../../style/style.css" /><script src="../../js/jquery.pack.js" type="text/javascript"></script><script src="../../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">     <a href="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="sett
 ings.html" class="current">Settings Files</a> &gt; <a href="../settings/caches.html" class="current">caches</a> &gt; <a href="../../settings/caches/cache.html" class="current">cache</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">     <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="sett
 ings.html" class="current">Settings Files</a> &gt; <a href="../settings/caches.html" class="current">caches</a> &gt; <a href="../../settings/caches/cache.html" class="current">cache</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../../use/var.html">var</a></li>
 </ul>
@@ -225,7 +224,7 @@ hljs.initHighlightingOnLoad();</script><
 <p>The default repository cache implementation caches files on the local filesystem in subdirectories of a configured base directory.</p>
 </div>
 <div class="paragraph">
-<p>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.</p>
+<p>By default also, the parsed module descriptors 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 built using the same Ivy instance. The size of this memory cache is configurable in terms of number of module descriptors. A size of 0 means no memory caching.</p>
 </div>
 </div>
 </div>
@@ -258,8 +257,8 @@ hljs.initHighlightingOnLoad();</script><
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ivyPattern</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the pattern to use to store cached ivy files</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to default cache ivy pattern as configured in <a href="../../settings/caches.html">caches</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the pattern to use to store cached Ivy files</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to default cache Ivy pattern as configured in <a href="../../settings/caches.html">caches</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">artifactPattern</p></td>
@@ -269,7 +268,7 @@ hljs.initHighlightingOnLoad();</script><
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">useOrigin</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">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.</p></td>
+To know if an artifact is local, Ivy asks 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.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No. defaults to the default value configured in <a href="../../settings/caches.html">caches</a></p></td>
 </tr>
 <tr>
@@ -336,7 +335,7 @@ To know if an artifact is local ivy asks
 </div>
 </div>
 <div class="paragraph">
-<p>Defines a cache called <code>mycache</code>, storing files in the <code>/path/to/mycache</code> directory using <code>[module]/ivy-[revision].xml</code> as pattern to store Ivy files and <code>[module]/[artifact]-[revision].[ext]</code> as pattern to store other artifacts. The lock strategy used by this cache is the <code>no-lock</code> 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 <code>latest.integration</code> revisions will be stored and used for 200ms, while other dynamic revisions from <code>org1</code> <code>org2</code> and <code>org3</code> modules will be stored respectively for 10 minutes 20 seconds; 5 hours; and 2 days and 12 hours.</p>
+<p>Defines a cache called <code>mycache</code>, storing files in the <code>/path/to/mycache</code> directory using <code>[module]/ivy-[revision].xml</code> as a pattern to store Ivy files and <code>[module]/[artifact]-[revision].[ext]</code> as a pattern to store other artifacts. The lock strategy used by this cache is the <code>no-lock</code> strategy, which does not perform any locking. The defaultTTL used is 1 s, meaning that by default dynamic revision result will be stored and used for one second. TTL rules then define that all <code>latest.integration</code> revisions will be stored and used for 200 ms, while other dynamic revisions from <code>org1</code> <code>org2</code> and <code>org3</code> modules will be stored respectively for 10 minutes 20 seconds; 5 hours; and 2 days and 12 hours.</p>
 </div>
 </div>
 </div></div></div></td></tr></table><table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="center" valign="middle"><div class="primary-links">::<a href="index.html">Home</a>::<a href="reference.html">Reference</a>::<a href="tutorial.html">Tutorials</a>::<a href="dev.html">Developer's doc</a>::</div></td></tr></table><div id="footer-message" class="footer"><hr /><i>Copyright &#169; 2007 - 2017 The Apache Software Foundation, Licensed under the<a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a>.</i><br /><i>Apache Ivy, Apache Ant, Ivy, Ant, Apache, the Apache Ivy logo, the Apache Ant logo and the Apache feather logo are trademarks of The Apache Software Foundation.</i><br /><i>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</i></div></div></body></html>
\ No newline at end of file

Modified: ant/site/ivy/production/history/master/settings/caches/ttl.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/settings/caches/ttl.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/settings/caches/ttl.html (original)
+++ ant/site/ivy/production/history/master/settings/caches/ttl.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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 L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>ttl | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../../style/style.css" /><script src="../../js/jquery.pack.js" type="text/javascript"></script><script src="../../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">      <a href="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="set
 tings.html" class="current">Settings Files</a> &gt; <a href="../settings/caches.html" class="current">caches</a> &gt; <a href="../../settings/caches/cache.html" class="current">cache</a> &gt; <a href="../../settings/caches/ttl.html" class="current">ttl</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">      <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="set
 tings.html" class="current">Settings Files</a> &gt; <a href="../settings/caches.html" class="current">caches</a> &gt; <a href="../../settings/caches/cache.html" class="current">cache</a> &gt; <a href="../../settings/caches/ttl.html" class="current">ttl</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../../use/var.html">var</a></li>
 </ul>
@@ -225,7 +224,7 @@ hljs.initHighlightingOnLoad();</script><
 <p>When Ivy resolves a dynamic version constraint (like <code>latest.integration</code> or a version range), it can store the result of the resolution (like <code>latest.integration=1.5.1</code>) 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 <a href="../../use/resolve.html">resolve</a> in refresh mode.</p>
 </div>
 <div class="paragraph">
-<p>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, &#8230;&#8203;). The revision considered in the rule is the revision before the resolution (for instance <code>latest.integration</code>) and not the resolved revision (for instance <code>1.5.1</code>).</p>
+<p>This tag lets 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, &#8230;&#8203;). The revision considered in the rule is the revision before the resolution (for instance, <code>latest.integration</code>) and not the resolved revision (for instance, <code>1.5.1</code>).</p>
 </div>
 <div class="paragraph">
 <p>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.</p>
@@ -278,7 +277,7 @@ hljs.initHighlightingOnLoad();</script><
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">revision</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the module&#8217;s revision to match to apply the rule. Note that the version is not resolved when evaluating the rule ('latest.integration' for instance).</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the module&#8217;s revision to match to apply the rule. Note that the version is not resolved when evaluating the rule ('latest.integration', for instance).</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to *</p></td>
 </tr>
 <tr>

Modified: ant/site/ivy/production/history/master/settings/classpath.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/settings/classpath.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/settings/classpath.html (original)
+++ ant/site/ivy/production/history/master/settings/classpath.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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 L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>classpath | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/classpath.html" class="current">classpath</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/classpath.html" class="current">classpath</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>
@@ -219,7 +218,7 @@ hljs.initHighlightingOnLoad();</script><
 <p>Includes a jar in the classpath used to load plugins. <strong><em>since 1.4</em></strong></p>
 </div>
 <div class="paragraph">
-<p>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, &#8230;&#8203;).</p>
+<p>This lets 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, &#8230;&#8203;).</p>
 </div>
 </div>
 </div>

Modified: ant/site/ivy/production/history/master/settings/conflict-managers.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/settings/conflict-managers.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/settings/conflict-managers.html (original)
+++ ant/site/ivy/production/history/master/settings/conflict-managers.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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 L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>conflict-managers | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/conflict-managers.html" class="current">conflict-managers</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/conflict-managers.html" class="current">conflict-managers</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>
@@ -216,17 +215,17 @@ hljs.initHighlightingOnLoad();</script><
 <p><strong>Tag:</strong> conflict-managers</p>
 </div>
 <div class="paragraph">
-<p>Defines a list of <a href="../concept.html#conflict">conflicts managers</a> usable in Ivy. Each conflict manager is identified by its name, given as an attribute.
+<p>Defines a list of <a href="../concept.html#conflict">conflict managers</a> usable in Ivy. 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 <code>typedef</code> tag).</p>
 </div>
 <div class="paragraph">
-<p>Here is a list of built-in conflicts managers (which do not require anything in the configuration file):</p>
+<p>Here is a list of built-in conflict managers (which do not require anything in the settings file):</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
 <p>all<br/>
-this conflicts manager resolve conflicts by selecting all revisions. Also called the <code>NoConflictManager</code>, it doesn&#8217;t evict any modules.</p>
+this conflict manager resolve conflicts by selecting all revisions. Also called the <code>NoConflictManager</code>, it doesn&#8217;t evict any modules.</p>
 </li>
 <li>
 <p>latest-time<br/>
@@ -248,7 +247,7 @@ this conflict manager throws an exceptio
 </div>
 <div class="paragraph">
 <p>The two "latest" conflict managers also take into account the force attribute of the dependencies.
-In fact 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.</p>
+In fact, 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.</p>
 </div>
 <div class="paragraph">
 <p>Here is a list of conflict manager types available, which can be used to define your own custom conflict managers:</p>
@@ -283,7 +282,7 @@ The latest compatible conflict manager u
 <ul>
 <li>
 <p>regexp-cm<br/>
-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 <code>(.*)\.\d</code>, because the matching group will match different strings (1.2 and 1.3). 1.2.1 and 1.2.2 won&#8217;t throw an exception with the same regular expression. The regular expression is set using the <code>regexp</code> attribute. A <code>ignoreNonMatching</code> 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.</p>
+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 <code>(.*)\.\d</code>, because the matching group will match different strings (1.2 and 1.3). 1.2.1 and 1.2.2 won&#8217;t throw an exception with the same regular expression. The regular expression is set using the <code>regexp</code> attribute. A <code>ignoreNonMatching</code> 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.</p>
 </li>
 </ul>
 </div>

Modified: ant/site/ivy/production/history/master/settings/credentials.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/settings/credentials.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/settings/credentials.html (original)
+++ ant/site/ivy/production/history/master/settings/credentials.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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 L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>credentials | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/credentials.html" class="current">credentials</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/credentials.html" class="current">credentials</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>

Modified: ant/site/ivy/production/history/master/settings/include.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/settings/include.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/settings/include.html (original)
+++ ant/site/ivy/production/history/master/settings/include.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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 L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>include | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/include.html" class="current">include</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/include.html" class="current">include</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>
@@ -216,10 +215,10 @@ hljs.initHighlightingOnLoad();</script><
 <p><strong>Tag:</strong> include</p>
 </div>
 <div class="paragraph">
-<p>Includes another ivysettings file as if it were part of this one. <strong><em>since 1.3</em></strong></p>
+<p>Includes another Ivy settings file as if it were part of this one. <strong><em>since 1.3</em></strong></p>
 </div>
 <div class="paragraph">
-<p>The included ivysettings file has to be a complete well formed ivysettings file, i.e. it does have to include the <code>&lt;ivysettings&gt;</code> tag.</p>
+<p>The included Ivy settings file has to be a complete well formed Ivy settings file, i.e. it does have to include the <code>&lt;ivysettings&gt;</code> tag.</p>
 </div>
 </div>
 </div>
@@ -242,12 +241,12 @@ hljs.initHighlightingOnLoad();</script><
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">url</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">a URL to the ivysettings file to include</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">a URL to the Ivy settings file to include</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Yes, unless file is specified</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">file</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">a path to the ivysettings file to include</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">a path to the Ivy settings file to include</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Yes, unless url is specified</p></td>
 </tr>
 <tr>
@@ -285,7 +284,7 @@ hljs.initHighlightingOnLoad();</script><
 </div>
 </div>
 <div class="paragraph">
-<p>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 <code>path/to/rep</code> 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 <code>path/to/my/real/rep</code>.</p>
+<p>The included Ivy settings 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 <code>path/to/rep</code> in the included file, but because the attribute overwrite is set to false, it will not override the value given in the main Ivy settings including this one, so the value used for myrepository will be <code>path/to/my/real/rep</code>.</p>
 </div>
 <hr/>
 <div class="listingblock">
@@ -299,7 +298,7 @@ hljs.initHighlightingOnLoad();</script><
 </div>
 </div>
 <div class="paragraph">
-<p>with ivysettings-macro.xml being the ivysettings example given on the <a href="../settings/macrodef.html">macrodef documentation page</a>.
+<p>with ivysettings-macro.xml being the Ivy settings example given on the <a href="../settings/macrodef.html">macrodef documentation page</a>.
 This lets us easily reuse the custom macro resolver.</p>
 </div>
 </div>

Modified: ant/site/ivy/production/history/master/settings/latest-strategies.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/settings/latest-strategies.html?rev=1808031&r1=1808030&r2=1808031&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/settings/latest-strategies.html (original)
+++ ant/site/ivy/production/history/master/settings/latest-strategies.html Mon Sep 11 14:27:20 2017
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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 L
 icense.--><html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><meta name="generator" content="Asciidoctor 1.5.4" /><title>latest-strategies | Apache Ivy&#153; Documentation</title><link rel="stylesheet" type="text/css" href="../style/style.css" /><script src="../js/jquery.pack.js" type="text/javascript"></script><script src="../js/jquery.treeview.js" type="text/javascript"></script><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" /><script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" type="text/javascript"></script><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});
-hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170725163541)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/latest-strategies.html" class="current">latest-strategies</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
-<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170725163541)</a><ul class="open"><ul id="treemenu" class="treeview">
+hljs.initHighlightingOnLoad();</script></head><body><div id="body"><table id="header" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="home" width="30%"><a href="http://ant.apache.org/" title="Apache Ant"><img src="../images/ant-project-logo.svg" alt="Apache Ant" border="0" height="80px" /></a></td><td class="product" width="70%" align="right" valign="middle"><img src="../images/logo.png" alt="ivy" border="0" /></td></tr></table><table id="top-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td><div id="navcontainer"> <a href="http://www.apache.org/">Apache&#153;</a> &gt; <a href="http://ant.apache.org/">Apache Ant&#153;</a> &gt; <a href="http://ant.apache.org/ivy/">Apache Ivy&#153;</a> &gt;<span class="breadCrumb">    <a href="index.html" class="current">Documentation (2.5.0-local-20170911195251)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="settings.ht
 ml" class="current">Settings Files</a> &gt; <a href="../settings/latest-strategies.html" class="current">latest-strategies</a></span></div></td></tr></table><table id="content" border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td id="sidebar-left"><div class="block block-book" id="block-book-0"><div class="sidebar-title">Apache Ivy&#153;</div><div class="content"><ul id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation (2.5.0-local-20170911195251)</a><ul class="open"><ul id="treemenu" class="treeview">
 <li id="xooki-release-notes"><a href="../release-notes.html">Release Notes</a></li>
 <li id="xooki-tutorial" class="submenu"><a href="../tutorial.html">Tutorials</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-tutorial/start"><a href="../tutorial/start.html">Quick Start</a></li>
@@ -69,15 +69,15 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-settings/resolvers" class="submenu"><a href="../settings/resolvers.html">resolvers</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-resolver/ivyrep"><a href="../resolver/ivyrep.html">IvyRep Resolver</a></li>
 <li id="xooki-resolver/ibiblio"><a href="../resolver/ibiblio.html">IBiblio Resolver</a></li>
-<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager resolver</a></li>
-<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System resolver</a></li>
-<li id="xooki-resolver/url"><a href="../resolver/url.html">Url Resolver</a></li>
+<li id="xooki-resolver/packager"><a href="../resolver/packager.html">Packager Resolver</a></li>
+<li id="xooki-resolver/filesystem"><a href="../resolver/filesystem.html">File System Resolver</a></li>
+<li id="xooki-resolver/url"><a href="../resolver/url.html">URL Resolver</a></li>
 <li id="xooki-resolver/chain"><a href="../resolver/chain.html">Chain Resolver</a></li>
-<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual resolver</a></li>
-<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">sftp resolver</a></li>
-<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">ssh resolver</a></li>
-<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">vfs resolver</a></li>
-<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar resolver</a></li>
+<li id="xooki-resolver/dual"><a href="../resolver/dual.html">Dual Resolver</a></li>
+<li id="xooki-resolver/sftp"><a href="../resolver/sftp.html">SFTP Resolver</a></li>
+<li id="xooki-resolver/ssh"><a href="../resolver/ssh.html">SSH Resolver</a></li>
+<li id="xooki-resolver/vfs"><a href="../resolver/vfs.html">VFS Resolver</a></li>
+<li id="xooki-resolver/jar"><a href="../resolver/jar.html">Jar Resolver</a></li>
 <li id="xooki-resolver/obr"><a href="../resolver/obr.html">OSGi Bundle Repository</a></li>
 <li id="xooki-resolver/osgiagg"><a href="../resolver/osgiagg.html">Aggregated OSGi Repository</a></li>
 <li id="xooki-resolver/updatesite"><a href="../resolver/updatesite.html">Eclipse updatesite</a></li>
@@ -91,7 +91,6 @@ hljs.initHighlightingOnLoad();</script><
 </ul>
 </ul></li>
 <li id="xooki-settings/outputters"><a href="../settings/outputters.html">outputters</a></li>
-<li id="xooki-settings/signers"><a href="../settings/signers.html">signers</a></li>
 <li id="xooki-settings/statuses" class="submenu"><a href="../settings/statuses.html">statuses</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-settings/status"><a href="../settings/status.html">status</a></li>
 </ul>
@@ -179,14 +178,14 @@ hljs.initHighlightingOnLoad();</script><
 <li id="xooki-use/makepom"><a href="../use/makepom.html">makepom</a></li>
 <li id="xooki-use/postresolvetask"><a href="../use/postresolvetask.html">post resolve tasks</a></li>
 <li id="xooki-use/publish"><a href="../use/publish.html">publish</a></li>
-<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
-<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
-<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
-<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/report" class="submenu"><a href="../use/report.html">report</a><ul class="closed"><ul id="treemenu" class="treeview">
 <li id="xooki-yed"><a href="../yed.html">Using yEd to layout report graphs</a></li>
 </ul>
 </ul></li>
+<li id="xooki-use/repreport"><a href="../use/repreport.html">repreport</a></li>
+<li id="xooki-use/resolve"><a href="../use/resolve.html">resolve</a></li>
+<li id="xooki-use/resources"><a href="../use/resources.html">resources</a></li>
+<li id="xooki-use/retrieve"><a href="../use/retrieve.html">retrieve</a></li>
 <li id="xooki-use/settings"><a href="../use/settings.html">settings</a></li>
 <li id="xooki-use/var"><a href="../use/var.html">var</a></li>
 </ul>
@@ -228,16 +227,16 @@ hljs.initHighlightingOnLoad();</script><
 <ul>
 <li>
 <p>latest-time<br/>
-compares the revisions date to know which is the latest. While this is often a good strategy in terms of pertinence, it&#8217;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.</p>
+compares the revision dates to know which is the latest. While this is often a good strategy in terms of pertinence, its 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.</p>
 </li>
 <li>
 <p>latest-revision<br/>
- compares the revisions as strings, using an algorithm close to the one used in php&#8217;s version_compare function.
+ compares the revisions as strings, using an algorithm close to the one used in PHP <code>version_compare</code> function.
 This algorithm takes into account the special meaning of some text. For instance, with this strategy, <code>1.0-dev1</code> is considered before <code>1.0-alpha1</code>, which in turn is before <code>1.0-rc1</code>, which is before <code>1.0</code>, which is before <code>1.0.1</code>.</p>
 </li>
 <li>
 <p>latest-lexico<br/>
-compares the revisions as strings, using lexicographic order (the one used by java string comparison).</p>
+compares the revisions as strings using lexicographic order (the one used by Java string comparison).</p>
 </li>
 </ul>
 </div>
@@ -273,7 +272,7 @@ compares the revisions as strings, using
 <h2 id="_latest_revision">latest-revision</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p><strong><em>since 1.4</em></strong> The latest-revision can now be configured to handle more words with special meanings than the one defined in php version_compare function.</p>
+<p><strong><em>since 1.4</em></strong> The latest-revision can now be configured to handle more words with special meanings than the one defined in PHP <code>version_compare</code> function.</p>
 </div>
 <div class="paragraph">
 <p>Here is an example of how you can do so:</p>



Mime
View raw message