svn commit: r1806441 - /ant/site/ivy/sources/faq.html

[ja...@apache.org]

Author: jaikiran
Date: Mon Aug 28 12:24:56 2017
New Revision: 1806441

URL: http://svn.apache.org/viewvc?rev=1806441&view=rev
Log:
IVY-1089 Use the newer (since 2.0) terminology for configuration files in Ivy

Modified:
    ant/site/ivy/sources/faq.html

Modified: ant/site/ivy/sources/faq.html
URL: http://svn.apache.org/viewvc/ant/site/ivy/sources/faq.html?rev=1806441&r1=1806440&r2=1806441&view=diff
==============================================================================
--- ant/site/ivy/sources/faq.html (original)
+++ ant/site/ivy/sources/faq.html Mon Aug 28 12:24:56 2017
@@ -75,10 +75,10 @@ him to use comp-build2596.jar instead of
 <code><ivy:retrieve pattern="${ivy.lib.dir}/[module]/[type]s/[artifact]-[revision].[ext]"/></code>
 <p>Not too difficult, and really flexible, isn't it ? And check the retrieve task reference documentation to learn more about it...</p>
 <h2><a name="why-two-xml-files"></a>Why two xml files ?</h2>
-<p>Apache Ivy uses two types of xml files: configuration files and ivy files.</p>
+<p>Apache Ivy uses two types of xml files: settings files and ivy files.</p>
 <p>In fact, Apache Ivy distinguishes two different steps to describe and get your dependencies:</p>
 <ul><li>You write ivy files to describe the dependencies of your module, independently of how you retrieve them.</li>
-<li>Then you configure Apache Ivy to indicate where it can find your dependencies. Thus you can easily share your ivy files, even if you have internal dependencies which are not resolved the same way in your environment as in the target development environment. You just need to write two configuration files, one in your default development environment, and one in the target development environment with the <b>same ivy files</b>.</li></ul>
+<li>Then you configure Apache Ivy to indicate where it can find your dependencies. Thus you can easily share your ivy files, even if you have internal dependencies which are not resolved the same way in your environment as in the target development environment. You just need to write two settings files, one in your default development environment, and one in the target development environment with the <b>same ivy files</b>.</li></ul>
 <h2><a name="how-do-i-separate-dependencies"></a>How do I separate the dependencies I need at xxx time and the one I need at yyy time ?</h2>
 <p>Apache Ivy uses a concept called <i>configurations</i> to handle this, and many more. As explained in the [[doc:terminology terminology page]], a <i>configuration</i> of your module can be thought as a way to use your module (<i>note: this has nothing to do with the configuration of Apache Ivy itself, through the use of configuration file</i>). You can describe what dependencies are needed in each configuration. </p>
 <p>Moreover, because the dependencies are modules too, they can also have configurations. What is extremely powerful with Apache Ivy is that you can define configurations mapping, i.e. which conf of the dependency is needed in which conf of your module. Thus what is needed at 'runtime' of a dependency can be needed for 'test' of your module.</p>