Author: maartenc
Date: Sat Feb 18 07:06:42 2012
New Revision: 1245873
URL: http://svn.apache.org/viewvc?rev=1245873&view=rev
Log:
Say something about the ivy.settings.url property that can be used now to
specify the settings.xml location.
Modified:
ant/ivy/core/trunk/doc/use/configure.html
Modified: ant/ivy/core/trunk/doc/use/configure.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/configure.html?rev=1245873&r1=1245872&r2=1245873&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/configure.html (original)
+++ ant/ivy/core/trunk/doc/use/configure.html Sat Feb 18 07:06:42 2012
@@ -39,7 +39,7 @@ See [[settings]] for details about the s
<tbody>
<tr><td>settingsId</td><td>The settings id useable in the settingsRef
attributes of the ivy task that needs a setting. Note that the ivy tasks will
search by default for the settings with the id "ivy.instance", which is the
default value.</td><td>No, defaults to "ivy.instance"</td></tr>
<tr><td>file</td><td>path to the settings file to use</td>
- <td rowspan="2">No. If a file is provided, url is ignored. If none are
provided, then it attempts to find a file at ${ivy.settings.file}, and if this
file does not exist, it uses a <a
href="../samples/ivysettings-default.xml">default settings file</a></td></tr>
+ <td rowspan="2">No. If a file is provided, url is ignored. If none are
provided, then it attempts to find a file at ${ivy.settings.file}, and if this
file does not exist, it uses ${ivy.settings.url} <span class="since">(since
2.3)</span> or a <a href="../samples/ivysettings-default.xml">default settings
file</a></td></tr>
<tr><td>url</td><td>url of the settings file to use</td></tr>
<tr><td>override</td><td>Specify what to do when another settings with the
same id has already been loaded.<ul><li>true</li> the current settings will
take precedence over any previously defined setting with this id<li>false</li>
the current settings will not override a previously defined setting with this
id<li>notallowed</li>an error is raised if a settings has already been defined
with this id</ul></td><td>No, defaults to "notallowed"</td></tr>
<tr><td>host</td><td>http authentication host</td><td rowspan="4">No,
unless authentication is required</td></tr>
