[MNG-5108] added combine.children and combine.self attributes information in model descriptor documentation (merged from trunk r1142230)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@1142231 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index a343869..5c21f1b 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -2465,7 +2465,20 @@
<type>String</type>
</field>
<field>
- <description>The configuration as DOM object.</description>
+ <description>
+ <![CDATA[
+ The configuration as DOM object.
+ You can control how child POMs inherit configuration from parent POMs by adding <code>combine.children</code>
+ or <code>combine.self</code> attributes to the children of the configuration element:
+ <ul>
+ <li><code>combine.children</code>: available values are <code>merge</code> (default) and <code>append</code>,</li>
+ <li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li>
+ </ul>
+ See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and
+ <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a>
+ for more information.
+ ]]>
+ </description>
<name>configuration</name>
<type>DOM</type>
</field>
