From 2fa84738b4a2bfc1380bfbebe46c2e54921ff061 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Tue, 10 Jul 2001 13:23:29 +0000
Subject: [PATCH] InheritAll documentation update

Submitted by:	Craeg K Strong <cstrong@arielpartners.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269306 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/CoreTasks/ant.html | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html
index 3e0d83807..d6bf9cf9a 100644
--- a/docs/manual/CoreTasks/ant.html
+++ b/docs/manual/CoreTasks/ant.html
@@ -14,11 +14,16 @@
 in the supplied directory (<i>dir</i> attribute) is used.</p>
 <p>If no target attribute is supplied, the default target of the new project is
 used.</p>
-<p>The properties of the current project will be available in the new project.
-These properties will override the properties that are set in the new project.
-(See also the <a href="property.html">property task</a>). You can set properties
-in the new project from the old project by using nested property tags. This
-allows you to parameterize your subprojects.</p>
+<p>By default, all of the properties of the current project will be
+available in the new project.   Alternatively, you can
+set the <i>inheritAll</i> attribute to <code>false</code> and only
+&quot;user&quot; properties (i.e., those passed on the command-line)
+will be passed to the new project.  In either case, the set of
+properties passed to the new project will override the properties that 
+are set in the new project (See also the <a href="property.html">property task</a>).</p>
+<p>You can also set properties in the new project from the old project by
+using nested property tags. These properties are always passed regardless of the
+setting of <i>inheritAll</i>.  This allows you to parameterize your subprojects.</p>
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
@@ -48,6 +53,13 @@ allows you to parameterize your subprojects.</p>
     </td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">inheritAll</td>
+    <td valign="top">If <code>true</code>, pass all properties to the new Ant
+    project.  Defaults to <code>true</code>.
+    </td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 <h3>Examples</h3>
 <pre>
@@ -59,6 +71,10 @@ allows you to parameterize your subprojects.</p>
     &lt;property name=&quot;param1&quot; value=&quot;version 1.x&quot;/&gt;
     &lt;property file=&quot;config/subproject/default.properties&quot;/&gt;
   &lt;/ant&gt;
+
+  &lt;ant inheritAll=&quot;false&quot; antfile=&quot;subproject/subbuild.xml&quot;&gt;
+    &lt;property name=&quot;output.type&quot; value=&quot;html&quot;/&gt;
+  &lt;/ant&gt;
 </pre>
 <hr>
 <p align="center">Copyright &copy; 2000,2001 Apache Software Foundation. All rights