ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaiki...@apache.org
Subject [1/2] ant-ivy git commit: [doc changes] Fix the "Reference -> Settings File" section and children docs
Date Tue, 20 Jun 2017 08:59:58 GMT
Repository: ant-ivy
Updated Branches:
  refs/heads/master 39431e202 -> e35f06c0a


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/outputters.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/outputters.adoc b/asciidoc/settings/outputters.adoc
index 3529b01..d3d554a 100644
--- a/asciidoc/settings/outputters.adoc
+++ b/asciidoc/settings/outputters.adoc
@@ -1,3 +1,4 @@
+= outputters
 
 *Tag:* outputters
 
@@ -8,10 +9,10 @@ A report outputter is used at the end of the resolve process to generate
a repor
 Two report outputters are registered by default:
 
 
-* a log report outputter (link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/plugins/report/LogReportOutputter.java[LogReportOutputter])
+
-which produces the output on the console at the end of the resolve, which looks like this:
+    * a log report outputter (link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/plugins/report/LogReportOutputter.java[LogReportOutputter])
+
+    which produces the output on the console at the end of the resolve, which looks like
this:
 
-[source]
+[source.shell]
 ----
 
         ---------------------------------------------------------------------
@@ -24,11 +25,11 @@ which produces the output on the console at the end of the resolve, which
looks
 ----
 
 
-* an xml report outputter (link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/plugins/report/XmlReportOutputter.java[XmlReportOutputter])
+
-which produces an xml report in the cache, which is mandatory for correct Ivy behaviour,
since it's that report which is used when you do a post resolve step in a separate build from
the resolve itself. It's also this xml report which is processed to generate all the different
reports available in the link:../use/report.html[report] task.
+    * an xml report outputter (link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/java/org/apache/ivy/plugins/report/XmlReportOutputter.java[XmlReportOutputter])
+
+    which produces an xml report in the cache, which is mandatory for correct Ivy behaviour,
since it's that report which is used when you do a post resolve step in a separate build from
the resolve itself. It's also this xml report which is processed to generate all the different
reports available in the link:../use/report.html[report] task.
 
 
-The child tag used for the parser must be equal to a name of a report outputter type (added
with the typedef tag).
+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 link:../extend.html[Extending Ivy documentation]
 
@@ -41,3 +42,4 @@ To see how to define your own report outputter see link:../extend.html[Extending
 |Element|Description|Cardinality
 |any report outputter|adds a report outputter to the list of available ones|0..n
 |=======
+

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/parsers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/parsers.adoc b/asciidoc/settings/parsers.adoc
index 40cbb89..30a744e 100644
--- a/asciidoc/settings/parsers.adoc
+++ b/asciidoc/settings/parsers.adoc
@@ -1,10 +1,11 @@
+= parsers
 
 *Tag:* parsers
 
 Defines a list of module descriptor parsers usable in ivy. Each parser defines which resources
(which descriptor file) it accepts.
-The child tag used for the parser must be equal to a name of a parser type (added with the
typedef tag).
+The child tag used for the parser must be equal to a name of a parser type (added with the
`typedef` tag).
 
-Note that when looking for a parser, ivy queries the parsers list in the reverse order. So
the last parser in the list will be queried first. Consequently, if the last parser accepts
all resources, the other parsers will never have a chance to parse the resource.
+Note that when looking for a parser, ivy queries the parsers list in the reverse order. So
the last parser in the list will be queried first. Consequently, if the last parser accepts
all resources, the other parsers will _never_ have a chance to parse the resource.
 
 Two parsers are available by default and thus do not need to be declared in this section:
 
@@ -13,7 +14,7 @@ Two parsers are available by default and thus do not need to be declared
in this
  this is the parser used for ivy xml files. This parser is used for resources that aren't
accepted by any other parser.
 
 * pom parser +
-this parser is able to parse maven2 pom files
+this parser is able to parse Maven2 `pom` files
 
 
 == Child elements

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/properties.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/properties.adoc b/asciidoc/settings/properties.adoc
index da14804..4d42557 100644
--- a/asciidoc/settings/properties.adoc
+++ b/asciidoc/settings/properties.adoc
@@ -1,11 +1,11 @@
+= properties
 
 *Tag:* properties
 
 
-
 Loads a properties file into ivy variables. See the variables chapter above for details about
ivy variables.
 
-*__Since 2.0__*: it is possible to access environment variables. This can be done by specifying
the environment attribute. This attribute specifies the prefix which can be used to access
these environment variables. For instance, if you specify environment="env", you can access
the PATH environment variable with the env.PATH property name.
+*__Since 2.0__*: it is possible to access environment variables. This can be done by specifying
the environment attribute. This attribute specifies the prefix which can be used to access
these environment variables. For instance, if you specify `environment="env"`, you can access
the `PATH` environment variable with the `env.PATH` property name.
 
 
 == Attributes
@@ -14,7 +14,8 @@ Loads a properties file into ivy variables. See the variables chapter above
for
 [options="header",cols="15%,50%,35%"]
 |=======
 |Attribute|Description|Required
-|file|a path to a properties file to load|One of these
+|file|a path to a properties file to load 
+.2+|One of these
 |environment|the prefix to use when retrieving environment variables *__(since 2.0)__*
 |override|indicates if the variable found in the properties file should override its previous
value, if any *__(since 1.3)__*|No, defaults to true
 |=======

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/property.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/property.adoc b/asciidoc/settings/property.adoc
index 5df7361..a4c05d3 100644
--- a/asciidoc/settings/property.adoc
+++ b/asciidoc/settings/property.adoc
@@ -1,9 +1,10 @@
+= property
 
 *Tag:* property
 
-Defines an ivy variable. *__since 1.3__*
+Defines an ivy variable. 
 
-The optional override attribute enables you to avoid overriding the previous value of the
variable, which makes the definition behave like an ant property, which is particularly useful
to define default values (values which are used only if they haven't been defined yet).
+*__since 1.3__*: The optional override attribute enables you to avoid overriding the previous
value of the variable, which makes the definition behave like an ant property, which is particularly
useful to define default values (values which are used only if they haven't been defined yet).
 
 == Attributes
 
@@ -22,7 +23,7 @@ The optional override attribute enables you to avoid overriding the previous
val
 == Examples
 
 
-[source]
+[source, xml]
 ----
 
 <property name="myvar" value="myvalue"/>
@@ -34,7 +35,7 @@ Sets the variable myvar to the value myvalue.
 '''
 
 
-[source]
+[source, xml]
 ----
 
 <property name="myvar" value="myvalue" override="false"/>
@@ -46,7 +47,7 @@ Sets the variable myvar to the value myvalue only if myvar has not been
set yet.
 '''
 
 
-[source]
+[source, xml]
 ----
 
  <properties environment="env"/>

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/resolvers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/resolvers.adoc b/asciidoc/settings/resolvers.adoc
index 4cc899d..0608d5c 100644
--- a/asciidoc/settings/resolvers.adoc
+++ b/asciidoc/settings/resolvers.adoc
@@ -1,3 +1,4 @@
+= resolvers
 
 *Tag:* resolvers
 
@@ -7,14 +8,14 @@ The child tag used for the dependency resolver must be equal to a name of
a depe
 
 *__since 1.3__* Once defined, resolvers can be referenced by their name, using the following
syntax:
 
-[source]
+[source, xml]
 ----
 
 <resolver ref="alreadydefinedresolver"/>
 
 ----
 
-Note that this works only if the resolver has already been defined and NOT if it is defined
later in the ivysettings file.
+Note that this works only if the resolver has already been defined and *NOT* if it is defined
later in the ivysettings file.
 
 == Child elements
 
@@ -33,7 +34,7 @@ Ivy comes with a set of built-in dependency resolvers that handle most common
ne
 
 If you don't find the one you want here, you can also check if someone has contributed it
on the links page, or even link:../extend.html[write your own].
 
-There are basically two types of resolvers in Ivy: composite and standard. A composite resolver
is a resolver which delegates the work to other resolvers. The other resolvers are standard
resolvers.
+There are basically two types of resolvers in Ivy - composite and standard. A composite resolver
is a resolver which delegates the work to other resolvers. The other resolvers are standard
resolvers.
 
 Here is the list of built-in resolvers:
 
@@ -69,19 +70,19 @@ All resolvers of the same type share some common features and attributes
detaile
 
 All standard resolvers support several options for validation.
 
-The __validate__ attribute is used to configure if ivy files should be checked against the
ivy file xml schema.
+The `validate` attribute is used to configure if ivy files should be checked against the
ivy file xml schema.
 
-The checkconsistency attribute allows you to enable or disable consistency checking between
what is expected by Ivy when it finds a module descriptor, and what the module descriptor
actually contains.
+The `checkconsistency` attribute allows you to enable or disable consistency checking between
what is expected by Ivy when it finds a module descriptor, and what the module descriptor
actually contains.
 
-The descriptor attribute lets you define if module descriptors are mandatory or optional.
+The `descriptor` attribute lets you define if module descriptors are mandatory or optional.
 
-The checksums attribute is used to define the list of checksums files to use to check if
the content of downloaded files has not been corrupted (eg during transfer).
+The `checksums` attribute is used to define the list of checksums files to use to check if
the content of downloaded files has not been corrupted (eg during transfer).
 
 ==== force
 
-Any standard resolver can be used in force mode, which is used mainly to handle local development
builds. In force mode, the resolver attempts to find a dependency whatever the requested revision
is (internally it replace the requested revision by 'latest.integration'), and if it finds
one, it forces this revision to be returned, even when used in a chain with returnFirst=false.
+Any standard resolver can be used in `force` mode, which is used mainly to handle local development
builds. In force mode, the resolver attempts to find a dependency whatever the requested revision
is (internally it replace the requested revision by `latest.integration`), and if it finds
one, it forces this revision to be returned, even when used in a chain with `returnFirst=false`.
 
-By using such a resolver at the beginning of a chain, you can be sure that Ivy will pick
up whatever module is available in this resolver (usually a private local build) instead of
the real requested revision. This allows to handle use case like a developer working on modules
A and C, where A -> B -> C, and pick up the local build for C without having to publish
a local version of B.
+By using such a resolver at the beginning of a chain, you can be sure that Ivy will pick
up whatever module is available in this resolver (usually a private local build) instead of
the real requested revision. This allows to handle use case like a developer working on modules
`A` and `C`, where `A -> B -> C`, and pick up the local build for `C` without having
to publish a local version of `B`.
 *__since 2.0__*
 
 
@@ -123,7 +124,7 @@ And setting the property `ivy.maven.lookup.javadoc` to `false` disable
the looku
 == Examples
 
 
-[source]
+[source, xml]
 ----
 
 <resolvers>
@@ -143,4 +144,5 @@ And setting the property `ivy.maven.lookup.javadoc` to `false` disable
the looku
 
 ----
 
-Defines a filesystem resolver, named '1', which is then used in two chains, the first which
combines the filesystem resolver with an ivyrep resolver, and second which combines the filesystem
resolver with an ibiblio resolver, and which returns the first module found, and uses the
whole chain to download artifacts (see corresponding resolvers documentation for details about
them).   Resolver 1 will use a cache named 'cache-1' which should have been defined under
the caches element.
\ No newline at end of file
+Defines a filesystem resolver, named `1`, which is then used in two chains, the first which
combines the filesystem resolver with an ivyrep resolver, and second which combines the filesystem
resolver with an ibiblio resolver, and which returns the first module found, and uses the
whole chain to download artifacts (see corresponding resolvers documentation for details about
them).   Resolver `1` will use a cache named `cache-1` which should have been defined under
the caches element.
+

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/settings.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/settings.adoc b/asciidoc/settings/settings.adoc
index 8bb38a5..046b178 100644
--- a/asciidoc/settings/settings.adoc
+++ b/asciidoc/settings/settings.adoc
@@ -1,15 +1,18 @@
+= settings
 
 *Tag:* settings
 
-Configures some important ivy info: default resolver, latest strategy, conflict manager...
+Configures some important ivy info: default resolver, latest strategy, conflict manager and
some others.
 
 The default resolver is used whenever nothing else is configured in the modules section of
the settings file. It should give the name of a dependency resolver defined in the link:../settings/resolvers.html[resolvers]
section of the settings file.
 
 The default latest strategy and conflict manager can also be configured here.
 
 _validate_ indicates if ivy files should generally be validated against the xsd or not. This
setting is only a default value, and can be overridden:
-1) in ant tasks
-2) in resolvers
+
+    1. in ant tasks
+    2. in resolvers
+    
 So if there is a setting in the resolver, it always wins against all other settings.
 
 
@@ -28,13 +31,13 @@ So if there is a setting in the resolver, it always wins against all other
setti
 |validate|Indicates if ivy files should be validated against ivy.xsd or not.|No, defaults
to true
 |useRemoteConfig|true to configure ivyrep and ibiblio resolver from a remote configuration
file (updated with changes in those repository structure if any) (*__since 1.2__*)|No, defaults
to false
 |httpRequestMethod|specifies the HTTP method to use to retrieve information about an URL.
Possible values are 'GET' and 'HEAD'. This setting can be used to solve problems with firewalls
and proxies. (*__since 2.0__*)|No, defaults to 'HEAD'
-|[line-through]#defaultCache#|a path to a directory to use as default basedir for both resolution
and repository cache(s).
+|[line-through]#defaultCache#|a path to a directory to use as default basedir for both resolution
and repository cache(s). +
 	    __Deprecated, we recommend using defaultCacheDir on the link:../settings/caches.html[caches]
tag instead__|No, defaults to .ivy2/cache in user home
-|[line-through]#checkUpToDate#|Indicates if date should be checked before retrieving artifacts
from cache.
+|[line-through]#checkUpToDate#|Indicates if date should be checked before retrieving artifacts
from cache. +
     	__Deprecated, we recommend using overwriteMode on the link:../use/retrieve.html[retrieve]
task instead__|No, defaults to true
-|[line-through]#cacheIvyPattern#|a pattern to indicate where ivy files should be put in cache.
+|[line-through]#cacheIvyPattern#|a pattern to indicate where ivy files should be put in cache.
+
     	__Deprecated, we recommend using ivyPattern on the link:../settings/caches.html[caches]
tag instead__|No, defaults to [organisation]/[module]/ivy-[revision].xml
-|[line-through]#cacheArtifactPattern#|a pattern to indicate where artifact files should be
put in cache.
+|[line-through]#cacheArtifactPattern#|a pattern to indicate where artifact files should be
put in cache. +
     	__Deprecated, we recommend using artifactPattern on the link:../settings/caches.html[caches]
tag instead__|No, defaults to [organisation]/[module]/[type]s/[artifact]-[revision].[ext]
 |=======
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/signers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/signers.adoc b/asciidoc/settings/signers.adoc
index 5f371b5..2c4ad51 100644
--- a/asciidoc/settings/signers.adoc
+++ b/asciidoc/settings/signers.adoc
@@ -1,5 +1,7 @@
+= signers
 
 *Tag:* signers
+
 *__since 2.2__*
 
 Defines a list of detached signature generators usable in ivy. Each generator is identified
by its name, given as an attribute.
@@ -12,8 +14,6 @@ Ivy supports the following signature generator out of the box:
  generates an OpenPGP compatible ASCII armored detached signature.
 
 
-
-
 == Child elements
 
 
@@ -42,8 +42,8 @@ This generator is capable of generating an OpenPGP compatible ASCII armored
deta
 |=======
 |Attribute|Description|Required
 |name|The name of the signature generator.|Yes
-|secring|The location of the secret keyring.|No, defaults to ${user.home}/.gnupg/secring.gpg
-|keyId|The identifier of the key to use. The keyword 'auto' can be used to indicate a key
will be selected automatically.|No, defaults to 'auto'.
+|secring|The location of the secret keyring.|No, defaults to `${user.home}/.gnupg/secring.gpg`
+|keyId|The identifier of the key to use. The keyword `auto` can be used to indicate a key
will be selected automatically.|No, defaults to `auto`.
 |password|The password of the private key.|Yes
 |=======
 
@@ -52,7 +52,7 @@ This generator is capable of generating an OpenPGP compatible ASCII armored
deta
 == Examples
 
 
-[source]
+[source, xml]
 ----
 
 <signers>
@@ -66,7 +66,7 @@ Defines a detached signature generator with name 'mypgp' which uses the
secret k
 '''
 
 
-[source]
+[source, xml]
 ----
 
 <signers>
@@ -75,4 +75,4 @@ Defines a detached signature generator with name 'mypgp' which uses the
secret k
 
 ----
 
-Same as before, but this time the key '123ABC45' is used to generate the detached signature.
\ No newline at end of file
+Same as before, but this time the key `123ABC45` is used to generate the detached signature.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/status.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/status.adoc b/asciidoc/settings/status.adoc
index d171c57..717f842 100644
--- a/asciidoc/settings/status.adoc
+++ b/asciidoc/settings/status.adoc
@@ -1,3 +1,4 @@
+= status
 
 *Tag:* status
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/statuses.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/statuses.adoc b/asciidoc/settings/statuses.adoc
index 6c8bde7..ac2cb8e 100644
--- a/asciidoc/settings/statuses.adoc
+++ b/asciidoc/settings/statuses.adoc
@@ -1,15 +1,16 @@
+= statuses
 
 *Tag:* statuses
 
 Defines the list of available statuses. *__since 1.4__*
 
-By default, ivy has 3 statuses: release, milestone and integration. By adding a statuses
section to your ivysettings file, you define the statuses you want to use. Note that in this
case if you still want to have ivy default statuses you will have to declare them.
+By default, ivy has 3 statuses: `release`, `milestone` and `integration`. By adding a statuses
section to your ivysettings file, you define the statuses you want to use. Note that in this
case if you still want to have ivy default statuses you will have to declare them.
 
-The integration property on each status is only used for recursive delivery, an integration
dependency being delivered if the caller is not in integration state itself.
+The `integration` property on each status is only used for recursive delivery, an integration
dependency being delivered if the caller is not in integration state itself.
 
-The default status is the one used when none is defined in a module descriptor. If not specified,
it defaults to the last defined status.
+The `default` status is the one used when none is defined in a module descriptor. If not
specified, it defaults to the last defined status.
 
-The statuses order is important, the first is considered the more mature, the last the less
mature. This is used to know if a status is compatible with a latest._&lt;status&gt;_
version matcher.
+NOTE: The statuses order is important, the first is considered the more mature, the last
the less mature. This is used to know if a status is compatible with a `latest._&lt;status&gt;_`
version matcher.
 
 
 == Attributes
@@ -35,7 +36,7 @@ The statuses order is important, the first is considered the more mature,
the la
 == Examples
 
 
-[source]
+[source, xml]
 ----
 
 <statuses default="bronze">
@@ -46,5 +47,5 @@ The statuses order is important, the first is considered the more mature,
the la
 
 ----
 
-Defines 3 statuses, gold, silver and bronze. The default status used when none is declared
in an ivy file will be bronze. 
-It is also considered as an integration status, and thus doesn't trigger any recrusive delivery.
\ No newline at end of file
+Defines 3 statuses, `gold`, `silver` and `bronze`. The default status used when none is declared
in an ivy file will be `bronze`. 
+It is also considered as an integration status, and thus doesn't trigger any recrusive delivery.

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/triggers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/triggers.adoc b/asciidoc/settings/triggers.adoc
index 60ed6a5..2d5a32b 100644
--- a/asciidoc/settings/triggers.adoc
+++ b/asciidoc/settings/triggers.adoc
@@ -1,5 +1,7 @@
+= triggers
 
 *Tag:* triggers
+
 *__since 1.4__*
 
 Defines a list of triggers to activate on some Ivy events.
@@ -8,14 +10,14 @@ A trigger is an action which is performed whenever a particular event occurs.
 Ivy supports 3 type of triggers out of the box: 
 
 
-* ant-call +
- calls a target in the same build as the original one whenever a particular event occurs.

+    * ant-call +
+     calls a target in the same build as the original one whenever a particular event occurs.

 
-* ant-build +
- calls an ant build which may be in another ant build script. 
+    * ant-build +
+     calls an ant build which may be in another ant build script. 
 
-* log +
- echo a message, usually in a file
+    * log +
+     echo a message, usually in a file
 
 
 If you want to use a different trigger, you can link:../extend.html[implement your own].
@@ -410,7 +412,7 @@ the absolute path of the source file for the artifact
 
 
 
-The child tag used for the dependency resolver must be equal to a name of a trigger type
(either built-in or added with the typedef tag).
+The child tag used for the dependency resolver must be equal to a name of a trigger type
(either built-in or added with the `typedef` tag).
 
 
 == Child elements
@@ -445,9 +447,10 @@ Ivy comes with 3 built-in triggers:
 All triggers share some common attributes detailed here.
 
 Among these attributes, you will find how to select when the trigger should be performed.
You have to provide an event name, which is simple, but you can also use a filter expression.
The syntax for this expression is very simple and limited: 
-you can use the = operator to compare an attribute (left operande) with a value (right operande).
-you can use AND OR NOT as boolean operators
-you cannot use parenthesis to change the precedence
+
+    - you can use the = operator to compare an attribute (left operande) with a value (right
operande).
+    - you can use AND OR NOT as boolean operators
+    - you cannot use parenthesis to change the precedence
 
 
 [options="header",cols="15%,50%,35%"]
@@ -463,7 +466,7 @@ you cannot use parenthesis to change the precedence
 == Examples
 
 
-[source]
+[source, xml]
 ----
 
 <triggers>
@@ -473,13 +476,13 @@ you cannot use parenthesis to change the precedence
 
 ----
 
-Triggers an ant build of the ant file ${ivy.settings.dir}/[module]/build.xml (where [module]
is replaced by the name of the dependency resolved) with the target "publish", just before
resolving a dependency with a latest.integration revision.
+Triggers an ant build of the ant file `${ivy.settings.dir}/[module]/build.xml` (where `[module]`
is replaced by the name of the dependency resolved) with the target "publish", just before
resolving a dependency with a `latest.integration` revision.
 Note that by default the ant build is triggered only once per build file. See below to see
how to trigger the build more than once.
 
 '''
 
 
-[source]
+[source, xml]
 ----
 
 <triggers>
@@ -495,7 +498,7 @@ Same as before, but this time the builds will be triggered as many time
as the d
 '''
 
 
-[source]
+[source, xml]
 ----
 
 <triggers>
@@ -505,10 +508,10 @@ Same as before, but this time the builds will be triggered as many time
as the d
 
 ----
 
-Triggers an ant call of the target unzip just after downloading a zip artifact, prefixing
all parameters to the target with 'dep'.
+Triggers an ant call of the target unzip just after downloading a zip artifact, prefixing
all parameters to the target with `dep`.
 Here is how the target can look like:
 
-[source]
+[source, xml]
 ----
 
 <target name="unzip">
@@ -535,7 +538,7 @@ Here is how the target can look like:
 '''
 
 
-[source]
+[source, xml]
 ----
 
 <triggers>
@@ -548,4 +551,4 @@ Here is how the target can look like:
 
 Logs any successful artifact download, with information on the source and destination, and
details on download size and duration.
 
-The file attribute is optional, the log trigger will output messages to console if it isn't
provided.
\ No newline at end of file
+The `file` attribute is optional, the log trigger will output messages to console if it isn't
provided.

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/typedef.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/typedef.adoc b/asciidoc/settings/typedef.adoc
index 7aacd45..986c359 100644
--- a/asciidoc/settings/typedef.adoc
+++ b/asciidoc/settings/typedef.adoc
@@ -1,8 +1,7 @@
+= typedef
 
 *Tag:* typedef
 
-
-
 Defines a new type in ivy. Useful to define new dependency resolvers, in particular, but
also latest strategies.
 See link:../extend.html[how to write and plug your own dependency resolver] for details.
 

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e35f06c0/asciidoc/settings/version-matchers.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/settings/version-matchers.adoc b/asciidoc/settings/version-matchers.adoc
index e31632d..2f72534 100644
--- a/asciidoc/settings/version-matchers.adoc
+++ b/asciidoc/settings/version-matchers.adoc
@@ -1,9 +1,10 @@
+= version-matchers
 
 *Tag:* version-matchers
 
 Defines a list of version matchers. *__since 1.4__* 
 
-The child tag used for the version matcher must be equal to a name of a report outputter
type (added with the typedef tag).
+The child tag used for the version matcher must be equal to a name of a report outputter
type (added with the `typedef` tag).
 
 A version matcher is used to evaluate if a dependency version constraint matches a dependency
version.
 
@@ -13,7 +14,7 @@ A version matcher is used to evaluate if a dependency version constraint
matches
 
 [options="header",cols="15%,50%,35%"]
 |=======
-|Descrition|Required
+|Attribute|Descrition|Required
 |usedefaults|when set to true, includes the built-in version matchers (Latest, Sub Revision,
and Version Ranger Matcher). Exact Revision Matcher is always included|No, defaults to false
 |=======
 
@@ -39,7 +40,7 @@ A matcher that matches a dependency revision id to the module revision id
using
 
 === Sub Revision Matcher
 
-A matcher that matches all revisions starting with a specific prefix. The syntax is: [prefix]+
+A matcher that matches all revisions starting with a specific prefix. The syntax is: `[prefix]+`
 
 
 [options="header"]
@@ -54,7 +55,7 @@ A matcher that matches all revisions starting with a specific prefix. The
syntax
 === Latest (Status) Matcher
 
 
-A matcher that matches versions based on their status. The predefined statuses in Ivy are
'release', 'milestone' and 'integration'. It's possible to define your own statuses, see link:../settings/statuses.html[statuses]
for more details.
+A matcher that matches versions based on their status. The predefined statuses in Ivy are
`release`, `milestone` and `integration`. It's possible to define your own statuses, see link:../settings/statuses.html[statuses]
for more details.
 
 
 [options="header"]
@@ -79,7 +80,8 @@ Range types are exhaustively listed by example in the table below.
 |Revision|Matches
 | [1.0,2.0] | all versions greater or equal to 1.0 and lower or equal to 2.0
 | [1.0,2.0[ | all versions greater or equal to 1.0 and lower than 2.0
-| ]1.0,2.0] 
+| ]1.0,2.0] | all versions greater than 1.0 and lower or equal to 2.0
+| ]1.0,2.0[ | all versions greater than 1.0 and lower than 2.0
 | [1.0,) | all versions greater or equal to 1.0 
 | ]1.0,) | all versions greater than 1.0
 | (,2.0] | all versions lower or equal to 2.0
@@ -97,7 +99,7 @@ The version pattern matcher allows for more flexibility in pattern matching
at t
 ==== Settings.xml
 
 
-[source]
+[source, xml]
 ----
 
 <pattern-vm>
@@ -110,7 +112,7 @@ The version pattern matcher allows for more flexibility in pattern matching
at t
 ==== Ivy.xml
 
 
-[source]
+[source, xml]
 ----
 
 <dependency org="acme" name="tool" rev="foo(1, 3)" />
@@ -118,4 +120,4 @@ The version pattern matcher allows for more flexibility in pattern matching
at t
 ----
 
 The version pattern matcher may contain more than one match element.  The matcher will attempt
to match a dependency revision against each match in sequence, checking the revision tag (e.g.
foo(..)) and then the pattern.
-Matcher types may be one of "regexp", "exact", "glob", or "exactOrRegexp".  Glob pattern
matching requires Apache ORO 2.0.8 or higher to be on the classpath.
\ No newline at end of file
+Matcher types may be one of "regexp", "exact", "glob", or "exactOrRegexp".  Glob pattern
matching requires Apache ORO 2.0.8 or higher to be on the classpath.


Mime
View raw message