Author: maartenc Date: Tue Sep 23 14:20:29 2008 New Revision: 698354 URL: http://svn.apache.org/viewvc?rev=698354&view=rev Log: Updated documentation for IVY-911.
Modified: ant/ivy/core/trunk/doc/settings.html ant/ivy/core/trunk/doc/settings/settings.html Modified: ant/ivy/core/trunk/doc/settings.html URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings.html?rev=698354&r1=698353&r2=698354&view=diff ============================================================================== --- ant/ivy/core/trunk/doc/settings.html (original) +++ ant/ivy/core/trunk/doc/settings.html Tue Sep 23 14:20:29 2008 @@ -68,7 +68,7 @@ ivysettings <a href="settings/property.html">property</a> <a href="settings/properties.html">properties</a> - <a href="settings/conf.html">settings</a> + <a href="settings/settings.html">settings</a> <a href="settings/include.html">include</a> <a href="settings/classpath.html">classpath</a> <a href="settings/typedef.html">typedef</a> @@ -115,7 +115,7 @@ <td>0..n</td></tr> <tr><td><a href="settings/properties.html">properties</a></td><td>loads a properties file as ivy variables</td> <td>0..n</td></tr> - <tr><td><a href="settings/conf.html">settings</a></td><td>configures ivy with some defaults</td> + <tr><td><a href="settings/settings.html">settings</a></td><td>configures ivy with some defaults</td> <td>0..1</td></tr> <tr><td><a href="settings/include.html">include</a></td><td>includes another settings file</td> <td>0..n</td></tr> Modified: ant/ivy/core/trunk/doc/settings/settings.html URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/settings/settings.html?rev=698354&r1=698353&r2=698354&view=diff ============================================================================== --- ant/ivy/core/trunk/doc/settings/settings.html (original) +++ ant/ivy/core/trunk/doc/settings/settings.html Tue Sep 23 14:20:29 2008 @@ -59,6 +59,8 @@ <td>No, defaults to true</td></tr> <tr><td>useRemoteConfig</td><td>true to configure ivyrep and ibiblio resolver from a remote configuration file (updated with changes in those repository structure if any) (<span class="since">since 1.2</span>)</td> <td>No, defaults to false</td></tr> + <tr><td>httpRequestMethod</td><td>specifies the HTTP method to use to retrieve information about an URL. Possible values are 'GET' and 'HEAD'. This setting can be used to solve problems with firewalls and proxies. (<span class="since">since 2.0</span>)</td> + <td>No, defaults to 'HEAD'</td></tr> <tr><td><s>defaultCache</s></td><td>a path to a directory to use as default basedir for both resolution and repository cache(s). <i>Deprecated, we recommend using defaultCacheDir on the [[settings/caches]] tag instead</i></td> <td>No, defaults to .ivy2/cache in user home</td></tr>