bodewig     2003/09/25 06:49:26

  Modified:    docs/manual/CoreTasks Tag: ANT_15_BRANCH ant.html
                        antcall.html
  Log:
  Merge from HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.14.2.5  +11 -7     ant/docs/manual/CoreTasks/ant.html
  
  Index: ant.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/ant.html,v
  retrieving revision 1.14.2.4
  retrieving revision 1.14.2.5
  diff -u -r1.14.2.4 -r1.14.2.5
  --- ant.html  26 Sep 2002 16:08:11 -0000      1.14.2.4
  +++ ant.html  25 Sep 2003 13:49:26 -0000      1.14.2.5
  @@ -15,15 +15,19 @@
   <p>If no target attribute is supplied, the default target of the new project 
is
   used.</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
  +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>
  +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.  Properties defined on the command line
  +can not be overridden by nested &lt;property&gt; elements.</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
  
  
  
  1.11.2.5  +5 -3      ant/docs/manual/CoreTasks/antcall.html
  
  Index: antcall.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/antcall.html,v
  retrieving revision 1.11.2.4
  retrieving revision 1.11.2.5
  diff -u -r1.11.2.4 -r1.11.2.5
  --- antcall.html      26 Sep 2002 16:08:12 -0000      1.11.2.4
  +++ antcall.html      25 Sep 2003 13:49:26 -0000      1.11.2.5
  @@ -18,9 +18,11 @@
   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 param tags. These properties are always passed regardless of the
  -setting of <i>inheritAll</i>.  This allows you to parameterize your 
subprojects.</p>
  +<p>You can also set properties in the new project from the old project
  +by using nested param tags. These properties are always passed
  +regardless of the setting of <i>inheritAll</i>.  This allows you to
  +parameterize your subprojects.  Properties defined on the command line
  +can not be overridden by nested &lt;param&gt; elements.</p>
   
   <p>Nested <a href="#reference"><i>&lt;reference&gt;</i></a> elements can
   be used to copy references from the calling project to the new
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to