From a9b1c6e9621a6f910dfdf7d27c9aa551352ea0d0 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 22 Sep 2010 07:56:54 +0000
Subject: [PATCH] document behavior of property elements in nested structures
 of ant tasks.  PR 49891.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@999791 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/Tasks/ant.html    | 14 ++++++++++++--
 docs/manual/Tasks/subant.html |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/manual/Tasks/ant.html b/docs/manual/Tasks/ant.html
index 236769516..a39186e75 100644
--- a/docs/manual/Tasks/ant.html
+++ b/docs/manual/Tasks/ant.html
@@ -49,8 +49,7 @@ href="property.html">property task</a>).</p>
 by using nested property tags. These properties are always passed
 to the new project and any project created in that project
 regardless of the setting of <i>inheritAll</i>.  This allows you to
-parameterize your subprojects.  Properties defined on the command line
-cannot be overridden by nested <code>&lt;property&gt;</code> elements.</p>
+parameterize your subprojects.</p>
 
 <p>When more than one nested <code>&lt;property&gt;</code> element
   would set a property of the same name, the one declared last will
@@ -58,6 +57,17 @@ cannot be overridden by nested <code>&lt;property&gt;</code> elements.</p>
   different from the way <code>&lt;property&gt;</code> tasks in build
   files behave.</p>
 
+<p>Properties defined on the command line cannot be overridden by
+  nested <code>&lt;property&gt;</code> elements.  <em>Since Ant
+  1.8.0.</em> the same is true for nested structures
+  of <code>&lt;ant&gt;</code> tasks: if a build file <em>A</em>
+  invokes <em>B</em> via an <code>&lt;ant&gt;</code> task setting a
+  property with a nested <code>&lt;property&gt;</code> element
+  and <em>B</em> contains an <code>&lt;ant&gt;</code> tasks
+  invoking <em>C</em>, <em>C</em> will see the value set
+  in <em>A</em>, even if <em>B</em> used a
+  nested <code>&lt;property&gt;</code> element as well.</p>
+
 <p>References to data types can also be passed to the new project, but
 by default they are not.  If you set the inheritrefs attribute to
 true, all references will be copied, but they will not override
diff --git a/docs/manual/Tasks/subant.html b/docs/manual/Tasks/subant.html
index 74699642f..f9b66bd6d 100644
--- a/docs/manual/Tasks/subant.html
+++ b/docs/manual/Tasks/subant.html
@@ -72,6 +72,11 @@
                 part of.</strong>
         </p>
         <p><em>Since Ant 1.6</em></p>
+
+<p><code>subant</code> uses <code>ant</code> internally so many things
+  said in <a href="ant.html"><code>ant</code>'s manual page</a> apply
+  here as well.</p>
+
     <table border="0" cellspacing="0" cellpadding="2" width="100%">
       <!-- Subsection heading -->
       <tr><td bgcolor="#828DA6">