svn commit: r1028016 - /ant/ivy/core/trunk/doc/ivyfile/dependencies.html

[hi...@apache.org]

Author: hibou
Date: Wed Oct 27 15:59:18 2010
New Revision: 1028016

URL: http://svn.apache.org/viewvc?rev=1028016&view=rev
Log:
Add the missing doc about child elements

Modified:
    ant/ivy/core/trunk/doc/ivyfile/dependencies.html

Modified: ant/ivy/core/trunk/doc/ivyfile/dependencies.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/ivyfile/dependencies.html?rev=1028016&r1=1028015&r2=1028016&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/ivyfile/dependencies.html (original)
+++ ant/ivy/core/trunk/doc/ivyfile/dependencies.html Wed Oct 27 15:59:18 2010
@@ -60,6 +60,10 @@ In Ivy 2.1.0 and earlier, if both defaul
         <td>0..n</td></tr>
     <tr><td><a href="../ivyfile/exclude.html">exclude</a></td><td>excludes artifacts, modules or whole organizations from the set of dependencies of this module <span class="since">since 2.0</span></td>
         <td>0..n</td></tr>
+    <tr><td><a href="../ivyfile/override.html">override</a></td><td>specify an override mediation rule, overriding the revision and/or branch requested for a transitive dependency <span class="since">since 2.0</span></td>
+        <td>0..n</td></tr>
+    <tr><td><a href="../ivyfile/conflict.html">conflict</a></td><td>specify a a conflict manager for one or several dependencies <span class="since">since 2.0</span></td>
+        <td>0..n</td></tr>
 </tbody>
 </table>