You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/07/05 14:12:58 UTC

svn commit: r553512 [1/2] - in /incubator/ivy/core/trunk/doc: ./ configuration/ configuration/namespace/ ivyfile/ resolver/ tutorial/ tutorial/build-repository/ use/

Author: xavier
Date: Thu Jul  5 07:12:52 2007
New Revision: 553512

URL: http://svn.apache.org/viewvc?view=rev&rev=553512
Log:
fix some broken links due to doc and site split

Modified:
    incubator/ivy/core/trunk/doc/ant.html
    incubator/ivy/core/trunk/doc/bestpractices.html
    incubator/ivy/core/trunk/doc/concept.html
    incubator/ivy/core/trunk/doc/configuration.html
    incubator/ivy/core/trunk/doc/configuration/conf.html
    incubator/ivy/core/trunk/doc/configuration/conflict-managers.html
    incubator/ivy/core/trunk/doc/configuration/include.html
    incubator/ivy/core/trunk/doc/configuration/latest-strategies.html
    incubator/ivy/core/trunk/doc/configuration/macrodef.html
    incubator/ivy/core/trunk/doc/configuration/module.html
    incubator/ivy/core/trunk/doc/configuration/modules.html
    incubator/ivy/core/trunk/doc/configuration/namespace.html
    incubator/ivy/core/trunk/doc/configuration/namespace/fromtosystem.html
    incubator/ivy/core/trunk/doc/configuration/namespace/rule.html
    incubator/ivy/core/trunk/doc/configuration/namespaces.html
    incubator/ivy/core/trunk/doc/configuration/outputters.html
    incubator/ivy/core/trunk/doc/configuration/resolvers.html
    incubator/ivy/core/trunk/doc/configuration/status.html
    incubator/ivy/core/trunk/doc/configuration/statuses.html
    incubator/ivy/core/trunk/doc/configuration/triggers.html
    incubator/ivy/core/trunk/doc/configuration/typedef.html
    incubator/ivy/core/trunk/doc/configuration/version-matchers.html
    incubator/ivy/core/trunk/doc/intro.html
    incubator/ivy/core/trunk/doc/ivyfile.html
    incubator/ivy/core/trunk/doc/ivyfile/artifact-conf.html
    incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude-conf.html
    incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude.html
    incubator/ivy/core/trunk/doc/ivyfile/artifact.html
    incubator/ivy/core/trunk/doc/ivyfile/conf.html
    incubator/ivy/core/trunk/doc/ivyfile/configurations.html
    incubator/ivy/core/trunk/doc/ivyfile/conflicts.html
    incubator/ivy/core/trunk/doc/ivyfile/dependencies.html
    incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact-conf.html
    incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact.html
    incubator/ivy/core/trunk/doc/ivyfile/dependency-conf.html
    incubator/ivy/core/trunk/doc/ivyfile/dependency-include-conf.html
    incubator/ivy/core/trunk/doc/ivyfile/dependency-include.html
    incubator/ivy/core/trunk/doc/ivyfile/dependency.html
    incubator/ivy/core/trunk/doc/ivyfile/description.html
    incubator/ivy/core/trunk/doc/ivyfile/exclude.html
    incubator/ivy/core/trunk/doc/ivyfile/include.html
    incubator/ivy/core/trunk/doc/ivyfile/info.html
    incubator/ivy/core/trunk/doc/ivyfile/ivyauthor.html
    incubator/ivy/core/trunk/doc/ivyfile/license.html
    incubator/ivy/core/trunk/doc/ivyfile/manager.html
    incubator/ivy/core/trunk/doc/ivyfile/mapped.html
    incubator/ivy/core/trunk/doc/ivyfile/publications.html
    incubator/ivy/core/trunk/doc/ivyfile/repository.html
    incubator/ivy/core/trunk/doc/moreexamples.html
    incubator/ivy/core/trunk/doc/principle.html
    incubator/ivy/core/trunk/doc/resolver/chain.html
    incubator/ivy/core/trunk/doc/resolver/dual.html
    incubator/ivy/core/trunk/doc/resolver/filesystem.html
    incubator/ivy/core/trunk/doc/resolver/ibiblio.html
    incubator/ivy/core/trunk/doc/resolver/ivyrep.html
    incubator/ivy/core/trunk/doc/resolver/sftp.html
    incubator/ivy/core/trunk/doc/resolver/ssh.html
    incubator/ivy/core/trunk/doc/resolver/url.html
    incubator/ivy/core/trunk/doc/resolver/vfs.html
    incubator/ivy/core/trunk/doc/terminology.html
    incubator/ivy/core/trunk/doc/tutorial/build-repository.html
    incubator/ivy/core/trunk/doc/tutorial/build-repository/basic.html
    incubator/ivy/core/trunk/doc/tutorial/conf.html
    incubator/ivy/core/trunk/doc/tutorial/defaultconf.html
    incubator/ivy/core/trunk/doc/tutorial/multi-project.html
    incubator/ivy/core/trunk/doc/tutorial/start.html
    incubator/ivy/core/trunk/doc/use/artifactreport.html
    incubator/ivy/core/trunk/doc/use/cachefileset.html
    incubator/ivy/core/trunk/doc/use/configure.html
    incubator/ivy/core/trunk/doc/use/findrevision.html
    incubator/ivy/core/trunk/doc/use/info.html
    incubator/ivy/core/trunk/doc/use/install.html
    incubator/ivy/core/trunk/doc/use/listmodules.html
    incubator/ivy/core/trunk/doc/use/publish.html
    incubator/ivy/core/trunk/doc/use/report.html
    incubator/ivy/core/trunk/doc/use/repreport.html
    incubator/ivy/core/trunk/doc/use/resolve.html
    incubator/ivy/core/trunk/doc/use/settings.html
    incubator/ivy/core/trunk/doc/use/var.html
    incubator/ivy/core/trunk/doc/yed.html

Modified: incubator/ivy/core/trunk/doc/ant.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ant.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ant.html (original)
+++ incubator/ivy/core/trunk/doc/ant.html Thu Jul  5 07:12:52 2007
@@ -62,8 +62,8 @@
 
 Those 3 tasks follow the 3 main steps of ivy retrieving dependencies process:
 <ul>
-<li>First the configure task tells it how it can find dependencies giving it a path to an <a href="../doc/configuration.html">xml configuration file</a>.</li> 
-<li>Then the resolve task actually resolve dependencies described by an <a href="../doc/ivyfile.html">ivy file</a>, and put those dependencies in the ivy cache (a directory configured in the configuration file).</li>
+<li>First the configure task tells it how it can find dependencies giving it a path to an <a href="configuration.html">xml configuration file</a>.</li> 
+<li>Then the resolve task actually resolve dependencies described by an <a href="ivyfile.html">ivy file</a>, and put those dependencies in the ivy cache (a directory configured in the configuration file).</li>
 <li>Finally the retrieve task copies dependencies from the cache to anywhere you want in your file system. You can then use those dependencies to make your classpath with standard ant paths.</li>
 </ul>
 

Modified: incubator/ivy/core/trunk/doc/bestpractices.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/bestpractices.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/bestpractices.html (original)
+++ incubator/ivy/core/trunk/doc/bestpractices.html Thu Jul  5 07:12:52 2007
@@ -32,9 +32,9 @@
 
 It is a good practice to write or download module descriptors for all the modules involved in your development, even for your third party dependencies, and even if they don't provide themselves such module descriptors.
 
-First it will seem like an extra work, and require time. But when you will have several modules using the same third party library, and than you will only need to add one line to your ivy file to get this library and all its own dependencies that you really need (if you have good module descriptors in your repository, especially with the use of module <a href="../doc/concept#configurations.html">configurations</a>). It will also be very helpful when you want to upgrade a dependency. One single change in your module ivy file and you will get the updated version with its updated (or not) dependencies.
+First it will seem like an extra work, and require time. But when you will have several modules using the same third party library, and than you will only need to add one line to your ivy file to get this library and all its own dependencies that you really need (if you have good module descriptors in your repository, especially with the use of module <a href="concept#configurations.html">configurations</a>). It will also be very helpful when you want to upgrade a dependency. One single change in your module ivy file and you will get the updated version with its updated (or not) dependencies.
 
-Therefore we recommend to add ivy files for all the modules in your repository, you can even enforce this rule by setting the allownomd attribute to false on your <a href="../doc/configuration/resolvers.html">resolvers</a>. Hence you shouldn't need to use the dependency artifact inclusion/exclusion/specification feature of Ivy, which should only be used in very specific cases.
+Therefore we recommend to add ivy files for all the modules in your repository, you can even enforce this rule by setting the allownomd attribute to false on your <a href="configuration/resolvers.html">resolvers</a>. Hence you shouldn't need to use the dependency artifact inclusion/exclusion/specification feature of Ivy, which should only be used in very specific cases.
 
 <h1>Use your own enterprise repository</h1>
 This is usually not a valid recommendation for open source projects, but for the enterprise world we strongly suggest to avoid relying on a public repository like maven ibiblio or ivyrep. Why? Well, there are a couple of reasons:
@@ -47,10 +47,10 @@
 Note that it's not because you use an enterprise repository that you have to build it entirely by hand. Ivy features an [[ant:install]] task which can be used to install modules from a repository to another one, so it can be used to selectively install modules from a public repository to your enterprise repository, where you will then be able to ensure control, reliability and accuracy.
 
 <h1>Always use patterns with at least organisation and module</h1>
-Ivy is very flexible and can accomodate a lot of existing repositories, using the concept of <a href="../doc/concept#pattern.html">patterns</a>. But if your repository doesn't exist yet, we strongly recommend to always use the organisation and the module name in your pattern, even for private repository where you put only your own modules (which all the same organisation). Why? Because Ivy listing feature rely on the token it can find in the pattern. If you have no organisation token in your pattern, Ivy won't be able to list the (only?) organisation in your repository. And this can be a problem for code completion in IvyDE, for example, but also for repository wide tasks like [[ant:install]] or [[ant:repreport]].
+Ivy is very flexible and can accomodate a lot of existing repositories, using the concept of <a href="concept#pattern.html">patterns</a>. But if your repository doesn't exist yet, we strongly recommend to always use the organisation and the module name in your pattern, even for private repository where you put only your own modules (which all the same organisation). Why? Because Ivy listing feature rely on the token it can find in the pattern. If you have no organisation token in your pattern, Ivy won't be able to list the (only?) organisation in your repository. And this can be a problem for code completion in IvyDE, for example, but also for repository wide tasks like [[ant:install]] or [[ant:repreport]].
 
 <h1>Public ivysettings.xml with public repositories</h1>
-If you create a public repository, provide an url to corresponding <a href="../doc/configuration.html">ivysettings.xml</a>. It's pretty easy to do, and if someone want to leverage your repository, he will just have to call [[ant:configure]] with the url of your ivysettings.xml, or <a href="../doc/configuration/include.html">include</a> it in its own configuration file, which makes it really easy to combine several public repositories.
+If you create a public repository, provide an url to corresponding <a href="configuration.html">ivysettings.xml</a>. It's pretty easy to do, and if someone want to leverage your repository, he will just have to call [[ant:configure]] with the url of your ivysettings.xml, or <a href="configuration/include.html">include</a> it in its own configuration file, which makes it really easy to combine several public repositories.
 
 <h1>Dealing with integration versions</h1>
 Very often especially when working in a team or with several modules, you will need to rely on intermediate, non finalized versions of your modules. These versions are what we call integration versions, because their main objective is to be integrated with other modules to make and test an application or a framework. 
@@ -61,8 +61,8 @@
 
 There are basically two ways to deal with them, both ways being supported by Ivy:
 <ul>
-<li>use a naming convention like a special suffix</li> the idea is pretty simple, each time you publish a new integration of your module you give the same name to the version (in maven world this is for example 1.0-SNAPSHOT). The dependency manager should then be aware that this version is special because it changes over time, so that it does not trust its local cache if it already has the version, but check the date of the version on the repository and see if it hass changed. In Ivy this is supported using the <a href="../doc/ivyfile/dependency.html">changing attribute</a> on a dependency or by configuring the <a href="../doc/configuration/resolvers.html">changing pattern</a> to use for all your modules.
-<li>create automatically a new version for each</li> in this case you use either a build number or a timestamp to publish each new integration version with a new version name. Then you can use one of the numerous ways in Ivy to <a href="../doc/ivyfile/dependency.html">express a version constraint</a>. Usually selecting the very latest one (using 'latest.integration' as version constraint) is enough.
+<li>use a naming convention like a special suffix</li> the idea is pretty simple, each time you publish a new integration of your module you give the same name to the version (in maven world this is for example 1.0-SNAPSHOT). The dependency manager should then be aware that this version is special because it changes over time, so that it does not trust its local cache if it already has the version, but check the date of the version on the repository and see if it hass changed. In Ivy this is supported using the <a href="ivyfile/dependency.html">changing attribute</a> on a dependency or by configuring the <a href="configuration/resolvers.html">changing pattern</a> to use for all your modules.
+<li>create automatically a new version for each</li> in this case you use either a build number or a timestamp to publish each new integration version with a new version name. Then you can use one of the numerous ways in Ivy to <a href="ivyfile/dependency.html">express a version constraint</a>. Usually selecting the very latest one (using 'latest.integration' as version constraint) is enough.
 </ul>
 
 So, which way is the best? As often, it depends on your context, and if one of the two was really bad it wouldn't be supported in Ivy :-)

Modified: incubator/ivy/core/trunk/doc/concept.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/concept.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/concept.html (original)
+++ incubator/ivy/core/trunk/doc/concept.html Thu Jul  5 07:12:52 2007
@@ -37,7 +37,7 @@
 
 As you see, a dependency resolver can be thought as a class responsible of describing a repository.
 
-If you want to see which resolvers are available in ivy, you can go to the corresponding <a href="../doc/configuration/resolvers.html">configuration section</a>
+If you want to see which resolvers are available in ivy, you can go to the corresponding <a href="configuration/resolvers.html">configuration section</a>
 
 <h1><a name="configurations">Module configurations explained</a></h1>
 Module configurations are described in the terminology page as <em>a way to use or construct a module</em>. Configurations being a central part of Ivy, they need more explanations as a concept.
@@ -48,7 +48,7 @@
 
 If you use only simple modules and do not want to worry about configurations, you don't have to worry about them. They're still there under the hood, cause ivy can't work without configuration. But most of the time if you declare nothing, ivy assumes that the artifacts of your module are published in all configurations, and that all the dependencies configurations are required in all configurations. And it works in simple cases. But whenever you want to separate things within a module, or get more control over things published and got through dependencies resolution, configuration may answer most of your needs.
 
-For details on how to declare your module configurations, how declare in which configuration your artifacts are published, and how to declare configuration mapping, please refer to <a href="../doc/ivyfile.html">ivy file documentation</a>. The <a href="../doc/tutorial/conf.html">configurations tutorial</a> is also a good place to go to learn more about this concept.
+For details on how to declare your module configurations, how declare in which configuration your artifacts are published, and how to declare configuration mapping, please refer to <a href="ivyfile.html">ivy file documentation</a>. The <a href="tutorial/conf.html">configurations tutorial</a> is also a good place to go to learn more about this concept.
 
 <h1><a name="variables"></a>Variables</h1>
 During configuration, ivy allows to define what are called ivy variables. Ivy variables can be seen as ant properties, and are used in a very similar way. In particular, you use a properties tag in the configuration file to load a properties file containing ivy variables and their values.
@@ -66,7 +66,7 @@
 
 Finally, it's also important to be aware of the time of substitution of variables. This substitution is done as soon as possible. This means that when ivy encounter a reference to a variable, it tries to substitute it if such a variable is defined. Consequently, <strong>any later modification of the variable will not alter the value already substituted</strong>.
 
-Moreover, in an ant environment, a bunch of variables are going to be set by default via the ant property file loading mechanism (in fact they are first loaded as ant properties and then imported as ivy variables, see <a href="../doc/use.html"></a>), and even in the ant properties themselves there is going to be eager substitution on loading, effectively making it impossible to override some variable purely via the ivysettings.properties file. Some variables will really only be able to be overriden via ant properties because of this.
+Moreover, in an ant environment, a bunch of variables are going to be set by default via the ant property file loading mechanism (in fact they are first loaded as ant properties and then imported as ivy variables, see <a href="use.html"></a>), and even in the ant properties themselves there is going to be eager substitution on loading, effectively making it impossible to override some variable purely via the ivysettings.properties file. Some variables will really only be able to be overriden via ant properties because of this.
 
 Moreover, it's also important to understand the difference between ivy variables and ivy pattern tokens. 
 See Patterns chapter below to see what pattern tokens are.
@@ -138,7 +138,7 @@
 <li>latest-lexico</li>: it compares the revisions as string, using lexicographic order (the one used by java string comparison).
 </ul>
 
-See also how to configure new latest strategies <a href="../doc/configuration/latest-strategies.html">here</a>.
+See also how to configure new latest strategies <a href="configuration/latest-strategies.html">here</a>.
 
 <h1><a name="conflict">Conflict Manager</a></h1>
 A conflict manager is able to select, among a list of module revisions in conflict, a list of revisions to keep.
@@ -147,9 +147,9 @@
 
 A list of revisions is said to be in conflict if they correspond to the same module, i.e. the same organisation/module name couple.
 
-The list of available conflict managers is available on the <a href="../doc/configuration/conflict-managers.html">conflict manager configuration page</a>.
+The list of available conflict managers is available on the <a href="configuration/conflict-managers.html">conflict manager configuration page</a>.
 
-To have more details on how to setup your conflict managers by module, see <a href="../doc/ivyfile/conflicts.html">conflicts</a> section in ivy file reference.
+To have more details on how to setup your conflict managers by module, see <a href="ivyfile/conflicts.html">conflicts</a> section in ivy file reference.
 
 <h1><a name="matcher">Pattern matcher</a></h1>
 <span class="since">since 1.3</span>
@@ -189,7 +189,7 @@
 ${repository.dir}/[organisation]/[module]/[color]/[revision]/[artifact].[ext]
 </code>
 
-Note that in order to use extra attributes, you will need to disable ivy file validation, since your files won't fulffill anymore the official ivy xsd. See the <a href="../doc/configuration/conf.html">configuration doc page</a> to see how to disable validation.
+Note that in order to use extra attributes, you will need to disable ivy file validation, since your files won't fulffill anymore the official ivy xsd. See the <a href="configuration/conf.html">configuration doc page</a> to see how to disable validation.
 <h1><a name="checksum">Checksums</a></h1>
 <span class="since">since 1.4</span>
 Ivy allow to use checksums, also known as digester, to verify the correctness of a downloaded file.
@@ -214,7 +214,7 @@
 
 This is a particularly powerful and flexible feature which allow for example to perform a build of a dependency just before it is resolved, or follow what's happening during the dependency resolution process accuratly, and so on.
 
-For more details about event and triggers, see the <a href="../doc/configuration/triggers.html">triggers</a> documentation page in the configuration section of this documentation.
+For more details about event and triggers, see the <a href="configuration/triggers.html">triggers</a> documentation page in the configuration section of this documentation.
 
 <h1><a name="circular">Circular Dependencies</a></h1>
 <span class="since">since 1.4</span>
@@ -229,7 +229,7 @@
 <li>error</li> halt the dependency resolution when a circular dependency is found. 
 </ul>
 
-See the <a href="../doc/configuration/conf.html">configuration page</a> to see how to configure the circular dependency strategy you want to use.
+See the <a href="configuration/conf.html">configuration page</a> to see how to configure the circular dependency strategy you want to use.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>

Modified: incubator/ivy/core/trunk/doc/configuration.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration.html (original)
+++ incubator/ivy/core/trunk/doc/configuration.html Thu Jul  5 07:12:52 2007
@@ -25,10 +25,10 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-In order to work as you want, ivy sometimes need some settings. Actually, ivy can work with no specific settings at all, see the <a href="../doc/tutorial/defaultconf.html">default settings documentation</a> for details about that. But ivy is able 
+In order to work as you want, ivy sometimes need some settings. Actually, ivy can work with no specific settings at all, see the <a href="tutorial/defaultconf.html">default settings documentation</a> for details about that. But ivy is able 
 to work in very different contexts. You just have to configure it properly.
 
-Settings are specified through an xml file, usually called ivysettings.xml. To configure ivy from ant, you just have to call the configure task and pass it the path to your settings file (see <a href="../doc/use/configure.html">configure</a> task documentation for details).
+Settings are specified through an xml file, usually called ivysettings.xml. To configure ivy from ant, you just have to call the configure task and pass it the path to your settings file (see <a href="use/configure.html">configure</a> task documentation for details).
 
 Here is an example of settings file :
 <code type="xml">
@@ -67,36 +67,36 @@
 
 <pre>
 ivysettings
-    <a href="../doc/configuration/property.html">property</a>
-    <a href="../doc/configuration/properties.html">properties</a>
-    <a href="../doc/configuration/conf.html">settings</a>
-    <a href="../doc/configuration/include.html">include</a>
-    <a href="../doc/configuration/classpath.html">classpath</a>
-    <a href="../doc/configuration/typedef.html">typedef</a>
-    <a href="../doc/configuration/latest-strategies.html">latest-strategies</a>
-    <a href="../doc/configuration/version-matchers.html">version-matchers</a>
-    <a href="../doc/configuration/triggers.html">triggers</a>
-    <a href="../doc/configuration/parsers.html">parsers</a>
-    <a href="../doc/configuration/conflict-managers.html">conflict-managers</a>
-    <a href="../doc/configuration/outputters.html">outputters</a>
-    <a href="../doc/configuration/namespaces.html">namespaces</a>
-        <a href="../doc/configuration/namespace.html">namespace</a>
-            <a href="../doc/configuration/namespace/rule.html">rule</a>
-                <a href="../doc/configuration/namespace/fromtosystem.html">fromsystem</a>
-                    <a href="../doc/configuration/namespace/src.html">src</a>
-                    <a href="../doc/configuration/namespace/dest.html">dest</a>
-                <a href="../doc/configuration/namespace/fromtosystem.html">tosystem</a>
-                    <a href="../doc/configuration/namespace/src.html">src</a>
-                    <a href="../doc/configuration/namespace/dest.html">dest</a>
-    <a href="../doc/configuration/macrodef.html">macrodef</a>
-        <a href="../doc/configuration/macrodef/attribute.html">attribute</a>
+    <a href="configuration/property.html">property</a>
+    <a href="configuration/properties.html">properties</a>
+    <a href="configuration/conf.html">settings</a>
+    <a href="configuration/include.html">include</a>
+    <a href="configuration/classpath.html">classpath</a>
+    <a href="configuration/typedef.html">typedef</a>
+    <a href="configuration/latest-strategies.html">latest-strategies</a>
+    <a href="configuration/version-matchers.html">version-matchers</a>
+    <a href="configuration/triggers.html">triggers</a>
+    <a href="configuration/parsers.html">parsers</a>
+    <a href="configuration/conflict-managers.html">conflict-managers</a>
+    <a href="configuration/outputters.html">outputters</a>
+    <a href="configuration/namespaces.html">namespaces</a>
+        <a href="configuration/namespace.html">namespace</a>
+            <a href="configuration/namespace/rule.html">rule</a>
+                <a href="configuration/namespace/fromtosystem.html">fromsystem</a>
+                    <a href="configuration/namespace/src.html">src</a>
+                    <a href="configuration/namespace/dest.html">dest</a>
+                <a href="configuration/namespace/fromtosystem.html">tosystem</a>
+                    <a href="configuration/namespace/src.html">src</a>
+                    <a href="configuration/namespace/dest.html">dest</a>
+    <a href="configuration/macrodef.html">macrodef</a>
+        <a href="configuration/macrodef/attribute.html">attribute</a>
         any resolver
-    <a href="../doc/configuration/resolvers.html">resolvers</a>
+    <a href="configuration/resolvers.html">resolvers</a>
         any resolver
-    <a href="../doc/configuration/modules.html">modules</a>
-        <a href="../doc/configuration/module.html">module</a>
-    <a href="../doc/configuration/statuses.html">statuses</a>
-        <a href="../doc/configuration/status.html">status</a>
+    <a href="configuration/modules.html">modules</a>
+        <a href="configuration/module.html">module</a>
+    <a href="configuration/statuses.html">statuses</a>
+        <a href="configuration/status.html">status</a>
 </pre>
 
 <h1>ivysettings</h1>
@@ -109,39 +109,39 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../doc/configuration/property.html">property</a></td><td>set an ivy variable</td>
+    <tr><td><a href="configuration/property.html">property</a></td><td>set an ivy variable</td>
         <td>0..n</td></tr>
-    <tr><td><a href="../doc/configuration/properties.html">properties</a></td><td>loads a properties file as ivy variables</td>
+    <tr><td><a href="configuration/properties.html">properties</a></td><td>loads a properties file as ivy variables</td>
         <td>0..n</td></tr>
-    <tr><td><a href="../doc/configuration/conf.html">settings</a></td><td>configures ivy with some defaults</td>
+    <tr><td><a href="configuration/conf.html">settings</a></td><td>configures ivy with some defaults</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/include.html">include</a></td><td>includes another settings file</td>
+    <tr><td><a href="configuration/include.html">include</a></td><td>includes another settings file</td>
         <td>0..n</td></tr>
-    <tr><td><a href="../doc/configuration/classpath.html">classpath</a></td><td>add a location in the classpath used to load plugins</td>
+    <tr><td><a href="configuration/classpath.html">classpath</a></td><td>add a location in the classpath used to load plugins</td>
         <td>0..n</td></tr>
-    <tr><td><a href="../doc/configuration/typedef.html">typedef</a></td><td>defines new types in ivy</td>
+    <tr><td><a href="configuration/typedef.html">typedef</a></td><td>defines new types in ivy</td>
         <td>0..n</td></tr>
-    <tr><td><a href="../doc/configuration/latest-strategies.html">latest-strategies</a></td><td>defines latest strategies</td>
+    <tr><td><a href="configuration/latest-strategies.html">latest-strategies</a></td><td>defines latest strategies</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/parsers.html">parsers</a></td><td>defines module descriptor parsers</td>
+    <tr><td><a href="configuration/parsers.html">parsers</a></td><td>defines module descriptor parsers</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/version-matchers.html">version-matchers</a></td><td>defines new version matchers</td>
+    <tr><td><a href="configuration/version-matchers.html">version-matchers</a></td><td>defines new version matchers</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/triggers.html">triggers</a></td><td>register triggers on ivy events</td>
+    <tr><td><a href="configuration/triggers.html">triggers</a></td><td>register triggers on ivy events</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/namespaces.html">namespaces</a></td><td>defines new namespaces</td>
+    <tr><td><a href="configuration/namespaces.html">namespaces</a></td><td>defines new namespaces</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/macrodef.html">macrodef</a></td><td>defines a new macro resolver</td>
+    <tr><td><a href="configuration/macrodef.html">macrodef</a></td><td>defines a new macro resolver</td>
         <td>0..n</td></tr>
-    <tr><td><a href="../doc/configuration/resolvers.html">resolvers</a></td><td>defines dependency resolvers</td>
+    <tr><td><a href="configuration/resolvers.html">resolvers</a></td><td>defines dependency resolvers</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/conflict-managers.html">conflict-managers</a></td><td>defines conflicts managers</td>
+    <tr><td><a href="configuration/conflict-managers.html">conflict-managers</a></td><td>defines conflicts managers</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/modules.html">modules</a></td><td>defines rules between modules and dependency resolvers</td>
+    <tr><td><a href="configuration/modules.html">modules</a></td><td>defines rules between modules and dependency resolvers</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/outputters.html">outputters</a></td><td>defines the list of available report outputters</td>
+    <tr><td><a href="configuration/outputters.html">outputters</a></td><td>defines the list of available report outputters</td>
         <td>0..1</td></tr>
-    <tr><td><a href="../doc/configuration/statuses.html">statuses</a></td><td>defines the list of available statuses</td>
+    <tr><td><a href="configuration/statuses.html">statuses</a></td><td>defines the list of available statuses</td>
         <td>0..1</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/configuration/conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/conf.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/conf.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/conf.html Thu Jul  5 07:12:52 2007
@@ -58,9 +58,9 @@
         <td>No, defaults to latest-revision</td></tr>
     <tr><td>defaultConflictManager</td><td>the name of the default conflict manager to use</td>
         <td>No, defaults to latest-revision</td></tr>
-    <tr><td>defaultBranch</td><td>the default branch to use for all modules, except if they have a <a href="../../doc/configuration/module.html"> module specific branch setting</a>. <span class="since">since 1.4</span></td>
+    <tr><td>defaultBranch</td><td>the default branch to use for all modules, except if they have a <a href="../configuration/module.html"> module specific branch setting</a>. <span class="since">since 1.4</span></td>
         <td>No, defaults to no default branch</td></tr>
-    <tr><td><a name="circularDependencyStrategy"></a>circularDependencyStrategy</td><td>the name of the <a href="../../doc/concept.html#circular">circular dependency strategy</a> to use <span class="since">since 1.4</span></td>
+    <tr><td><a name="circularDependencyStrategy"></a>circularDependencyStrategy</td><td>the name of the <a href="../concept.html#circular">circular dependency strategy</a> to use <span class="since">since 1.4</span></td>
         <td>No, defaults to warn</td></tr>
     <tr><td>validate</td><td>Indicates if ivy files should be validated against ivy.xsd or not.</td>
         <td>No, defaults to true</td></tr>

Modified: incubator/ivy/core/trunk/doc/configuration/conflict-managers.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/conflict-managers.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/conflict-managers.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/conflict-managers.html Thu Jul  5 07:12:52 2007
@@ -27,7 +27,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> conflict-managers
 
-Defines a list of <a href="../../doc/concept#conflict.html">conflicts managers</a> usable in ivy. Each conflict manager is identified by its name, given as an attribute.
+Defines a list of <a href="../concept.html#conflict">conflicts managers</a> usable in ivy. Each conflict manager is identified by its name, given as an attribute.
 The child tag used for the conflict manager must be equal to a name of a conflict manager type (either built-in
 or added with the typedef tag).
 
@@ -39,7 +39,7 @@
 <li>strict</li> this conflict manager throws an exception (i.e. causes a build failure) whenever a conflict is found.
 </ul>
 The two "latest" conflict managers also take into account the force attribute of the dependencies.
-Indeed direct dependencies can declare a force attribute (see <a href="../../doc/ivyfile/dependency.html">dependency</a>), which indicates the the revision given in the direct dependency should be prefered over indirect dependencies.
+Indeed direct dependencies can declare a force attribute (see <a href="../ivyfile/dependency.html">dependency</a>), which indicates the the revision given in the direct dependency should be prefered over indirect dependencies.
 
 Here is a list of conflict manager types available, which can be used to define your own custom conflict managers:
 <ul>

Modified: incubator/ivy/core/trunk/doc/configuration/include.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/include.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/include.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/include.html Thu Jul  5 07:12:52 2007
@@ -69,7 +69,7 @@
   </resolvers>
 </ivysettings> 
 </code>
-with ivysettings-macro.xml being the ivysettings example given on the <a href="../../doc/configuration/macrodef.html">macrodef documentation page</a>.
+with ivysettings-macro.xml being the ivysettings example given on the <a href="../configuration/macrodef.html">macrodef documentation page</a>.
 This let reusing macro resolver easy.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>

Modified: incubator/ivy/core/trunk/doc/configuration/latest-strategies.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/latest-strategies.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/latest-strategies.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/latest-strategies.html Thu Jul  5 07:12:52 2007
@@ -27,7 +27,7 @@
 	<textarea id="xooki-source">
 <b>Tag:</b> latest-strategies
 
-Defines a list of <a href="../../doc/concept#latest.html">latest strategies</a> usable in ivy. Each latest strategy is identified by its name, given as an attribute.
+Defines a list of <a href="../concept#latest.html">latest strategies</a> usable in ivy. Each latest strategy is identified by its name, given as an attribute.
 The child tag used for the latest strategy must be equal to a name of a latest strategy type (usually added with the typedef tag).
 
 The latest strategies which are always included in ivy (and do not require anything in the configuration file) are:

Modified: incubator/ivy/core/trunk/doc/configuration/macrodef.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/macrodef.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/macrodef.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/macrodef.html Thu Jul  5 07:12:52 2007
@@ -31,7 +31,7 @@
 
 This task eases the lot the process of creating new dependency resolver, because it avoid writing java code.
 
-It is generally used in combination with the <a href="../../doc/configuration/include.html">include</a> feature to help reusing macro at several places.
+It is generally used in combination with the <a href="../configuration/include.html">include</a> feature to help reusing macro at several places.
 
 A macro is defined by writing the resolver it is equivalent to as if it were written in the resolver place, except that you can use attributes to pass parameters to the newly defined resolver type. Attributes are defined with a name and sometimes a default value, and are used using the following syntax: <code>@{attributename}</code>.
 <h1>Attributes</h1>
@@ -50,7 +50,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/configuration/macrodef/attribute.html">attribute</a></td><td>defines an attribute for the macro resolver</td>
+    <tr><td><a href="../configuration/macrodef/attribute.html">attribute</a></td><td>defines an attribute for the macro resolver</td>
         <td>0..n</td></tr>
     <tr><td>any resolver</td><td>defines the base resolver upon which this macro is defined</td>
         <td>1</td></tr>

Modified: incubator/ivy/core/trunk/doc/configuration/module.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/module.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/module.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/module.html Thu Jul  5 07:12:52 2007
@@ -33,9 +33,9 @@
 
 For each module set, you can configure:
 <ul>
-<li>the <a href="../../doc/configuration/resolvers.html">resolver</a> to use</li>
-<li>the <a href="../../doc/configuration/conflict-managers.html">conflict manager</a> to use</li>
-<li>the default <a href="../../doc/terminology#branch.html">branch</a> to use</li>
+<li>the <a href="../configuration/resolvers.html">resolver</a> to use</li>
+<li>the <a href="../configuration/conflict-managers.html">conflict manager</a> to use</li>
+<li>the default <a href="../terminology#branch.html">branch</a> to use</li>
 </ul>
 
 <h1>Attributes</h1>

Modified: incubator/ivy/core/trunk/doc/configuration/modules.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/modules.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/modules.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/modules.html Thu Jul  5 07:12:52 2007
@@ -41,7 +41,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/configuration/module.html">module</a></td><td>defines a module set rule</td>
+    <tr><td><a href="../configuration/module.html">module</a></td><td>defines a module set rule</td>
         <td>1..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/configuration/namespace.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/namespace.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/namespace.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/namespace.html Thu Jul  5 07:12:52 2007
@@ -29,7 +29,7 @@
 
 Defines a new namespace. A namespace is identified by a name, which is used to reference the namespace in the resolvers using the namespace.
 
-Namespaces overview is given in the <a href="../../doc/configuration/namespaces.html">namespaces</a> documentation.
+Namespaces overview is given in the <a href="../configuration/namespaces.html">namespaces</a> documentation.
 
 A namespace mainly consists of a list of rules, each rule defining a translation between system namespace and the defined namespace, and vice versa.
 
@@ -52,7 +52,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/configuration/namespace/rule.html">rule</a></td><td>defines a new namespace rule</td>
+    <tr><td><a href="../configuration/namespace/rule.html">rule</a></td><td>defines a new namespace rule</td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/configuration/namespace/fromtosystem.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/namespace/fromtosystem.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/namespace/fromtosystem.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/namespace/fromtosystem.html Thu Jul  5 07:12:52 2007
@@ -34,9 +34,9 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../../doc/configuration/namespace/src.html">src</a></td><td>defines a source name which can be accepted</td>
+    <tr><td><a href="../../configuration/namespace/src.html">src</a></td><td>defines a source name which can be accepted</td>
         <td>1..n</td></tr>
-    <tr><td><a href="../../../doc/configuration/namespace/dest.html">dest</a></td><td>defines the translation to apply when a name is accepted by an src pattern</td>
+    <tr><td><a href="../../configuration/namespace/dest.html">dest</a></td><td>defines the translation to apply when a name is accepted by an src pattern</td>
         <td>1</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/configuration/namespace/rule.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/namespace/rule.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/namespace/rule.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/namespace/rule.html Thu Jul  5 07:12:52 2007
@@ -29,7 +29,7 @@
 
 Defines a new namespace rule. A rule defines a translation between system namespace and the defined namespace, and vice versa.
 
-See <a href="../../../doc/configuration/namespace/namespace.html">namespace</a> doc for details.
+See <a href="../../configuration/namespace/namespace.html">namespace</a> doc for details.
 
 <h1>Child elements</h1>
 <table class="ivy-children">
@@ -37,9 +37,9 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../../doc/configuration/namespace/fromtosystem.html">fromsystem</a></td><td>defines the translation to apply from system namespace to the defined namespace</td>
+    <tr><td><a href="../../configuration/namespace/fromtosystem.html">fromsystem</a></td><td>defines the translation to apply from system namespace to the defined namespace</td>
         <td>1</td></tr>
-    <tr><td><a href="../../../doc/configuration/namespace/fromtosystem.html">tosystem</a></td><td>defines the translation to apply from the defined namespace to system namespace</td>
+    <tr><td><a href="../../configuration/namespace/fromtosystem.html">tosystem</a></td><td>defines the translation to apply from the defined namespace to system namespace</td>
         <td>1</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/configuration/namespaces.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/namespaces.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/namespaces.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/namespaces.html Thu Jul  5 07:12:52 2007
@@ -40,7 +40,7 @@
 
 Ivy has an answer to give to this kind of troubles, and this answer is called namespaces. In short, you can affect a namespace to each dependency resolver in Ivy, and each namespace defines rules to convert names from the system namespace to the defined namespace itself, and vice versa.
 
-This very powerful feature is thoroughly used in the <a href="../../doc/tutorial/build-repository/advanced1.html">build your own repository tutorial</a>, and this is a good place to have examples of what can be done with namespaces.
+This very powerful feature is thoroughly used in the <a href="../tutorial/build-repository/advanced1.html">build your own repository tutorial</a>, and this is a good place to have examples of what can be done with namespaces.
 
 <h1>Child elements</h1>
 <table class="ivy-children">
@@ -48,7 +48,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/configuration/namespace.html">namespace</a></td><td>defines a new namespace</td>
+    <tr><td><a href="../configuration/namespace.html">namespace</a></td><td>defines a new namespace</td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/configuration/outputters.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/outputters.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/outputters.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/outputters.html Thu Jul  5 07:12:52 2007
@@ -47,7 +47,7 @@
 
 The child tag used for the parser must be equal to a name of a report outputter type (added with the typedef tag).
 
-To see how to define your own report outputter see <a href="../../doc/extend.html">Extending Ivy documentation</a>
+To see how to define your own report outputter see <a href="../extend.html">Extending Ivy documentation</a>
 
 <h1>Child elements</h1>
 <table class="ivy-children">

Modified: incubator/ivy/core/trunk/doc/configuration/resolvers.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/resolvers.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/resolvers.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/resolvers.html Thu Jul  5 07:12:52 2007
@@ -50,7 +50,7 @@
 <h1>Built-in Resolvers</h1>
 Ivy comes with a set of built-in dependency resolvers able to answer to the most common needs. 
 
-If you don't find the one you want here, you can also check if some one has not contributed it in the <a href="../../links.html">links page</a>, or even <a href="../../doc/extend.html">write your own</a>.
+If you don't find the one you want here, you can also check if some one has not contributed it in the <a href="../../links.html">links page</a>, or even <a href="../extend.html">write your own</a>.
 
 There are basically two types of resolver in Ivy: composite and standard resolvers. A composite resolver is a resolver which delegates the work to other resolvers. The other resolvers are standard resolvers.
 
@@ -61,15 +61,15 @@
     <tr><th>Name</th><th>Type</th><th>Description</th></tr>
 </thead>
 <tbody>
-<tr><td><a href="../../doc/resolver/ivyrep.html">IvyRep</a></td><td>Standard</td><td>Finds ivy files on ivyrep and artifacts on ibiblio.</td></tr>
-<tr><td><a href="../../doc/resolver/ibiblio.html">IBiblio</a></td><td>Standard</td><td>Finds artifacts on ibiblio.</td></tr>
-<tr><td><a href="../../doc/resolver/filesystem.html">FileSystem</a></td><td>Standard</td><td>This very performant resolver finds ivy files and artifacts in your file system.</td></tr>
-<tr><td><a href="../../doc/resolver/url.html">Url</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with urls.</td></tr>
-<tr><td><a href="../../doc/resolver/vfs.html">Vfs</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with <a href="http://jakarta.apache.org/commons/vfs/">apache commons vfs</a>.</td></tr>
-<tr><td><a href="../../doc/resolver/ssh.html">ssh</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with ssh.</td></tr>
-<tr><td><a href="../../doc/resolver/sftp.html">sftp</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with sftp.</td></tr>
-<tr><td><a href="../../doc/resolver/chain.html">Chain</a></td><td>Composite</td><td>Delegates the finding to a chain of sub resolvers.</td></tr>
-<tr><td><a href="../../doc/resolver/dual.html">Dual</a></td><td>Composite</td><td>Delegates the finding of ivy files to one resolver and of artifacts to another.</td></tr>
+<tr><td><a href="../resolver/ivyrep.html">IvyRep</a></td><td>Standard</td><td>Finds ivy files on ivyrep and artifacts on ibiblio.</td></tr>
+<tr><td><a href="../resolver/ibiblio.html">IBiblio</a></td><td>Standard</td><td>Finds artifacts on ibiblio.</td></tr>
+<tr><td><a href="../resolver/filesystem.html">FileSystem</a></td><td>Standard</td><td>This very performant resolver finds ivy files and artifacts in your file system.</td></tr>
+<tr><td><a href="../resolver/url.html">Url</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with urls.</td></tr>
+<tr><td><a href="../resolver/vfs.html">Vfs</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with <a href="http://jakarta.apache.org/commons/vfs/">apache commons vfs</a>.</td></tr>
+<tr><td><a href="../resolver/ssh.html">ssh</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with ssh.</td></tr>
+<tr><td><a href="../resolver/sftp.html">sftp</a></td><td>Standard</td><td>Finds ivy files and artifacts in any repository accessible with sftp.</td></tr>
+<tr><td><a href="../resolver/chain.html">Chain</a></td><td>Composite</td><td>Delegates the finding to a chain of sub resolvers.</td></tr>
+<tr><td><a href="../resolver/dual.html">Dual</a></td><td>Composite</td><td>Delegates the finding of ivy files to one resolver and of artifacts to another.</td></tr>
 </tbody>
 </table>
 
@@ -100,7 +100,7 @@
         <td>Yes</td>
         <td>Yes</td>
     </tr>
-    <tr><td>changingMatcher</td><td>The name of the <a href="../../doc/concept#matcher.html">pattern matcher</a> to use to match a revision against the configured changingPattern. <span class="since">since 1.4</span></td>
+    <tr><td>changingMatcher</td><td>The name of the <a href="../concept#matcher.html">pattern matcher</a> to use to match a revision against the configured changingPattern. <span class="since">since 1.4</span></td>
         <td>No, defaults to exactOrRegexp</td>
         <td>Yes</td>
         <td>Yes</td>
@@ -125,7 +125,7 @@
         <td>No (except dual)</td>
         <td>Yes</td>
     </tr>
-    <tr><td>checksums</td><td>a comma separated list of <a href="../../doc/concept#checksum.html">checksum algorithms</a> to use both for publication and checking <span class="since">since 1.4</span></td>
+    <tr><td>checksums</td><td>a comma separated list of <a href="../concept#checksum.html">checksum algorithms</a> to use both for publication and checking <span class="since">since 1.4</span></td>
         <td>No, defaults to ${ivy.checksums}</td>
         <td>No</td>
         <td>Yes</td>

Modified: incubator/ivy/core/trunk/doc/configuration/status.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/status.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/status.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/status.html Thu Jul  5 07:12:52 2007
@@ -29,7 +29,7 @@
 
 Define one available module status.
 
-See <a href="../../doc/configuration/statuses.html">statuses</a> page for details about how statuses are defined.
+See <a href="../configuration/statuses.html">statuses</a> page for details about how statuses are defined.
 
 <h1>Attributes</h1>
 <table class="ivy-attributes">

Modified: incubator/ivy/core/trunk/doc/configuration/statuses.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/statuses.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/statuses.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/statuses.html Thu Jul  5 07:12:52 2007
@@ -53,7 +53,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/configuration/status.html">status</a></td><td>defines a new status</td>
+    <tr><td><a href="../configuration/status.html">status</a></td><td>defines a new status</td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/configuration/triggers.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/triggers.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/triggers.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/triggers.html Thu Jul  5 07:12:52 2007
@@ -33,7 +33,7 @@
 A trigger is an action which is performed whenever a particular event occurs.
 Ivy supports two type of triggers out of the box: ant-call and ant-build. The first calls a target in the same build as the original one whenever a particular event occurs, the second call an ant build which may be in another ant build script.
 
-If you want to use a different trigger, you can <a href="../../doc/extend.html">implement your own</a>.
+If you want to use a different trigger, you can <a href="../extend.html">implement your own</a>.
 
 The event available in Ivy are the following ones:
 <table class="ivy-children">
@@ -145,8 +145,8 @@
     <tr><th>Name</th><th>Description</th></tr>
 </thead>
 <tbody>
-<tr><td>ant-build<a href="../../doc/trigger/ant-build.html"></a></td><td>Triggers an ant build.</td></tr>
-<tr><td>ant-call<a href="../../doc/trigger/ant-call.html"></a></td><td>Calls a target in the current ant build.</td></tr>
+<tr><td>ant-build<a href="../trigger/ant-build.html"></a></td><td>Triggers an ant build.</td></tr>
+<tr><td>ant-call<a href="../trigger/ant-call.html"></a></td><td>Calls a target in the current ant build.</td></tr>
 </tbody>
 </table>
 

Modified: incubator/ivy/core/trunk/doc/configuration/typedef.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/typedef.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/typedef.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/typedef.html Thu Jul  5 07:12:52 2007
@@ -28,7 +28,7 @@
 <b>Tag:</b> typedef<br/>
 <br/>
 Defines a new type in ivy. Useful to define new dependency resolvers, in particular, but also latest strategies.
-See <a href="../../doc/extend.html">how to write and plug your own dependency resolver</a> for details.
+See <a href="../extend.html">how to write and plug your own dependency resolver</a> for details.
 <h1>Attributes</h1>
 <table class="ivy-attributes">
 <thead>

Modified: incubator/ivy/core/trunk/doc/configuration/version-matchers.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/configuration/version-matchers.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/configuration/version-matchers.html (original)
+++ incubator/ivy/core/trunk/doc/configuration/version-matchers.html Thu Jul  5 07:12:52 2007
@@ -33,7 +33,7 @@
 
 A version matcher is used to evaluate if a a dependency version contraint matches a dependency version.
 
-See <a href="../../doc/ivyfile/dependency.html">dependency</a> doc for details about built-in version matchers.
+See <a href="../ivyfile/dependency.html">dependency</a> doc for details about built-in version matchers.
 
 <h1>Child elements</h1>
 <table class="ivy-children">

Modified: incubator/ivy/core/trunk/doc/intro.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/intro.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/intro.html (original)
+++ incubator/ivy/core/trunk/doc/intro.html Thu Jul  5 07:12:52 2007
@@ -27,31 +27,31 @@
 	<textarea id="xooki-source">
 Welcome to Ivy reference documentation!
 
-If you don't know Ivy at all, give a glance at its <a href="../features.html">features</a>, the <a href="../faq.html">FAQ</a> and the <a href="../doc/tutorial.html">tutorials</a> before digging into this reference documentation.
+If you don't know Ivy at all, give a glance at its <a href="../features.html">features</a>, the <a href="../faq.html">FAQ</a> and the <a href="tutorial.html">tutorials</a> before digging into this reference documentation.
 
 <h1>Reference Overview</h1>
 This documentation is decomposed in several parts:
 <ul>
 <li>Introduction</li>
 <ul>
-<li><a href="../doc/terminology.html">Terminology</a></li>
+<li><a href="terminology.html">Terminology</a></li>
 This part gives you the meaning of some words used all over ivy doc, such as organisation, module, configurations, settings, ...
-<li><a href="../doc/concept.html">Main Concepts</a></li>
+<li><a href="concept.html">Main Concepts</a></li>
 This part introduces the main concepts used in Ivy: dependency resolvers, variables, patterns, and also a good introduction to a central ivy concept: module configurations.
-<li><a href="../doc/principle.html">How does it work ?</a></li>
+<li><a href="principle.html">How does it work ?</a></li>
 As the title suggest, here you will have some explanations on how does ivy work internally, which can help to better understand and customize its use.
-<li><a href="../doc/install.html">Installation</a></li>
+<li><a href="install.html">Installation</a></li>
 This part describe how to install Ivy
 </ul>
-<li><a href="../doc/configuration.html">Settings</a></li>
+<li><a href="configuration.html">Settings</a></li>
 This part is dedicated to the specification of the settings file of Ivy (usually called ivysettings.xml). It also gives the list of built-in dependency resolvers available in ivy.
-<li><a href="../doc/ivyfile.html">Ivy files</a></li>
+<li><a href="ivyfile.html">Ivy files</a></li>
 This part is the reference of the specification of the ivy files, the files in which you describe your dependencies. If you have any question of what can be done or not in an ivy file, you will have the answer here.
-<li><a href="../doc/ant.html">Use from ant</a></li>
+<li><a href="ant.html">Use from ant</a></li>
 This part describes how to use ivy from ant. It's in this section that all ant tasks brought by ivy are specified.
-<li><a href="../doc/ant.html">Use standalone</a></li>
+<li><a href="ant.html">Use standalone</a></li>
 Even if Ivy is most often used from ant, it can also be used from the command line. This page describes how you can do it.
-<li><a href="../doc/extend.html">Extend</a></li>
+<li><a href="extend.html">Extend</a></li>
 This part describes how to extend ivy, by writing your own dependency resolver, latest strategy, etc.
 </ul>
 

Modified: incubator/ivy/core/trunk/doc/ivyfile.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile.html Thu Jul  5 07:12:52 2007
@@ -46,7 +46,7 @@
 
 If you want to see a sample file using almost all possibilities of ivy files, check this one, <a href="../samples/ivy-sample-xslt.xml">with</a> or <a href="../samples/ivy-sample.xml">without</a> xslt.
 
-Before beginning the reference itself, it is required to have in mind the terminology defined in the <a href="../doc/reference.html">main page</a> of this reference documentation.
+Before beginning the reference itself, it is required to have in mind the terminology defined in the <a href="reference.html">main page</a> of this reference documentation.
 
 For those familiar with xml schema, the schema used to validate ivy files can be found <a href="../schemas/ivy.xsd">here</a>. For those using xsd aware IDE, you can declare the xsd in your ivy files to benefit from code completion / validation:
 <code type="xml">
@@ -64,28 +64,28 @@
 <h1>Hierarchical Index</h1>
 <pre>
 ivy-module
-    <a href="../doc/ivyfile/info.html">info</a>
-        <a href="../doc/ivyfile/license.html">license</a>
-        <a href="../doc/ivyfile/ivyauthor.html">ivyauthor</a>
-        <a href="../doc/ivyfile/repository.html">repository</a>
-        <a href="../doc/ivyfile/description.html">description</a>
-    <a href="../doc/ivyfile/configurations.html">configurations</a>
-        <a href="../doc/ivyfile/conf.html">conf</a>
-    <a href="../doc/ivyfile/publications.html">publications</a>
-        <a href="../doc/ivyfile/artifact.html">artifact</a>
-            <a href="../doc/ivyfile/artifact-conf.html">conf</a>
-    <a href="../doc/ivyfile/dependencies.html">dependencies</a>
-        <a href="../doc/ivyfile/dependency.html">dependency</a>
-            <a href="../doc/ivyfile/dependency-conf.html">conf</a>
-                <a href="../doc/ivyfile/mapped.html">mapped</a>
-            <a href="../doc/ivyfile/dependency-artifact.html">artifact</a>
-                <a href="../doc/ivyfile/dependency-artifact-conf.html">conf</a>
-            <a href="../doc/ivyfile/dependency-artifact.html">include</a>
-                <a href="../doc/ivyfile/dependency-artifact-conf.html">conf</a>
-            <a href="../doc/ivyfile/artifact-exclude.html">exclude</a>
-                <a href="../doc/ivyfile/artifact-exclude-conf.html">conf</a>
-    <a href="../doc/ivyfile/conflicts.html">conflicts</a>
-        <a href="../doc/ivyfile/manager.html">manager</a>
+    <a href="ivyfile/info.html">info</a>
+        <a href="ivyfile/license.html">license</a>
+        <a href="ivyfile/ivyauthor.html">ivyauthor</a>
+        <a href="ivyfile/repository.html">repository</a>
+        <a href="ivyfile/description.html">description</a>
+    <a href="ivyfile/configurations.html">configurations</a>
+        <a href="ivyfile/conf.html">conf</a>
+    <a href="ivyfile/publications.html">publications</a>
+        <a href="ivyfile/artifact.html">artifact</a>
+            <a href="ivyfile/artifact-conf.html">conf</a>
+    <a href="ivyfile/dependencies.html">dependencies</a>
+        <a href="ivyfile/dependency.html">dependency</a>
+            <a href="ivyfile/dependency-conf.html">conf</a>
+                <a href="ivyfile/mapped.html">mapped</a>
+            <a href="ivyfile/dependency-artifact.html">artifact</a>
+                <a href="ivyfile/dependency-artifact-conf.html">conf</a>
+            <a href="ivyfile/dependency-artifact.html">include</a>
+                <a href="ivyfile/dependency-artifact-conf.html">conf</a>
+            <a href="ivyfile/artifact-exclude.html">exclude</a>
+                <a href="ivyfile/artifact-exclude-conf.html">conf</a>
+    <a href="ivyfile/conflicts.html">conflicts</a>
+        <a href="ivyfile/manager.html">manager</a>
 </pre>
 
 <h1>ivy-module</h1>

Modified: incubator/ivy/core/trunk/doc/ivyfile/artifact-conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/artifact-conf.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/artifact-conf.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/artifact-conf.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> conf <b>Parent:</b> <a href="../../doc/ivyfile/artifact.html">artifact</a><br/>
+<b>Tag:</b> conf <b>Parent:</b> <a href="../ivyfile/artifact.html">artifact</a><br/>
 <br/>
 Indicates a public configuration in which enclosing artifact is published.
 <h1>Attributes</h1>

Modified: incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude-conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude-conf.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude-conf.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude-conf.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> conf <b>Parent:</b> <a href="../../doc/ivyfile/artifact-exclude.html">artifact</a><br/>
+<b>Tag:</b> conf <b>Parent:</b> <a href="../ivyfile/artifact-exclude.html">artifact</a><br/>
 <br/>
 Specify a configuration in which the enclosing artifact exclusion should be included.
 

Modified: incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/artifact-exclude.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> exclude <b>Parent:</b> <a href="../../doc/ivyfile/dependency.html">dependency</a>
+<b>Tag:</b> exclude <b>Parent:</b> <a href="../ivyfile/dependency.html">dependency</a>
 
 This feature gives you more control on a dependency for which you do not control its ivy file. 
 It enables to restrict the artifacts required, by excluding artifacts being published by the dependency or any of its transitive dependencies, 
@@ -42,7 +42,7 @@
 </dependency>
 </code>
 
-<span class="since">since 2.0</span> A [[doc/ivyfile/exclude module wide exclude]] can also be used to exclude dependencies for the whole module (and not only in the context of one dependency as it is the case here).
+<span class="since">since 2.0</span> A [[ivyfile/exclude module wide exclude]] can also be used to exclude dependencies for the whole module (and not only in the context of one dependency as it is the case here).
 <h1>Attributes</h1>
 <table class="ivy-attributes">
 <thead>
@@ -72,7 +72,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/ivyfile/artifact-exclude-conf.html">conf</a></td><td>configuration in which the artifact should be included</td>
+    <tr><td><a href="../ivyfile/artifact-exclude-conf.html">conf</a></td><td>configuration in which the artifact should be included</td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/ivyfile/artifact.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/artifact.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/artifact.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/artifact.html Thu Jul  5 07:12:52 2007
@@ -25,9 +25,9 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> artifact <b>Parent:</b> <a href="../../doc/ivyfile/publications.html">publications</a>
+<b>Tag:</b> artifact <b>Parent:</b> <a href="../ivyfile/publications.html">publications</a>
 
-Declares an artifact published by this module. This is especially useful for other modules dependending on this one. They thus get all published artifacts belonging to the configurations asked. Indeed, each published artifact declares in which public configuration it is published. Thus a module depending on this module only get artifacts marked with the asked configurations, taking into account configurations extension (see <a href="../../doc/ivyfile/conf.html">configuration declaration</a>).
+Declares an artifact published by this module. This is especially useful for other modules dependending on this one. They thus get all published artifacts belonging to the configurations asked. Indeed, each published artifact declares in which public configuration it is published. Thus a module depending on this module only get artifacts marked with the asked configurations, taking into account configurations extension (see <a href="../ivyfile/conf.html">configuration declaration</a>).
 
 The configurations in which an artifact is published can be configured in two ways:
 <ul>
@@ -67,7 +67,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/ivyfile/artifact-conf.html">conf</a></td><td>indicates a public configuration in which this artifact is published</td>
+    <tr><td><a href="../ivyfile/artifact-conf.html">conf</a></td><td>indicates a public configuration in which this artifact is published</td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/ivyfile/conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/conf.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/conf.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/conf.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> conf <b>Parent:</b> <a href="../../doc/ivyfile/configurations.html">configurations</a>
+<b>Tag:</b> conf <b>Parent:</b> <a href="../ivyfile/configurations.html">configurations</a>
 
 Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those differents ways to use or build a module are called in ivy configurations.
 
@@ -47,7 +47,7 @@
 <span class="since">since 1.4</span> A whole configuration can be declared as non transitive, so that all dependencies resolved in this configuration will be resolved with transitivity disabled. Note that the transitivity is disabled for all the configuration dependencies (including those obtained because this conf extends other ones), and only for this configuration (which means that a conf extending this one with transitivityy enabled will get transitive dependencies even for dependencies being part of the non transitive configuration).
 This is very useful to build a compile configuration, for instance, forcing the dependency declaration on each direct dependency, with no risk to forget some because of transitivity.
 
-<span class="since">since 1.4</span> This tag supports <a href="../../doc/concept#extra.html">extra attributes</a>.
+<span class="since">since 1.4</span> This tag supports <a href="../concept#extra.html">extra attributes</a>.
 <h1>Attributes</h1>
 <table class="ivy-attributes">
 <thead>

Modified: incubator/ivy/core/trunk/doc/ivyfile/configurations.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/configurations.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/configurations.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/configurations.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> configurations <b>Parent:</b> <a href="../../doc/ivyfile.html">ivy-module</a>
+<b>Tag:</b> configurations <b>Parent:</b> <a href="../ivyfile.html">ivy-module</a>
 
 Container for configuration element. If this container is not present, it is assumed that the module has one public configuration called 'default'.
 
@@ -34,7 +34,7 @@
 A default conf mapping is very similar to the defaultconf which can be set on the dependencies tag, but it has a slightly different behaviour. 
 The default conf mapping not only defines the conf mapping to use when no conf mapping is specified for a dependency in this ivy file, but it also modify the way ivy interprets conf mapping with no mapped conf. In this case, Ivy will look in the default conf mapping and use the conf mapping defined in the default conf mapping for the conf for which there is no mapped conf.
 
-See <a href="../../doc/ivyfile/dependency#defaultconfmapping.html">examples on the dependency</a> page.
+See <a href="../ivyfile/dependency#defaultconfmapping.html">examples on the dependency</a> page.
 
 <span class="since">since 1.4</span> You can activate a confmappingoverride mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from.
 
@@ -57,9 +57,9 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/ivyfile/conf.html">conf</a></td><td>declares a configuration of this module</td>
+    <tr><td><a href="../ivyfile/conf.html">conf</a></td><td>declares a configuration of this module</td>
         <td>0..n</td></tr>
-    <tr><td><a href="../../doc/ivyfile/include.html">include</a></td><td>include configurations from another file</td>
+    <tr><td><a href="../ivyfile/include.html">include</a></td><td>include configurations from another file</td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/ivyfile/conflicts.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/conflicts.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/conflicts.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/conflicts.html Thu Jul  5 07:12:52 2007
@@ -25,12 +25,12 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> conflicts <b>Parent:</b> <a href="../../doc/ivyfile/ivy-module.html">ivy-module</a><br/><br/>
+<b>Tag:</b> conflicts <b>Parent:</b> <a href="../ivyfile/ivy-module.html">ivy-module</a><br/><br/>
 
 Container for conflict manager elements, used to indicate how conflicts should be resolved
 for this module. <br/><br/>
 
-The list of built-in conflict managers available is listed on the <a href="../../doc/configuration/conflict-managers.html">conflict manager configuration page</a>.<br/><br/>
+The list of built-in conflict managers available is listed on the <a href="../configuration/conflict-managers.html">conflict manager configuration page</a>.<br/><br/>
 
 Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies
 and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time
@@ -56,7 +56,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/ivyfile/manager.html">manager</a></td><td>declares a conflict manager for this module</td>
+    <tr><td><a href="../ivyfile/manager.html">manager</a></td><td>declares a conflict manager for this module</td>
         <td>1..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/ivyfile/dependencies.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/dependencies.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/dependencies.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/dependencies.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> dependencies <b>Parent:</b> <a href="../../doc/ivyfile/.html">ivy-module</a>
+<b>Tag:</b> dependencies <b>Parent:</b> <a href="../ivyfile/.html">ivy-module</a>
 
 Container for dependency elements, used to describe the dependencies of this module. 
 If this container is not present, it is assumed that the module has no dependency at all.
@@ -34,7 +34,7 @@
 
 <code>defaultconf</code> exists since Ivy 1.1 and enables to define the default conf attribute to use when no conf is defined for a dependency in this ivy file. It is only used when no conf mapping is defined, and has no influence in other cases.
 
-<code>defaultconfmapping</code> exists since Ivy 1.3 and enables not only to define the default conf mapping when no conf is specified for a dependency in this ivy file, but it also influence the way conf mapping with no mapped conf are interpreted (see <a href="../../doc/ivyfile/configurations.html">configurations doc page</a> for details about this).
+<code>defaultconfmapping</code> exists since Ivy 1.3 and enables not only to define the default conf mapping when no conf is specified for a dependency in this ivy file, but it also influence the way conf mapping with no mapped conf are interpreted (see <a href="../ivyfile/configurations.html">configurations doc page</a> for details about this).
 
 Note that if both defaultconf and defaultconfmapping are defined, it's the defaultconfmapping that is used. Note also that if several defaultconfmapping are defined (one in the configurations tag, one or several in included configurations file, and/or one in the dependency tag, then it's only the last which is taken into account, the others will have no effect at all.
 <h1>Attributes</h1>
@@ -55,9 +55,9 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/ivyfile/dependency.html">dependency</a></td><td>declares a dependency for this module</td>
+    <tr><td><a href="../ivyfile/dependency.html">dependency</a></td><td>declares a dependency for this module</td>
         <td>0..n</td></tr>
-    <tr><td><a href="../../doc/ivyfile/exclude.html">exclude</a></td><td>excludes artifacts, modules or whole organizations from the set of dependencies of this module <span class="since">since 2.0</span></td>
+    <tr><td><a href="../ivyfile/exclude.html">exclude</a></td><td>excludes artifacts, modules or whole organizations from the set of dependencies of this module <span class="since">since 2.0</span></td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact-conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact-conf.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact-conf.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact-conf.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency-artifact.html">artifact</a>
+<b>Tag:</b> conf <b>Parent:</b> <a href="../ivyfile/dependency-artifact.html">artifact</a>
 
 Specify a configuration in which the enclosing artifact specification should be included.
 

Modified: incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/dependency-artifact.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> artifact <b>Parent:</b> <a href="../../doc/ivyfile/dependency.html">dependency</a>
+<b>Tag:</b> artifact <b>Parent:</b> <a href="../ivyfile/dependency.html">dependency</a>
 
 This feature gives you more control on a dependency for which you do not control its ivy file. 
 It enables to specify the artifacts required, if the dependency has no ivy file. 
@@ -73,7 +73,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/ivyfile/dependency-artifact-conf.html">conf</a></td><td>configuration in which the artifact should be included</td>
+    <tr><td><a href="../ivyfile/dependency-artifact-conf.html">conf</a></td><td>configuration in which the artifact should be included</td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/ivyfile/dependency-conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/dependency-conf.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/dependency-conf.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/dependency-conf.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency.html">dependency</a><br/>
+<b>Tag:</b> conf <b>Parent:</b> <a href="../ivyfile/dependency.html">dependency</a><br/>
 <br/>
 Describes a configuration mapping for a dependency. See also the inline configuration mapping
 in dependency element.
@@ -50,7 +50,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/ivyfile/mapped.html">mapped</a></td><td>map dependency configurations for this master configuration</td>
+    <tr><td><a href="../ivyfile/mapped.html">mapped</a></td><td>map dependency configurations for this master configuration</td>
         <td>0..n</td></tr>
 </tbody>
 </table>

Modified: incubator/ivy/core/trunk/doc/ivyfile/dependency-include-conf.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/dependency-include-conf.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/dependency-include-conf.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/dependency-include-conf.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> conf <b>Parent:</b> <a href="../../doc/ivyfile/dependency-include.html">include</a>
+<b>Tag:</b> conf <b>Parent:</b> <a href="../ivyfile/dependency-include.html">include</a>
 
 Specify a configuration in which the enclosing artifact inclusion should be included.
 

Modified: incubator/ivy/core/trunk/doc/ivyfile/dependency-include.html
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/doc/ivyfile/dependency-include.html?view=diff&rev=553512&r1=553511&r2=553512
==============================================================================
--- incubator/ivy/core/trunk/doc/ivyfile/dependency-include.html (original)
+++ incubator/ivy/core/trunk/doc/ivyfile/dependency-include.html Thu Jul  5 07:12:52 2007
@@ -25,7 +25,7 @@
 </head>
 <body>
 	<textarea id="xooki-source">
-<b>Tag:</b> include <b>Parent:</b> <a href="../../doc/ivyfile/dependency.html">dependency</a>
+<b>Tag:</b> include <b>Parent:</b> <a href="../ivyfile/dependency.html">dependency</a>
 
 This feature gives you more control on a dependency for which you do not control its ivy file. 
 It enables to restrict the artifacts required by including only the artifacts given here, even if configuration does not a good separation of published artifacts.
@@ -67,7 +67,7 @@
     <tr><th class="ivy-chld">Element</th><th class="ivy-chld-desc">Description</th><th class="ivy-chld-card">Cardinality</th></tr>
 </thead>
 <tbody>
-    <tr><td><a href="../../doc/ivyfile/dependency-include-conf.html">conf</a></td><td>configuration in which the artifact should be included</td>
+    <tr><td><a href="../ivyfile/dependency-include-conf.html">conf</a></td><td>configuration in which the artifact should be included</td>
         <td>0..n</td></tr>
 </tbody>
 </table>