IVY-1420 document current implementation

mbreinhold · Oct 21, 2017 · 2074889 · 2074889
1 parent 6b610aa
commit 2074889
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/asciidoc/ivyfile/configurations.adoc b/asciidoc/ivyfile/configurations.adoc
@@ -35,7 +35,7 @@ See link:#defaultconfmapping[examples below] to clarify the behavior of these tw
 
 (*__since 1.4__*) You can activate a `confmappingoverride` mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from.
 
-(*__since 2.5__*) Attributes inherited via link:extends.html[`extends`] are added to both `configurations` and `dependencies`.
+(*__since 2.5__*) Attributes inherited via link:extends.html[`extends`] are added to both `configurations` and `dependencies` on link:../use/deliver.html[delivery]. If the latter element has attributes, their values override values of the corresponding attributes of the former element.
 
 == [[attributes]]Attributes
 

diff --git a/asciidoc/ivyfile/dependencies.adoc b/asciidoc/ivyfile/dependencies.adoc
@@ -31,7 +31,7 @@ This container provides two similar behaviors described below. (See link:configu
 
 (*__since 1.4__*) You can activate a `confmappingoverride` mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from.
 
-(*__since 2.5__*) Attributes inherited via link:extends.html[`extends`] are added to both `configurations` and `dependencies`.
+(*__since 2.5__*) Attributes inherited via link:extends.html[`extends`] are added to `dependencies` only on link:../use/deliver.html[delivery] and override attributes inherited from `configurations`.
 
 == Attributes
 

diff --git a/asciidoc/ivyfile/include.adoc b/asciidoc/ivyfile/include.adoc
@@ -25,10 +25,12 @@ Include configurations specified in another file.
 
 The included file should have a `configurations` tag as root tag, which follow the same specification as the link:../ivyfile/configurations.html[configurations] tag of the Ivy file.
 
-This means that it can contain conf declarations, other file inclusion, and also a `defaultconfmapping`.
+This means that it can contain conf declarations, other file inclusions, and have link:configurations.html#attributes[attributes] controlling conf mapping.
 
 When delivering an Ivy file with such an inclusion, the included descriptor file is inlined, i.e. Ivy removes the dependency on the external file.
 
+[*__since 2.5__*] Attributes inherited through included file are set on `dependencies` element due to the way module descriptor updater works currently.
+
 == Attributes
 
 [options="header",cols="15%,50%,35%"]