ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gin...@apache.org
Subject [1/2] ant-ivy git commit: Documentation review, second reading
Date Fri, 08 Sep 2017 13:54:30 GMT
Repository: ant-ivy
Updated Branches:
  refs/heads/master b693aa0a2 -> 59220b485


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/tutorial/defaultconf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/defaultconf.adoc b/asciidoc/tutorial/defaultconf.adoc
index b33f7b7..4a1b81e 100644
--- a/asciidoc/tutorial/defaultconf.adoc
+++ b/asciidoc/tutorial/defaultconf.adoc
@@ -175,7 +175,7 @@ By default, Ivy is configured using an `ivysettings.xml` which is packaged
in th
 
 ----
 
-OK, so not much info here, except a lot of inclusions. These inclusions have been done on
purpose so that you can easily change only one part of the ivysettings and easily benefit
from the rest. For example, if you want to define your own public resolver, you will just
have to configure Ivy with an ivysettings like the following:
+OK, so not much info here, except a lot of inclusions. These inclusions have been done on
purpose so that you can easily change only one part of the Ivy settings and easily benefit
from the rest. For example, if you want to define your own public resolver, you will just
have to configure Ivy with the settings like the following:
 
 [source, xml]
 ----
@@ -193,7 +193,7 @@ OK, so not much info here, except a lot of inclusions. These inclusions
have bee
 
 Note that only the `ivysettings-public.xml` inclusion has changed to include a homemade public
resolver. Note also that this can be used like that thanks to the fact that `${ivy.default.settings.dir}`
is a variable which is always set to the place where Ivy's default settings files are (i.e.
packaged in the jar).
 
-To finish this example, you have to write your own ivysettings file (that you will make available
at `http://myserver/ivy/myivysettings-public.xml` in this example) for defining your own public
resolver. For instance, the contents of such a file could be:
+To finish this example, you have to write your own Ivy settings file (that you will make
available at `http://myserver/ivy/myivysettings-public.xml` in this example) for defining
your own public resolver. For instance, the contents of such a file could be:
 
 [source, xml]
 ----
@@ -209,7 +209,7 @@ To finish this example, you have to write your own ivysettings file (that
you wi
 
 ----
 
-Now the last thing you will need in order to properly take advantage of the default settings
is the content of each included ivysettings file:
+Now the last thing you will need in order to properly take advantage of the default settings
is the content of each included Ivy settings file:
 
 .*ivysettings-public.xml*
 [source, xml]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/tutorial/dependence.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/dependence.adoc b/asciidoc/tutorial/dependence.adoc
index a418a7b..96f174e 100644
--- a/asciidoc/tutorial/dependence.adoc
+++ b/asciidoc/tutorial/dependence.adoc
@@ -104,19 +104,19 @@ Let's have a look at the `ivysettings.xml` file:
 ----
 
 <ivysettings>
-	<properties file="${ivy.settings.dir}/ivysettings.properties"/>
-	<settings defaultResolver="libraries"/>
-	<caches defaultCacheDir="${ivy.settings.dir}/ivy-cache"/>
-	<resolvers>
-		<filesystem name="projects">
-			<artifact pattern="${repository.dir}/[artifact]-[revision].[ext]"/>
-			<ivy pattern="${repository.dir}/[module]-[revision].xml"/>
-		</filesystem>
-		<ibiblio name="libraries" m2compatible="true" usepoms="false"/>
-	</resolvers>
-	<modules>
-		<module organisation="org.apache" name="dependee" resolver="projects"/>
-	</modules>
+    <properties file="${ivy.settings.dir}/ivysettings.properties"/>
+    <settings defaultResolver="libraries"/>
+    <caches defaultCacheDir="${ivy.settings.dir}/ivy-cache"/>
+    <resolvers>
+        <filesystem name="projects">
+            <artifact pattern="${repository.dir}/[artifact]-[revision].[ext]"/>
+            <ivy pattern="${repository.dir}/[module]-[revision].xml"/>
+        </filesystem>
+        <ibiblio name="libraries" m2compatible="true" usepoms="false"/>
+    </resolvers>
+    <modules>
+        <module organisation="org.apache" name="dependee" resolver="projects"/>
+    </modules>
 </ivysettings>
 
 ----

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/tutorial/dual.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/dual.adoc b/asciidoc/tutorial/dual.adoc
index 1700fc9..d50b75e 100644
--- a/asciidoc/tutorial/dual.adoc
+++ b/asciidoc/tutorial/dual.adoc
@@ -78,15 +78,15 @@ The Ivy settings are defined in the `ivysettings.xml` file located in
the `setti
 ----
 
 <ivysettings>
-  <settings defaultResolver="dual-example"/>
-  <resolvers>
-    <dual name="dual-example">
-      <filesystem name="ivys">
-        <ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml"/>
-      </filesystem>
-      <ibiblio name="ibiblio" m2compatible="true" usepoms="false"/>
-    </dual>
-  </resolvers>
+    <settings defaultResolver="dual-example"/>
+    <resolvers>
+        <dual name="dual-example">
+            <filesystem name="ivys">
+                <ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml"/>
+            </filesystem>
+            <ibiblio name="ibiblio" m2compatible="true" usepoms="false"/>
+        </dual>
+    </resolvers>
 </ivysettings>
 
 ----

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/tutorial/multiproject.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/multiproject.adoc b/asciidoc/tutorial/multiproject.adoc
index e0d97e9..3d54f76 100644
--- a/asciidoc/tutorial/multiproject.adoc
+++ b/asciidoc/tutorial/multiproject.adoc
@@ -85,25 +85,25 @@ contains a directory per module, with each containing:
 [source]
 ----
 
-  <ivy-module version="1.0">
-      <info
-          organisation="org.apache.ivy.example"
-          module="find"
-          status="integration"/>
-      <configurations>
+<ivy-module version="1.0">
+    <info
+        organisation="org.apache.ivy.example"
+        module="find"
+        status="integration"/>
+    <configurations>
         <conf name="core"/>
         <conf name="standalone" extends="core"/>
-      </configurations>
-      <publications>
+    </configurations>
+    <publications>
         <artifact name="find" type="jar" conf="core"/>
-      </publications>
-      <dependencies>
+    </publications>
+    <dependencies>
         <dependency name="version" rev="latest.integration" conf="core->default"/>
         <dependency name="list" rev="latest.integration" conf="core"/>
         <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="core->default"/>
         <dependency org="commons-cli" name="commons-cli" rev="1.0" conf="standalone->default"/>
-      </dependencies>
-  </ivy-module>
+    </dependencies>
+</ivy-module>
 
 ----
 
@@ -114,11 +114,11 @@ contains a directory per module, with each containing:
 [source]
 ----
 
-  <project name="find" default="compile">
-  	<property file="build.properties"/>
+<project name="find" default="compile">
+    <property file="build.properties"/>
 
-  	<import file="${common.dir}/common.xml"/>
-  </project>
+    <import file="${common.dir}/common.xml"/>
+</project>
 
 ----
 
@@ -152,11 +152,11 @@ So, here are some aspects of this common build file:
 [source]
 ----
 
-<!-- setup ivy default configuration with some custom info -->
+<!-- setup Ivy default configuration with some custom info -->
 <property name="ivy.local.default.root" value="${repository.dir}/local"/>
 <property name="ivy.shared.default.root" value="${repository.dir}/shared"/>
 
-<!-- here is how we would have configured ivy if we had our own ivysettings file
+<!-- here is how we would have configured Ivy if we had our own Ivy settings file
 <ivy:settings file="${common.dir}/ivysettings.xml" id="ivy.instance"/>
 -->
 
@@ -172,8 +172,8 @@ Commented out you can see how the settings would have been done if the
default s
 [source]
 ----
 
-<target name="resolve" depends="clean-lib, load-ivy" description="--> resolve and retrieve
dependencies with ivy">
-    <mkdir dir="${lib.dir}"/> <!-- not usually necessary, ivy creates the directory
IF there are dependencies -->
+<target name="resolve" depends="clean-lib, load-ivy" description="--> resolve and retrieve
dependencies with Ivy">
+    <mkdir dir="${lib.dir}"/> <!-- not usually necessary, Ivy creates the directory
IF there are dependencies -->
 
     <!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't
-->
     <ivy:resolve file="${ivy.file}"/>
@@ -215,9 +215,9 @@ This target is used to ask Ivy to find a new version for a module. To
get detail
 
 <target name="publish" depends="clean-build, jar" description="--> publish this project
in the ivy repository">
     <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
-                       resolver="shared"
-                       pubrevision="${version}"
-                       status="release"/>
+                 resolver="shared"
+                 pubrevision="${version}"
+                 status="release"/>
     <echo message="project ${ant.project.name} released with version ${version}"/>
 </target>
 
@@ -233,11 +233,11 @@ This target publishes the module to the shared repository, with the
revision fou
 
 <target name="publish-local" depends="local-version, jar" description="--> publish
this project in the local ivy repository">
     <ivy:publish artifactspattern="${build.dir}/[artifact].[ext]"
-                    resolver="local"
-                    pubrevision="${version}"
-                    pubdate="${now}"
-                    status="integration"
-                    forcedeliver="true"/>
+                 resolver="local"
+                 pubrevision="${version}"
+                 pubdate="${now}"
+                 status="integration"
+                 forcedeliver="true"/>
     <echo message="project ${ant.project.name} published locally with version ${version}"/>
 </target>
 
@@ -252,7 +252,7 @@ This is very similar to the publish task, except that this publishes the
revisio
 ----
 
 <target name="clean-local" description="--> cleans the local repository for the current
module">
-   <delete dir="${ivy.local.default.root}/${ant.project.name}"/>
+    <delete dir="${ivy.local.default.root}/${ant.project.name}"/>
 </target>
 
 ----
@@ -271,9 +271,9 @@ This target is used when you don't want to use your local version of a
module an
 
 ----
 
-Generates both an html report and a graphml report.
+Generates both an HTML report and a GraphML report.
 
-For example, to generate a graph like the one shown at the beginning of this tutorial, you
just have to follow the instructions given link:../yed.html[here] with the graphml file you
will find in `projects/console/build` after having called report in the console project, and
that's it, you have a clear overview of all your app dependencies!
+For example, to generate a graph like the one shown at the beginning of this tutorial, you
just have to follow the instructions given link:../yed.html[here] with the GraphML file you
will find in `projects/console/build` after having called report in the console project, and
that's it, you have a clear overview of all your app dependencies!
 
 
 == Playing with the projects
@@ -293,7 +293,7 @@ This gives you an idea of what you can do here. To make sure you have
at least o
 
 You will see that Ivy calls the publish target on all the modules, following the order of
the dependencies, so that a dependee is always built and published before its depender. Feel
free to make changes in the source code of a module (changing a method name, for instance)
and in the module using the method, then call publish-all to see how the change in the dependee
is compiled first, published, and then available to the depender which can compile successfully.
 
-Then you can go in one of the example project directories (like `projects/find` for instance),
and run `ant -p`:
+Then you can go in one of the example project directories (like `projects/find`, for instance),
and run `ant -p`:
 
 [source,shell]
 ----

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/tutorial/start.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/tutorial/start.adoc b/asciidoc/tutorial/start.adoc
index a8a0325..6959087 100644
--- a/asciidoc/tutorial/start.adoc
+++ b/asciidoc/tutorial/start.adoc
@@ -77,14 +77,14 @@ You can use the standard `ant -p` command to get the list of available
targets.
     <!-- =================================
           target: resolve
          ================================= -->
-    <target name="resolve" description="--> retrieve dependencies with ivy">
+    <target name="resolve" description="--> retrieve dependencies with Ivy">
         <ivy:retrieve/>
     </target>
 </project>
 
 ----
 
-As you can see, it's very easy to call Ivy to resolve and retrieve dependencies: all you
need if Ivy is properly link:../install.html[installed] is to define an XML namespace in your
Ant file (xmlns:ivy="antlib:org.apache.ivy.ant"`). Then all the link:../ant.html[Ivy Ant tasks]
will be available in this namespace.
+As you can see, it's very easy to call Ivy to resolve and retrieve dependencies: all you
need if Ivy is properly link:../install.html[installed] is to define an XML namespace in your
Ant file (`xmlns:ivy="antlib:org.apache.ivy.ant"`). Then all the link:../ant.html[Ivy Ant
tasks] will be available in this namespace.
 
 Here we use only one task: the link:../use/retrieve.html[retrieve] task. With no attributes,
it will use default settings and look for a file named `ivy.xml` for the dependency definitions.
That's exactly what we want, so we need nothing more than that.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/buildnumber.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/buildnumber.adoc b/asciidoc/use/buildnumber.adoc
index 1153a47..631777c 100644
--- a/asciidoc/use/buildnumber.adoc
+++ b/asciidoc/use/buildnumber.adoc
@@ -64,7 +64,7 @@ Note that when asking for revision 1, you can get a revision 10.0. To avoid
that
 |default|the default revision to assume when no revision prefix is asked and no revision
is found|No, defaults to 0
 |defaultBuildNumber|the default build number to use for the first revision|No, defaults to
0
 |revSep|the revision separator to use when no matching revision is found, to separate the
revision prefix from the build number|No, defaults to `.`
-|prefix|the prefix to use for the property names set (will be `__prefix__.revision, __prefix__.new.revision,
...)|No, defaults to `ivy`
+|prefix|the prefix to use for the property names set (will be `__prefix__.revision`, `__prefix__.new.revision`,
...)|No, defaults to `ivy`
 |settingsRef|A reference to Ivy settings that must be used by this task *__(since 2.0)__*.|No,
`ivy.instance` is taken by default.
 |resolver|the name of the resolver to use for build number calculation *__(since 2.1)__*|No,
all available resolvers will be used by default.
 |=======

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/cachefileset.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/cachefileset.adoc b/asciidoc/use/cachefileset.adoc
index 654d717..1971810 100644
--- a/asciidoc/use/cachefileset.adoc
+++ b/asciidoc/use/cachefileset.adoc
@@ -22,8 +22,7 @@ Constructs an Ant `fileset` consisting of artifacts in Ivy's cache for a
configu
 This is a link:../use/postresolvetask.html[post resolve task], with all the behaviour and
attributes common to all post resolve tasks. Note that this task
 does not rely on retrieve, because the built fileset is made of artifacts directly in Ivy's
cache.
 
-Please prefer the use of retrieve + standard Ant path creation, which make your build
-more independent from Ivy (once artifacts are properly retrieved, Ivy is not required any
more).
+Please prefer the use of retrieve + standard Ant path creation, which make your build more
independent from Ivy (once artifacts are properly retrieved, Ivy is not required any more).
 
 Built `fileset` is registered in Ant project with a given id, and can thus be used like any
other Ant `fileset` using
 `refid`.

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/configure.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/configure.adoc b/asciidoc/use/configure.adoc
index 1c61b0a..8f87ff6 100644
--- a/asciidoc/use/configure.adoc
+++ b/asciidoc/use/configure.adoc
@@ -17,7 +17,7 @@
    under the License.
 ////
 
-The `configure` task is used to configure Ivy with an settings XML file.
+The `configure` task is used to configure Ivy with a settings XML file.
 
 See link:../settings.html[Settings Files] for details about the settings file itself.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/dependencytree.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/dependencytree.adoc b/asciidoc/use/dependencytree.adoc
index 4294ed7..d2f3bb5 100644
--- a/asciidoc/use/dependencytree.adoc
+++ b/asciidoc/use/dependencytree.adoc
@@ -30,8 +30,8 @@ Please prefer the use of retrieve + standard Ant path creation, which make
your
 |Attribute|Description|Required
 |showEvicted|specify if evicted modules should be printed|No. Defaults to `false`
 |conf|a comma separated list of the configurations to take in consideration in the  dependency
tree|No. Defaults to the configurations resolved by the last resolve call, or `*` if no resolve
was explicitly called
-|haltonfailure|`true` to halt the build on ivy failure, `false` to continue|No. Defaults
to `true`
-|validate|true to force ivy files validation against ivy.xsd, false to force no validation|No.
Defaults to default ivy value (as configured in settings)
+|haltonfailure|`true` to halt the build on Ivy failure, `false` to continue|No. Defaults
to `true`
+|validate|true to force Ivy files validation against ivy.xsd, false to force no validation|No.
Defaults to default Ivy value (as configured in settings)
 |settingsRef|A reference to Ivy settings that must be used by this task *(since 2.0)*|No,
defaults to `ivy.instance`.
 |overwrite|Overwrite the value of the property if it already exist *(since 2.0)*.  Before
2.0, the properties were always overwritten.|No, `false` by default.
 |=======

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/info.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/info.adoc b/asciidoc/use/info.adoc
index c0e93e1..4070c3f 100644
--- a/asciidoc/use/info.adoc
+++ b/asciidoc/use/info.adoc
@@ -46,7 +46,7 @@ The information is retrieved by setting Ant properties:
 
 Since Ivy 2.0 this task has been enhanced to allow you to retrieve information about Ivy
modules in a repository.  Instead of specifying a local Ivy file you may specify the organisation,
module, revision pattern and (optionally) the branch of the Ivy module in the repository you
wish to retrieve the information for.
 
-The revision pattern is what is used when declaring a link:../ivyfile/dependency.html[dependency]
on a module, identical to how the link:findrevision.html[findrevision] task works.  In fact
this task can now be used in place of the findrevision task.
+The revision pattern is what is used when declaring a link:../ivyfile/dependency.html[dependency]
on a module, identical to how the link:findrevision.html[findrevision] task works.  In fact,
this task can now be used in place of the findrevision task.
 
 If no matching module is found then no property values are set.
 
@@ -81,25 +81,25 @@ Given this `ivy.xml` file:
 [source,xml]
 ----
 <ivy-module version="1.0" xmlns:e="http://ant.apache.org/ivy/extra">
-	<info organisation="apache"
-	       module="info-all"
-	       branch="trunk"
-	       revision="1.0"
-	       status="release"
-	       e:myextraatt="myvalue"
-	/>
-	<configurations>
-		<conf name="default"/>
-		<conf name="test"/>
-		<conf name="private" visibility="private"/>
-	</configurations>
-	<publications>
-		<artifact name="thing1" type="jar" ext="jar" conf="default" e:data="main"/>
-		<artifact name="thing2" type="jar" ext="jar" conf="default" e:data="client"/>
-	</publications>
-	<dependencies>
-		<dependency org="org1" name="mod1.2" rev="2.0"/>
-	</dependencies>
+    <info organisation="apache"
+          module="info-all"
+          branch="trunk"
+          revision="1.0"
+          status="release"
+          e:myextraatt="myvalue"
+    />
+    <configurations>
+        <conf name="default"/>
+        <conf name="test"/>
+        <conf name="private" visibility="private"/>
+    </configurations>
+    <publications>
+        <artifact name="thing1" type="jar" ext="jar" conf="default" e:data="main"/>
+        <artifact name="thing2" type="jar" ext="jar" conf="default" e:data="client"/>
+    </publications>
+    <dependencies>
+        <dependency org="org1" name="mod1.2" rev="2.0"/>
+    </dependencies>
 </ivy-module>
 ----
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/makepom.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/makepom.adoc b/asciidoc/use/makepom.adoc
index e9ca0f4..d3c6d79 100644
--- a/asciidoc/use/makepom.adoc
+++ b/asciidoc/use/makepom.adoc
@@ -29,7 +29,7 @@ It is possible to specify a template file defining the structure of the
generate
 
 * properties like `${property.name}` are replaced if they are defined in Ant or by the `ivy:makepom`
task (see below for the standard properties)
 * lines containing the string `SKIP_LINE` are skipped.
-* the defined dependencies will be added to the first `<dependencies>` element encountered
in the POM template. If the template doesn't contain a `<dependencies>` element, it
is generated a the end of the POM.
+* the defined dependencies will be added to the first `<dependencies>` element encountered
in the POM template. If the template doesn't contain a `<dependencies>` element, it
is generated at the end of the POM.
 
 The `ivy:makepom` task defines following properties that can be used in the template.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/publish.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/publish.adoc b/asciidoc/use/publish.adoc
index 1509579..3631335 100644
--- a/asciidoc/use/publish.adoc
+++ b/asciidoc/use/publish.adoc
@@ -25,7 +25,7 @@ All the artifacts must have been created _before_ calling this task. It
does not
 
 The target repository is given through the name of a resolver declared in current Ivy settings.
See link:../settings.html[Settings Files] for details about resolver supporting artifact publishing.
 
-It also publishes the delivered Ivy file (except if you don't want), and even deliver it,
if it has not been done with a previous deliver call or if forcedeliver is set to true. That's
why this task takes some parameters useful only for delivery. See the illustration below:
+It also publishes the delivered Ivy file (except if you don't want), and even delivers it,
if it has not been done with a previous deliver call or if forcedeliver is set to true. That's
why this task takes some parameters useful only for delivery. See the illustration below:
 
 image::../images/ivy-publish-fc.png[]
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/resolve.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/resolve.adoc b/asciidoc/use/resolve.adoc
index fcc7bd9..2bb798f 100644
--- a/asciidoc/use/resolve.adoc
+++ b/asciidoc/use/resolve.adoc
@@ -17,7 +17,7 @@
    under the License.
 ////
 
-The resolve task actually resolve dependencies described in an link:../ivyfile.html[Ivy file],
and put the resolved dependencies in the Ivy cache.
+The resolve task actually resolves dependencies described in an link:../ivyfile.html[Ivy
file], and puts the resolved dependencies in the Ivy cache.
 If configure has not been called before resolve is called, a default configuration will be
used (equivalent to calling configure without attributes).
 
 After the call to this task, four properties are set in Ant:

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/use/resources.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/use/resources.adoc b/asciidoc/use/resources.adoc
index 73d94ed..5b625f7 100644
--- a/asciidoc/use/resources.adoc
+++ b/asciidoc/use/resources.adoc
@@ -18,7 +18,7 @@
 ////
 
 *__(since 2.3) (Ant 1.7 required)__*
-`ivy:resources` is an Ant link:http://ant.apache.org/manual/Types/resources.html#collection[resource
collection], which files are based on an Ivy resolve, and then can be used with any task which
is working with resources like `copy` or `import`.
+`ivy:resources` is an Ant link:http://ant.apache.org/manual/Types/resources.html#collection[resource
collection], containing files found by an Ivy resolve, which then can be used with any task
working with resources like `copy` or `import`.
 
 This datatype shares the same attributes, child elements and behaviour of a link:../use/postresolvetask.html[post
resolve task]. It is not expected to be used as an Ant task though, only as a resource collection.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/59220b48/asciidoc/yed.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/yed.adoc b/asciidoc/yed.adoc
index 1e9bd74..9c1471b 100644
--- a/asciidoc/yed.adoc
+++ b/asciidoc/yed.adoc
@@ -17,14 +17,13 @@
    under the License.
 ////
 
-link:http://www.yworks.com/en/products_yed_about.htm[yEd] is a free graph editor, benefiting
from
-all the automatic layouts of yFiles. Ivy is able to generate graphs which are readable by
yEd.
+link:http://www.yworks.com/en/products_yed_about.htm[yEd] is a free graph editor, benefiting
from all the automatic layouts of yFiles. Ivy is able to generate graphs which are readable
by yEd.
 
-The graphs generated by Ivy are not laid out (in fact it's why we use yEd), so you have to
follow a simple sequence of steps to layout the generated graphs.
+The graphs generated by Ivy are not laid out (in fact, it's why we use yEd), so you have
to follow a simple sequence of steps to layout the generated graphs.
 
 == Preparation
 
-First you have to generate a GraphML file. Simply call the report task (see ivy use documentation)
for that.
+First you have to generate a GraphML file. Simply call the report task (see Ivy use documentation)
for that.
 
 == Step 1: open the GraphML file
 


Mime
View raw message