Modified: ant/site/ivy/production/history/master/ivyfile/artifact-exclude.html
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/artifact-exclude.html?rev=1829791&r1=1829790&r2=1829791&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/artifact-exclude.html 
(original)
+++ ant/site/ivy/production/history/master/ivyfile/artifact-exclude.html Sun 
Apr 22 17:19:39 2018
@@ -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>exclude | 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-20170911195251)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivyfile.h
 tml" class="current">Ivy Files</a> &gt; <a href="../ivyfile/dependencies.html" 
class="current">dependencies</a> &gt; <a href="../ivyfile/dependency.html" 
class="current">dependency</a> &gt; <a href="../ivyfile/artifact-exclude.html" 
class="current">exclude</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">
+<!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>exclude | Apache Ivy&trade; 
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&trade;</a> &gt; <a 
href="http://ant.apache.org/";>Apache Ant&trade;</a> &gt; <a 
href="http://ant.apache.org/ivy/";>Apache Ivy&trade;</a> &gt;<span 
class="breadCrumb">      <a href="index.html" class="current">Documentation 
(2.5.0-rc2-local-20180419193918)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="iv
 yfile.html" class="current">Ivy Files</a> &gt; <a 
href="../ivyfile/dependencies.html" class="current">dependencies</a> &gt; <a 
href="../ivyfile/dependency.html" class="current">dependency</a> &gt; <a 
href="../ivyfile/artifact-exclude.html" 
class="current">exclude</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&trade;</div><div class="content"><ul 
id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation 
(2.5.0-rc2-local-20180419193918)</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>
@@ -223,7 +223,7 @@ It enables to restrict the artifacts req
 <p>Note that exclusion is always done AFTER inclusion has been done.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 1.3</em></strong> This exclude feature can also be used 
not only to exclude artifacts but also to exclude whole modules. Indeed when 
you exclude artifacts, it doesn&#8217;t prevent Ivy from searching for the 
module itself, and resolving the dependencies of the module. But you can also 
exclude the entire module, which means that the module will not be downloaded 
at all, and so its own dependencies will not be resolved. For sure, this is 
usually done to exclude not a direct dependency but an indirect one. To exclude 
a whole module, you just have to not specify any artifact name, type and ext in 
your exclude rule. For instance:</p>
+<p>(<strong><em>since 1.3</em></strong>) This exclude feature can also be used 
not only to exclude artifacts but also to exclude whole modules. Indeed when 
you exclude artifacts, it doesn&#8217;t prevent Ivy from searching for the 
module itself, and resolving the dependencies of the module. But you can also 
exclude the entire module, which means that the module will not be downloaded 
at all, and so its own dependencies will not be resolved. For sure, this is 
usually done to exclude not a direct dependency but an indirect one. To exclude 
a whole module, you just have to not specify any artifact name, type and ext in 
your exclude rule. For instance:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -233,7 +233,7 @@ It enables to restrict the artifacts req
 </div>
 </div>
 <div class="paragraph">
-<p><strong><em>since 2.0</em></strong> A <a 
href="../ivyfile/exclude.html">module wide exclude</a> can also be used to 
exclude dependencies for the whole module (and not only in the context of one 
dependency as it is the case here).</p>
+<p>(<strong><em>since 2.0</em></strong>) A <a 
href="../ivyfile/exclude.html">module wide exclude</a> can also be used to 
exclude dependencies for the whole module (and not only in the context of one 
dependency as it is the case here).</p>
 </div>
 <div class="sect1">
 <h2 id="_attributes">Attributes</h2>
@@ -254,12 +254,12 @@ It enables to restrict the artifacts req
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">org</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the 
organisation of the dependency module or artifact to exclude, or a regexp 
matching this organisation <strong><em>since 1.3</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the 
organisation of the dependency module or artifact to exclude, or a regexp 
matching this organisation (<strong><em>since 1.3</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to <code>*</code></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">module</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the name 
of the dependency module or the artifact to exclude, or a regexp matching this 
module name <strong><em>since 1.3</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the name 
of the dependency module or the artifact to exclude, or a regexp matching this 
module name (<strong><em>since 1.3</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to <code>*</code></p></td>
 </tr>
 <tr>
@@ -279,7 +279,7 @@ It enables to restrict the artifacts req
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">matcher</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the <a 
href="../concept.html#matcher">matcher</a> to use to match the modules to 
excludes <strong><em>since 1.3</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the <a 
href="../concept.html#matcher">matcher</a> to use to match the modules to 
excludes (<strong><em>since 1.3</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to <code>exactOrRegexp</code> in pre 1.3 Ivy files, and 
<code>exact</code> in 1.3 and superior</p></td>
 </tr>
 <tr>
@@ -317,4 +317,4 @@ It enables to restrict the artifacts req
 </tbody>
 </table>
 </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
+</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 &copy; 2007 - 2018 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/ivyfile/artifact.html
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/artifact.html?rev=1829791&r1=1829790&r2=1829791&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/artifact.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/artifact.html Sun Apr 22 
17:19:39 2018
@@ -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>artifact | 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-20170911195251)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivyfile.ht
 ml" class="current">Ivy Files</a> &gt; <a href="../ivyfile/publications.html" 
class="current">publications</a> &gt; <a href="../ivyfile/artifact.html" 
class="current">artifact</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">
+<!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>artifact | Apache Ivy&trade; 
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&trade;</a> &gt; <a 
href="http://ant.apache.org/";>Apache Ant&trade;</a> &gt; <a 
href="http://ant.apache.org/ivy/";>Apache Ivy&trade;</a> &gt;<span 
class="breadCrumb">     <a href="index.html" class="current">Documentation 
(2.5.0-rc2-local-20180419193918)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivy
 file.html" class="current">Ivy Files</a> &gt; <a 
href="../ivyfile/publications.html" class="current">publications</a> &gt; <a 
href="../ivyfile/artifact.html" 
class="current">artifact</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&trade;</div><div class="content"><ul 
id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation 
(2.5.0-rc2-local-20180419193918)</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>
@@ -232,7 +232,10 @@ hljs.initHighlightingOnLoad();</script><
 <p>The two are equivalent, it is only a matter of preference. However, do not 
mix both for one artifact.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 1.4</em></strong> The artifact element has default values 
for all its attributes, so if you want to declare a default artifact you can 
just declare it like that:</p>
+<p>[<strong><em>since 1.4</em></strong>]</p>
+</div>
+<div class="paragraph">
+<p>The artifact element has default values for all its attributes, so if you 
want to declare a default artifact you can just declare it like that:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -243,13 +246,13 @@ hljs.initHighlightingOnLoad();</script><
 <p>If this is the only artifact declared, then it&#8217;s equivalent to having 
no publication section at all.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 1.4</em></strong> It is possible to give an 
<code>url</code> at which artifacts can be found. This is not mandatory, and 
even not recommended. This is only a convenient way to deal with an existing 
repository with a bad layout, but should not be avoided in an enterprise 
repository.</p>
+<p>It is possible to give an <code>url</code> at which artifacts can be found. 
This is not mandatory, and even not recommended. This is only a convenient way 
to deal with an existing repository with a bad layout, but should not be 
avoided in an enterprise repository.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 1.4</em></strong> This tag supports <a 
href="../concept.html#extra">extra attributes</a>.</p>
+<p>This tag supports <a href="../concept.html#extra">extra attributes</a>.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 2.4</em></strong> This tag supports the 'packaging' 
attributes; complete documentation can be found in the <a 
href="../concept.html#packaging">concept page</a>.</p>
+<p>(<strong><em>since 2.4</em></strong>) This tag supports the 'packaging' 
attributes; complete documentation can be found in the <a 
href="../concept.html#packaging">concept page</a>.</p>
 </div>
 <div class="sect1">
 <h2 id="_attributes">Attributes</h2>
@@ -291,12 +294,12 @@ hljs.initHighlightingOnLoad();</script><
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">url</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">an URL at 
which this artifact can be found if it isn&#8217;t located at the standard 
location in the repository <strong><em>since 1.4</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">an URL at 
which this artifact can be found if it isn&#8217;t located at the standard 
location in the repository (<strong><em>since 1.4</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to no URL</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">packaging</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">a comma 
separated list of <a href="../concept.html#packaging">packaging</a> types 
<strong><em>since 2.4</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">a comma 
separated list of <a href="../concept.html#packaging">packaging</a> types 
(<strong><em>since 2.4</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to no packaging</p></td>
 </tr>
 </tbody>
@@ -359,4 +362,4 @@ hljs.initHighlightingOnLoad();</script><
 <p>Declares an artifact <code>foo</code>, of type and extension 
<code>jar'</code> located at the URL 
<code>http://www.acme.com/repository/barbaz/foo-1.2-bar.jar</code>. This URL 
will only be used if the artifact cannot be found at its standard location.</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
+</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 &copy; 2007 - 2018 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/ivyfile/conf.html
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/conf.html?rev=1829791&r1=1829790&r2=1829791&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/conf.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/conf.html Sun Apr 22 
17:19:39 2018
@@ -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>conf | 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-20170911195251)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivyfile.ht
 ml" class="current">Ivy Files</a> &gt; <a 
href="../ivyfile/configurations.html" class="current">configurations</a> &gt; 
<a href="../ivyfile/conf.html" 
class="current">conf</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">
+<!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>conf | Apache Ivy&trade; 
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&trade;</a> &gt; <a 
href="http://ant.apache.org/";>Apache Ant&trade;</a> &gt; <a 
href="http://ant.apache.org/ivy/";>Apache Ivy&trade;</a> &gt;<span 
class="breadCrumb">     <a href="index.html" class="current">Documentation 
(2.5.0-rc2-local-20180419193918)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivy
 file.html" class="current">Ivy Files</a> &gt; <a 
href="../ivyfile/configurations.html" class="current">configurations</a> &gt; 
<a href="../ivyfile/conf.html" 
class="current">conf</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&trade;</div><div class="content"><ul 
id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation 
(2.5.0-rc2-local-20180419193918)</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>
@@ -228,7 +228,10 @@ hljs.initHighlightingOnLoad();</script><
 <p>This notion is very helpful to define configurations which are similar with 
some differences.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 1.4</em></strong> The extends attribute can use the 
following wildcards:</p>
+<p>[<strong><em>since 1.4</em></strong>]</p>
+</div>
+<div class="paragraph">
+<p>The extends attribute can use the following wildcards:</p>
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
@@ -251,11 +254,11 @@ hljs.initHighlightingOnLoad();</script><
 </tbody>
 </table>
 <div class="paragraph">
-<p><strong><em>since 1.4</em></strong> A whole configuration can be declared 
as non transitive, so that all dependencies resolved in this configuration will 
be resolved with transitivity disabled. Note that the transitivity is disabled 
for all the configuration dependencies (including those obtained because this 
conf extends other ones), and only for this configuration (which means that a 
conf extending this one with transitivity enabled will get transitive 
dependencies even for dependencies being part of the non transitive 
configuration).
+<p>A whole configuration can be declared as non transitive, so that all 
dependencies resolved in this configuration will be resolved with transitivity 
disabled. Note that the transitivity is disabled for all the configuration 
dependencies (including those obtained because this conf extends other ones), 
and only for this configuration (which means that a conf extending this one 
with transitivity enabled will get transitive dependencies even for 
dependencies being part of the non transitive configuration).
 This is very useful to build a compile configuration, for instance, forcing 
the dependency declaration on each direct dependency, with no risk to forget 
some because of transitivity.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 1.4</em></strong> This tag supports <a 
href="../concept.html#extra">extra attributes</a>.</p>
+<p>This tag supports <a href="../concept.html#extra">extra attributes</a>.</p>
 </div>
 <div class="sect1">
 <h2 id="_attributes">Attributes</h2>
@@ -297,7 +300,7 @@ This is very useful to build a compile c
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">transitive</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">a boolean 
to indicate if this conf is transitive or not <strong><em>since 
1.4</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">a boolean 
to indicate if this conf is transitive or not (<strong><em>since 
1.4</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to <code>true</code></p></td>
 </tr>
 <tr>
@@ -327,4 +330,4 @@ This is very useful to build a compile c
 <p>Therefore the <code>core</code> configuration will only be composed of 
dependencies declared in the <code>core</code> configuration itself, the 
<code>compile</code> configuration will be composed of all dependencies 
required in either <code>core</code> or <code>compile</code> configuration, but 
without transitivity (neither for core nor compile dependencies), and 
<code>runtime</code> will be composed of all dependencies, all transitively, 
including the dependencies declared only in <code>compile</code>.</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
+</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 &copy; 2007 - 2018 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/ivyfile/configurations.html
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/configurations.html?rev=1829791&r1=1829790&r2=1829791&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/configurations.html 
(original)
+++ ant/site/ivy/production/history/master/ivyfile/configurations.html Sun Apr 
22 17:19:39 2018
@@ -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>configurations | 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-20170911195251)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivyfile.htm
 l" class="current">Ivy Files</a> &gt; <a href="../ivyfile/configurations.html" 
class="current">configurations</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">
+<!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>configurations | Apache Ivy&trade; 
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&trade;</a> &gt; <a 
href="http://ant.apache.org/";>Apache Ant&trade;</a> &gt; <a 
href="http://ant.apache.org/ivy/";>Apache Ivy&trade;</a> &gt;<span 
class="breadCrumb">    <a href="index.html" class="current">Documentation 
(2.5.0-rc2-local-20180419193918)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivyf
 ile.html" class="current">Ivy Files</a> &gt; <a 
href="../ivyfile/configurations.html" 
class="current">configurations</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&trade;</div><div class="content"><ul 
id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation 
(2.5.0-rc2-local-20180419193918)</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>
@@ -216,28 +216,31 @@ hljs.initHighlightingOnLoad();</script><
 <p>A container for configuration elements. If this container is not present, 
it is assumed that the module has one public configuration called 
<code>default</code>.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 2.2</em></strong> You can define the default conf on this 
container by specifying the <code>defaultconf</code> attribute.  This attribute 
defines the conf mapping to use when no conf mapping is specified for a 
dependency in this Ivy file.</p>
+<p>(<strong><em>since 2.2</em></strong>) You can define the default conf on 
this container by specifying the <code>defaultconf</code> attribute. This 
attribute defines the conf mapping to use when no conf mapping is specified for 
a dependency in this Ivy file.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 1.3</em></strong> You can define a default conf mapping 
on this container by specifying the <code>defaultconfmapping</code> 
attribute.</p>
+<p>(<strong><em>since 1.3</em></strong>) You can define a default conf mapping 
on this container by specifying the <code>defaultconfmapping</code> 
attribute.</p>
 </div>
 <div class="paragraph">
 <p>This attribute modifies the way Ivy interprets conf mapping with no mapped 
conf. In this case, Ivy will look in the default conf mapping and use the conf 
mapping defined in the default conf mapping for the conf for which there is no 
mapped conf.</p>
 </div>
 <div class="paragraph">
-<p>In order to maintain backwards compatibility with Ivy 2.1.0 and earlier, 
the <code>defaultconfmapping</code> also provides one additional function.  If 
no <code>defaultconf</code> is specified (on either the configurations tag or 
the dependencies tag), the <code>defaultconfmapping</code> becomes the default 
configuration for dependencies in this Ivy file when no configuration is 
specified.  In other words, in addition to altering the interpretation of 
individual configurations with no mapping, <code>defaultconfmapping</code> also 
performs exactly like <code>defaultconf</code> in the absence of a definition 
for <code>defaultconf</code>.</p>
+<p>In order to maintain backwards compatibility with Ivy 2.1.0 and earlier, 
the <code>defaultconfmapping</code> also provides one additional function. If 
no <code>defaultconf</code> is specified (on either the configurations tag or 
the dependencies tag), the <code>defaultconfmapping</code> becomes the default 
configuration for dependencies in this Ivy file when no configuration is 
specified. In other words, in addition to altering the interpretation of 
individual configurations with no mapping, <code>defaultconfmapping</code> also 
performs exactly like <code>defaultconf</code> in the absence of a definition 
for <code>defaultconf</code>.</p>
 </div>
 <div class="paragraph">
-<p>If several <code>defaultconfmapping</code> or <code>defaultconf</code> 
attributes are defined (in the configurations tag, one or several in an 
included configurations file, and/or in the dependency tag, then it&#8217;s 
only the last definition of each property which is taken into account.  The 
others will have no effect at all.</p>
+<p>If several <code>defaultconfmapping</code> or <code>defaultconf</code> 
attributes are defined (in the configurations tag, one or several in an 
included configurations file, and/or in the dependencies tag, then it&#8217;s 
only the last definition of each property which is taken into account. The 
others will have no effect at all.</p>
 </div>
 <div class="paragraph">
 <p>See <a href="#defaultconfmapping">examples below</a> to clarify the 
behavior of these two attributes together.</p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 1.4</em></strong> You can activate a 
<code>confmappingoverride</code> mode for all configurations, in which case the 
extending configurations will override the mappings of the configurations they 
extend from.</p>
+<p>(<strong><em>since 1.4</em></strong>) You can activate a 
<code>confmappingoverride</code> mode for all configurations, in which case the 
extending configurations will override the mappings of the configurations they 
extend from.</p>
+</div>
+<div class="paragraph">
+<p>(<strong><em>since 2.5</em></strong>) Attributes inherited via <a 
href="extends.html"><code>extends</code></a> are added to both 
<code>configurations</code> and <code>dependencies</code> on <a 
href="../use/deliver.html">delivery</a>. If the latter element has attributes, 
their values override values of the corresponding attributes of the former 
element.</p>
 </div>
 <div class="sect1">
-<h2 id="_attributes">Attributes</h2>
+<h2 id="__a_id_attributes_a_attributes"><a id="attributes"></a>Attributes</h2>
 <div class="sectionbody">
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
@@ -255,17 +258,17 @@ hljs.initHighlightingOnLoad();</script><
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">defaultconf</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the 
default conf to use in this Ivy file <strong><em>since 
2.2</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the 
default conf to use in this Ivy file (<strong><em>since 
2.2</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to no default conf</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">defaultconfmapping</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the 
default conf mapping to use in this Ivy file <strong><em>since 
1.3</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the 
default conf mapping to use in this Ivy file (<strong><em>since 
1.3</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to no default conf mapping</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">confmappingoverride</p></td>
-<td class="tableblock halign-left valign-top"><p 
class="tableblock"><code>true</code> to activate configuration mapping 
override, <code>false</code> otherwise <strong><em>since 
1.4</em></strong></p></td>
+<td class="tableblock halign-left valign-top"><p 
class="tableblock"><code>true</code> to activate configuration mapping 
override, <code>false</code> otherwise (<strong><em>since 
1.4</em></strong>)</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, 
defaults to <code>false</code></p></td>
 </tr>
 </tbody>
@@ -290,12 +293,12 @@ hljs.initHighlightingOnLoad();</script><
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a 
href="../ivyfile/conf.html">conf</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a 
href="conf.html">conf</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">declares a 
configuration of this module</p></td>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">0..n</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a 
href="../ivyfile/include.html">include</a></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><a 
href="include.html">include</a></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">include 
configurations from another file</p></td>
 <td class="tableblock halign-left valign-top"><p 
class="tableblock">0..n</p></td>
 </tr>
@@ -354,7 +357,7 @@ hljs.initHighlightingOnLoad();</script><
 <h2 
id="_examples_involving_defaultconf_and_a_id_defaultconfmapping_a_defaultconfmapping">Examples
 involving defaultconf and <a 
id="defaultconfmapping"></a>defaultconfmapping</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>The table below indicates how Ivy interprets the conf attribute according 
to how <a href="../ivyfile/configurations.html">defaultconfmapping</a> and <a 
href="../ivyfile/configurations.html">defaultconf</a> are set:</p>
+<p>The table below indicates how Ivy interprets the conf attribute according 
to how <a href="#attributes">defaultconfmapping</a> and <a 
href="#attributes">defaultconf</a> are set:</p>
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
@@ -429,4 +432,4 @@ hljs.initHighlightingOnLoad();</script><
 </tbody>
 </table>
 </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
+</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 &copy; 2007 - 2018 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/ivyfile/conflict.html
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/conflict.html?rev=1829791&r1=1829790&r2=1829791&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/conflict.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/conflict.html Sun Apr 22 
17:19:39 2018
@@ -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 | 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-20170911195251)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivyfile.ht
 ml" class="current">Ivy Files</a> &gt; <a href="../ivyfile/dependencies.html" 
class="current">dependencies</a> &gt; <a href="../ivyfile/conflict.html" 
class="current">conflict</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">
+<!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 | Apache Ivy&trade; 
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&trade;</a> &gt; <a 
href="http://ant.apache.org/";>Apache Ant&trade;</a> &gt; <a 
href="http://ant.apache.org/ivy/";>Apache Ivy&trade;</a> &gt;<span 
class="breadCrumb">     <a href="index.html" class="current">Documentation 
(2.5.0-rc2-local-20180419193918)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivy
 file.html" class="current">Ivy Files</a> &gt; <a 
href="../ivyfile/dependencies.html" class="current">dependencies</a> &gt; <a 
href="../ivyfile/conflict.html" 
class="current">conflict</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&trade;</div><div class="content"><ul 
id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation 
(2.5.0-rc2-local-20180419193918)</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>
@@ -213,7 +213,7 @@ hljs.initHighlightingOnLoad();</script><
 <p><strong>Tag:</strong> conflict <strong>Parent:</strong> <a 
href="../ivyfile/dependencies.html">dependencies</a></p>
 </div>
 <div class="paragraph">
-<p><strong><em>(since 2.0)</em></strong></p>
+<p>[<strong><em>since 2.0</em></strong>]</p>
 </div>
 <div class="paragraph">
 <p>Specify a a conflict manager for one or several dependencies.
@@ -276,4 +276,4 @@ That&#8217;s why the order of dependenci
 </tbody>
 </table>
 </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
+</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 &copy; 2007 - 2018 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/ivyfile/conflicts.html
URL: 
http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/conflicts.html?rev=1829791&r1=1829790&r2=1829791&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/conflicts.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/conflicts.html Sun Apr 22 
17:19:39 2018
@@ -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>conflicts | 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-20170911195251)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivyfile.htm
 l" class="current">Ivy Files</a> &gt; <a href="../ivyfile/conflicts.html" 
class="current">conflicts</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">
+<!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>conflicts | Apache Ivy&trade; 
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&trade;</a> &gt; <a 
href="http://ant.apache.org/";>Apache Ant&trade;</a> &gt; <a 
href="http://ant.apache.org/ivy/";>Apache Ivy&trade;</a> &gt;<span 
class="breadCrumb">    <a href="index.html" class="current">Documentation 
(2.5.0-rc2-local-20180419193918)</a> &gt; <a href="reference.html" 
class="current">Reference</a> &gt; <a href="ivyf
 ile.html" class="current">Ivy Files</a> &gt; <a 
href="../ivyfile/conflicts.html" 
class="current">conflicts</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&trade;</div><div class="content"><ul 
id="treemenu" class="treeview">
+<li id="xooki-index" class="submenu"><a href="../index.html">Documentation 
(2.5.0-rc2-local-20180419193918)</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>
@@ -213,7 +213,7 @@ hljs.initHighlightingOnLoad();</script><
 <p><strong>Tag:</strong> conflicts <strong>Parent:</strong> <a 
href="../ivyfile.html">ivy-module</a></p>
 </div>
 <div class="paragraph">
-<p><strong><em>(since 2.0)</em></strong> the conflicts section is deprecated.  
Use <a href="../ivyfile/conflict.html">conflict</a> instead.</p>
+<p>(<strong><em>since 2.0</em></strong>) The conflicts section is deprecated.  
Use <a href="../ivyfile/conflict.html">conflict</a> instead.</p>
 </div>
 <div class="paragraph">
 <p>Container for conflict manager elements, used to indicate how conflicts 
should be resolved for this module.</p>
@@ -269,4 +269,4 @@ a lot of time.</p>
 </tbody>
 </table>
 </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
+</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 &copy; 2007 - 2018 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


Reply via email to