42946: need to add doc for xml format in 1.7.*
git-svn-id: https://svn.apache.org/repos/asf/ant/core/branches/ANT_17_BRANCH@749409 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/docs/manual/CoreTasks/property.html b/docs/manual/CoreTasks/property.html
index c02a1c1..f6ed341 100644
--- a/docs/manual/CoreTasks/property.html
+++ b/docs/manual/CoreTasks/property.html
@@ -57,6 +57,10 @@
This also holds for properties loaded from a property file.</p>
<p>A list of predefined properties can be found <a
href="../using.html#built-in-props">here</a>.</p>
+<p>Since Ant 1.7.1 it is possible to load properties defined in xml
+according to <a href="http://java.sun.com/dtd/properties.dtd">Suns DTD</a>,
+if Java5+ is present. For this the name of the file, resource or url has
+to end with <tt>.xml</tt>.</p>
<h4>OpenVMS Users</h4>
<p>With the <code>environment</code> attribute this task will load all defined
@@ -150,22 +154,28 @@
<td align="center" valign="top">No</td>
</tr>
</table>
+
<h3>Parameters specified as nested elements</h3>
<h4>classpath</h4>
<p><code>Property</code>'s <i>classpath</i> attribute is a <a
href="../using.html#path">PATH like structure</a> and can also be set via a nested
<i>classpath</i> element.</p>
+
<h3>Examples</h3>
<pre> <property name="foo.dist" value="dist"/></pre>
<p>sets the property <code>foo.dist</code> to the value "dist".</p>
+
<pre> <property file="foo.properties"/></pre>
<p>reads a set of properties from a file called "foo.properties".</p>
+
<pre> <property url="http://www.mysite.com/bla/props/foo.properties"/></pre>
<p>reads a set of properties from the address "http://www.mysite.com/bla/props/foo.properties".</p>
+
<pre> <property resource="foo.properties"/></pre>
<p>reads a set of properties from a resource called "foo.properties".</p>
<p>Note that you can reference a global properties file for all of your Ant
builds using the following:</p>
+
<pre> <property file="${user.home}/.ant-global.properties"/></pre>
<p>since the "user.home" property is defined by the Java virtual machine
to be your home directory. Where the "user.home" property resolves to in
@@ -185,6 +195,18 @@
Two of the values are shown being echoed.
</p>
+<pre>
+ <property environment="env"/>
+ <property file="${user.name}.properties"/>
+ <property file="${env.STAGE}.properties"/>
+ <property file="build.properties"/>
+</pre>
+<p>This buildfile uses the properties defined in <tt>build.properties</tt>. Regarding to the
+environment variable <tt>STAGE</tt> some or all values could be overwritten, e.g. having
+<tt>STAGE=test</tt> and a <tt>test.properties</tt> you have special values for that (like another
+name for the test server). Finally all these values could be overwritten by personal settings with
+a file per user.</p>
+
<h3>Property Files</h3>
As stated, this task will load in a properties file stored in the file