You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2017/06/30 16:02:41 UTC

svn commit: r1800439 [7/23] - in /ant/site/ivy/production/history/master: ./ configuration/ configuration/caches/ configuration/macrodef/ configuration/namespace/ dev/ ivyfile/ osgi/ resolver/ settings/ settings/caches/ settings/macrodef/ settings/name...

Modified: ant/site/ivy/production/history/master/ivyfile/description.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/description.html?rev=1800439&r1=1800438&r2=1800439&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/description.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/description.html Fri Jun 30 16:02:38 2017
@@ -1,5 +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>description | 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><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});</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="Nav
 igation 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-20170630155913)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="ivyfile.html" class="current">Ivy Files</a> &gt; <a href="../ivyfile/info.html" class="current">info</a> &gt; <a href="../ivyfile/description.html" class="current">description</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-20170630155913)</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>description | 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-20170630175829)</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/info.html" class="current">info</a> &gt; <a href="../ivyfile/description.html" class="current">description</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-20170630175829)</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>
@@ -155,8 +156,8 @@
 <li id="xooki-use/artifactproperty"><a href="../use/artifactproperty.html">artifactproperty</a></li>
 <li id="xooki-use/artifactreport"><a href="../use/artifactreport.html">artifactreport</a></li>
 <li id="xooki-use/buildlist"><a href="../use/buildlist.html">buildlist</a></li>
-<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/buildnumber"><a href="../use/buildnumber.html">buildnumber</a></li>
+<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/cachefileset"><a href="../use/cachefileset.html">cachefileset</a></li>
 <li id="xooki-use/cachepath"><a href="../use/cachepath.html">cachepath</a></li>
 <li id="xooki-use/checkdepsupdate"><a href="../use/checkdepsupdate.html">checkdepsupdate</a></li>

Modified: ant/site/ivy/production/history/master/ivyfile/exclude.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/exclude.html?rev=1800439&r1=1800438&r2=1800439&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/exclude.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/exclude.html Fri Jun 30 16:02:38 2017
@@ -1,5 +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><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});</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="Navigat
 ion 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-20170630155913)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="ivyfile.html" class="current">Ivy Files</a> &gt; <a href="../ivyfile/dependencies.html" class="current">dependencies</a> &gt; <a href="../ivyfile/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-20170630155913)</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&#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-20170630175829)</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/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-20170630175829)</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>
@@ -155,8 +156,8 @@
 <li id="xooki-use/artifactproperty"><a href="../use/artifactproperty.html">artifactproperty</a></li>
 <li id="xooki-use/artifactreport"><a href="../use/artifactreport.html">artifactreport</a></li>
 <li id="xooki-use/buildlist"><a href="../use/buildlist.html">buildlist</a></li>
-<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/buildnumber"><a href="../use/buildnumber.html">buildnumber</a></li>
+<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/cachefileset"><a href="../use/cachefileset.html">cachefileset</a></li>
 <li id="xooki-use/cachepath"><a href="../use/cachepath.html">cachepath</a></li>
 <li id="xooki-use/checkdepsupdate"><a href="../use/checkdepsupdate.html">checkdepsupdate</a></li>
@@ -209,8 +210,7 @@
 <p><strong>Tag:</strong> exclude <strong>Parent:</strong> <a href="../ivyfile/dependencies.html">dependencies</a></p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 2.0</em></strong> This feature gives you more control on a dependency for which you do not control its ivy file.
-It allows to exclude artifacts, modules or organizations from the list of dependencies for the whole module.</p>
+<p><strong><em>since 2.0</em></strong> This feature gives you more control on a dependency for which you do not control its ivy file. It allows to exclude artifacts, modules or organizations from the list of dependencies for the whole module.</p>
 </div>
 <div class="paragraph">
 <p>It is very similar to the <a href="../ivyfile/artifact-exclude.html">dependency exclude</a> element, except that it applies to a whole module, which can be very useful when a lot of dependencies transitively bring a module you don&#8217;t want.</p>
@@ -235,38 +235,38 @@ It allows to exclude artifacts, modules
 <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 organization of the dependency module or artifact to exclude, or a regexp matching this organization</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to &#8216;*&#8217;</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</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to &#8216;*&#8217;</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">artifact</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the name of an artifact of the dependency module to add to the exclude list, or an expression matching this name (see matcher attribute below)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to &#8216;*&#8217;</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the name of an artifact of the dependency module to add to the exclude list, or an expression matching this name (see <code>matcher</code> attribute below)</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">type</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">the type of the artifact of the dependency module to add to the exclude list, or a regexp matching this name</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to &#8216;*&#8217;</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">ext</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the extension of the artifact of the dependency module to add to the exclude list, or an expression matching this name (see matcher attribute below)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to type</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the extension of the artifact of the dependency module to add to the exclude list, or an expression matching this name (see <code>matcher</code> attribute below)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to the value of <code>type</code></p></td>
 </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</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 1.3 and superior</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>
 <td class="tableblock halign-left valign-top"><p class="tableblock">conf</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">comma separated list of the master configurations in which this artifact should be included.
-    &#8216;*&#8217; wildcard can be used to designate all configurations of this module</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to &#8216;*&#8217;, unless nested conf are specified</p></td>
+</p><p class="tableblock"><code>*</code> wildcard can be used to designate all configurations of this module</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to <code>*</code>, unless nested conf are specified</p></td>
 </tr>
 </tbody>
 </table>

Modified: ant/site/ivy/production/history/master/ivyfile/extends.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/extends.html?rev=1800439&r1=1800438&r2=1800439&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/extends.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/extends.html Fri Jun 30 16:02:38 2017
@@ -1,5 +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>extends | 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><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});</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="Navigat
 ion 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-20170630155913)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="ivyfile.html" class="current">Ivy Files</a> &gt; <a href="../ivyfile/info.html" class="current">info</a> &gt; <a href="../ivyfile/extends.html" class="current">extends</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-20170630155913)</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>extends | 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-20170630175829)</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/info.html" class="current">info</a> &gt; <a href="../ivyfile/extends.html" class="current">extends</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-20170630175829)</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>
@@ -155,8 +156,8 @@
 <li id="xooki-use/artifactproperty"><a href="../use/artifactproperty.html">artifactproperty</a></li>
 <li id="xooki-use/artifactreport"><a href="../use/artifactreport.html">artifactreport</a></li>
 <li id="xooki-use/buildlist"><a href="../use/buildlist.html">buildlist</a></li>
-<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/buildnumber"><a href="../use/buildnumber.html">buildnumber</a></li>
+<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/cachefileset"><a href="../use/cachefileset.html">cachefileset</a></li>
 <li id="xooki-use/cachepath"><a href="../use/cachepath.html">cachepath</a></li>
 <li id="xooki-use/checkdepsupdate"><a href="../use/checkdepsupdate.html">checkdepsupdate</a></li>
@@ -209,10 +210,10 @@
 <p><strong>Tag:</strong> extends <strong>Parent:</strong> <a href="../ivyfile/info.html">info</a></p>
 </div>
 <div class="paragraph">
-<p><strong><em>since 2.2</em></strong> Identifies an optional parent descriptor for this module. For complicated projects composed of many modules that have common configurations or dependencies, inheritance allows modules to share this information.  Which parts of the parent descriptor are inherited can be controlled with the <em>extendType</em> attribute.</p>
+<p><strong><em>since 2.2</em></strong> Identifies an optional parent descriptor for this module. For complicated projects composed of many modules that have common configurations or dependencies, inheritance allows modules to share this information.  Which parts of the parent descriptor are inherited can be controlled with the <code>extendType</code> attribute.</p>
 </div>
 <div class="paragraph">
-<p>Supported <em>extendType</em> values are:</p>
+<p>Supported <code>extendType</code> values are:</p>
 </div>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
@@ -286,14 +287,13 @@
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">extendType</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">which part(s) of the parent descriptor are inherited.  Valid values are <em>info</em>, <em>description</em>,
-<em>configurations</em>, <em>dependencies</em>, and <em>all</em>.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, default is <em>all</em></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">which part(s) of the parent descriptor are inherited.  Valid values are <code>info</code>, <code>description</code>, <code>configurations</code>, <code>dependencies</code>, and <code>all</code>.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">No, default is <code>all</code></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">location</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">A local filesystem path that should be searched for the parent descriptor.  If the parent descriptor cannot be found at this location, it will be located using dependency resolvers like any normal dependency.
-</p><p class="tableblock"></p><p class="tableblock"></p><p class="tableblock">This attribute is intended for development use.  For example, child module descriptors appear in a source control directory with the parent module descriptor at a higher level.  <em>location</em> will then contain the relative path to the parent descriptor for use during development builds.</p></td>
+</p><p class="tableblock">This attribute is intended for development use.  For example, child module descriptors appear in a source control directory with the parent module descriptor at a higher level.  <code>location</code> will then contain the relative path to the parent descriptor for use during development builds.</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, as long as the parent descriptor exists in an Ivy resolver</p></td>
 </tr>
 </tbody>

Modified: ant/site/ivy/production/history/master/ivyfile/include.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/include.html?rev=1800439&r1=1800438&r2=1800439&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/include.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/include.html Fri Jun 30 16:02:38 2017
@@ -1,5 +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><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});</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="Navigat
 ion 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-20170630155913)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="ivyfile.html" class="current">Ivy Files</a> &gt; <a href="../ivyfile/configurations.html" class="current">configurations</a> &gt; <a href="../ivyfile/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-20170630155913)</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>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-20170630175829)</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/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-20170630175829)</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>
@@ -155,8 +156,8 @@
 <li id="xooki-use/artifactproperty"><a href="../use/artifactproperty.html">artifactproperty</a></li>
 <li id="xooki-use/artifactreport"><a href="../use/artifactreport.html">artifactreport</a></li>
 <li id="xooki-use/buildlist"><a href="../use/buildlist.html">buildlist</a></li>
-<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/buildnumber"><a href="../use/buildnumber.html">buildnumber</a></li>
+<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/cachefileset"><a href="../use/cachefileset.html">cachefileset</a></li>
 <li id="xooki-use/cachepath"><a href="../use/cachepath.html">cachepath</a></li>
 <li id="xooki-use/checkdepsupdate"><a href="../use/checkdepsupdate.html">checkdepsupdate</a></li>
@@ -212,10 +213,10 @@
 <p>Include configurations specified in another file. <strong><em>since 1.3</em></strong></p>
 </div>
 <div class="paragraph">
-<p>The included file should have a configurations tag as root tag, which follow the same specification as the <a href="../ivyfile/configurations.html">configurations</a> tag of the ivy file.</p>
+<p>The included file should have a <code>configurations</code> tag as root tag, which follow the same specification as the <a href="../ivyfile/configurations.html">configurations</a> tag of the ivy file.</p>
 </div>
 <div class="paragraph">
-<p>This means that it can contain conf declarations, other file inclusion, and also a defaultconfmapping.</p>
+<p>This means that it can contain conf declarations, other file inclusion, and also a <code>defaultconfmapping</code>.</p>
 </div>
 <div class="paragraph">
 <p>When delivering an ivy file with such an inclusion, the included configuration file is inlined, i.e. ivy remove the dependency on the external file.</p>
@@ -251,7 +252,7 @@
 <div class="sectionbody">
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code>&lt;ivy-module version="1.0"&gt;
+<pre class="highlightjs highlight"><code class="language-xml" data-lang="xml">&lt;ivy-module version="1.0"&gt;
   &lt;info organisation="myorg"
          module="mymodule"
   /&gt;
@@ -267,18 +268,18 @@
 </div>
 </div>
 <div class="paragraph">
-<p>with included-configurations.xml like this:</p>
+<p>with <code>included-configurations.xml</code> like this:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code>&lt;configurations defaultconfmapping="*-&gt;@"&gt;
+<pre class="highlightjs highlight"><code class="language-xml" data-lang="xml">&lt;configurations defaultconfmapping="*-&gt;@"&gt;
   &lt;conf name="conf1" visibility="public"/&gt;
   &lt;conf name="conf2" visibility="private"/&gt;
 &lt;/configurations&gt;</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>Defines 3 configurations, conf1, conf2 and conf3. mymodule1 is required in each configuration, with for each the same configuration (conf1 is needed in conf1, conf2 in conf2, and conf3 in conf3) due to the defaultconfmapping defined in the included file.</p>
+<p>Defines 3 configurations, <code>conf1</code>, <code>conf2</code> and <code>conf3</code>. <code>mymodule1</code> is required in each configuration, with for each the same configuration (<code>conf1</code> is needed in <code>conf1</code>, <code>conf2</code> in <code>conf2</code>, and <code>conf3</code> in <code>conf3</code>) due to the <code>defaultconfmapping</code> defined in the included file.</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; 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/ivyfile/info.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/info.html?rev=1800439&r1=1800438&r2=1800439&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/info.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/info.html Fri Jun 30 16:02:38 2017
@@ -1,5 +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>info | 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><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});</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-20170630155913)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="ivyfile.html" class="current">Ivy Files</a> &gt; <a href="../ivyfile/info.html" class="current">info</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-20170630155913)</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>info | 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-20170630175829)</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/info.html" class="current">info</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-20170630175829)</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>
@@ -155,8 +156,8 @@
 <li id="xooki-use/artifactproperty"><a href="../use/artifactproperty.html">artifactproperty</a></li>
 <li id="xooki-use/artifactreport"><a href="../use/artifactreport.html">artifactreport</a></li>
 <li id="xooki-use/buildlist"><a href="../use/buildlist.html">buildlist</a></li>
-<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/buildnumber"><a href="../use/buildnumber.html">buildnumber</a></li>
+<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/cachefileset"><a href="../use/cachefileset.html">cachefileset</a></li>
 <li id="xooki-use/cachepath"><a href="../use/cachepath.html">cachepath</a></li>
 <li id="xooki-use/checkdepsupdate"><a href="../use/checkdepsupdate.html">checkdepsupdate</a></li>
@@ -254,11 +255,11 @@
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">status</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">the status of this module. See <a href="../reference.html">terminology</a> section for details</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, default to 'integration'</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">No, default to <code>integration</code></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">publication</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">the date of publication of this module. It should be given in this format: yyyyMMddHHmmss</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the date of publication of this module. It should be given in this format: <code>yyyyMMddHHmmss</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">No, but it&#8217;s a good practice to set it with delivered ivy files</p></td>
 </tr>
 </tbody>

Modified: ant/site/ivy/production/history/master/ivyfile/ivyauthor.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/ivyauthor.html?rev=1800439&r1=1800438&r2=1800439&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/ivyauthor.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/ivyauthor.html Fri Jun 30 16:02:38 2017
@@ -1,5 +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>ivyauthor | 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><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});</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="Navig
 ation 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-20170630155913)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="ivyfile.html" class="current">Ivy Files</a> &gt; <a href="../ivyfile/info.html" class="current">info</a> &gt; <a href="../ivyfile/ivyauthor.html" class="current">ivyauthor</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-20170630155913)</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>ivyauthor | 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-20170630175829)</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/info.html" class="current">info</a> &gt; <a href="../ivyfile/ivyauthor.html" class="current">ivyauthor</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-20170630175829)</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>
@@ -155,8 +156,8 @@
 <li id="xooki-use/artifactproperty"><a href="../use/artifactproperty.html">artifactproperty</a></li>
 <li id="xooki-use/artifactreport"><a href="../use/artifactreport.html">artifactreport</a></li>
 <li id="xooki-use/buildlist"><a href="../use/buildlist.html">buildlist</a></li>
-<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/buildnumber"><a href="../use/buildnumber.html">buildnumber</a></li>
+<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/cachefileset"><a href="../use/cachefileset.html">cachefileset</a></li>
 <li id="xooki-use/cachepath"><a href="../use/cachepath.html">cachepath</a></li>
 <li id="xooki-use/checkdepsupdate"><a href="../use/checkdepsupdate.html">checkdepsupdate</a></li>

Modified: ant/site/ivy/production/history/master/ivyfile/license.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/license.html?rev=1800439&r1=1800438&r2=1800439&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/license.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/license.html Fri Jun 30 16:02:38 2017
@@ -1,5 +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>license | 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><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});</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="Navigat
 ion 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-20170630155913)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="ivyfile.html" class="current">Ivy Files</a> &gt; <a href="../ivyfile/info.html" class="current">info</a> &gt; <a href="../ivyfile/license.html" class="current">license</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-20170630155913)</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>license | 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-20170630175829)</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/info.html" class="current">info</a> &gt; <a href="../ivyfile/license.html" class="current">license</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-20170630175829)</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>
@@ -155,8 +156,8 @@
 <li id="xooki-use/artifactproperty"><a href="../use/artifactproperty.html">artifactproperty</a></li>
 <li id="xooki-use/artifactreport"><a href="../use/artifactreport.html">artifactreport</a></li>
 <li id="xooki-use/buildlist"><a href="../use/buildlist.html">buildlist</a></li>
-<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/buildnumber"><a href="../use/buildnumber.html">buildnumber</a></li>
+<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/cachefileset"><a href="../use/cachefileset.html">cachefileset</a></li>
 <li id="xooki-use/cachepath"><a href="../use/cachepath.html">cachepath</a></li>
 <li id="xooki-use/checkdepsupdate"><a href="../use/checkdepsupdate.html">checkdepsupdate</a></li>

Modified: ant/site/ivy/production/history/master/ivyfile/manager.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/production/history/master/ivyfile/manager.html?rev=1800439&r1=1800438&r2=1800439&view=diff
==============================================================================
--- ant/site/ivy/production/history/master/ivyfile/manager.html (original)
+++ ant/site/ivy/production/history/master/ivyfile/manager.html Fri Jun 30 16:02:38 2017
@@ -1,5 +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>manager | 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><script>$(document).ready(function(){$("#treemenu").Treeview({speed: "fast",store: true});});</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="Navigat
 ion 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-20170630155913)</a> &gt; <a href="reference.html" class="current">Reference</a> &gt; <a href="ivyfile.html" class="current">Ivy Files</a> &gt; <a href="../ivyfile/conflicts.html" class="current">conflicts</a> &gt; <a href="../ivyfile/manager.html" class="current">manager</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-20170630155913)</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>manager | 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-20170630175829)</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/conflicts.html" class="current">conflicts</a> &gt; <a href="../ivyfile/manager.html" class="current">manager</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-20170630175829)</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>
@@ -155,8 +156,8 @@
 <li id="xooki-use/artifactproperty"><a href="../use/artifactproperty.html">artifactproperty</a></li>
 <li id="xooki-use/artifactreport"><a href="../use/artifactreport.html">artifactreport</a></li>
 <li id="xooki-use/buildlist"><a href="../use/buildlist.html">buildlist</a></li>
-<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/buildnumber"><a href="../use/buildnumber.html">buildnumber</a></li>
+<li id="xooki-use/buildobr"><a href="../use/buildobr.html">buildobr</a></li>
 <li id="xooki-use/cachefileset"><a href="../use/cachefileset.html">cachefileset</a></li>
 <li id="xooki-use/cachepath"><a href="../use/cachepath.html">cachepath</a></li>
 <li id="xooki-use/checkdepsupdate"><a href="../use/checkdepsupdate.html">checkdepsupdate</a></li>
@@ -215,10 +216,7 @@
 <p>Specify a a conflict manager for one or several dependencies.</p>
 </div>
 <div class="paragraph">
-<p>The way to specify a conflict manager is by giving indication to which dependencies
-the conflict manager applies (by giving organisation and module names or name regexp),
-and then specifying the conflict manager, either by giving its name or by
-specifying a fixed revision list, in which case a fixed conflicts manager is used.</p>
+<p>The way to specify a conflict manager is by giving indication to which dependencies the conflict manager applies (by giving organisation and module names or name regexp), and then specifying the conflict manager, either by giving its name or by specifying a fixed revision list, in which case a fixed conflicts manager is used.</p>
 </div>
 <div class="paragraph">
 <p>See <a href="../ivyfile/conflicts.html">Conflicts Manager</a> for details on conflicts manager in general.</p>
@@ -242,23 +240,27 @@ specifying a fixed revision list, in whi
 <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 name, or an expression matching the name of organisation to which this conflict manager should apply (see matcher attribute below)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to &#8216;*&#8217; (match all)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the name, or an expression matching the name of organisation to which this conflict manager should apply (see <code>matcher</code> attribute below)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to <code>*</code> (match all)</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, or an expression matching the name of module to which this conflict manager should apply (see matcher attribute below)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to &#8216;*&#8217; (match all)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">the name, or an expression matching the name of module to which this conflict manager should apply (see <code>matcher</code> attribute below)</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">No, defaults to <code>*</code> (match all)</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">name</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">the name of the conflict manager to use</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Exactly one of two</p></td>
+<td class="tableblock halign-left valign-middle" rowspan="2"><p class="tableblock">Exactly one of two</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">rev</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">a comma separated list of revisions this conflict manager should select</p></td>
+</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 for which the conflict manager should be used <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>
 </tbody>
 </table>