Author: maartenc
Date: Wed Sep 22 20:54:48 2010
New Revision: 1000222
URL: http://svn.apache.org/viewvc?rev=1000222&view=rev
Log:
Merged revision 1000206 from trunk.
Modified:
ant/ivy/core/branches/2.2.x/ (props changed)
ant/ivy/core/branches/2.2.x/CHANGES.txt
ant/ivy/core/branches/2.2.x/doc/ivyfile/artifact.html
Propchange: ant/ivy/core/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 20:54:48 2010
@@ -1,4 +1,4 @@
/ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
/ant/ivy/core/branches/2.0.0-rc2:707459-708717
/ant/ivy/core/branches/2.0.x:696803-698317
-/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997711-997931
+/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997711-997931,1000206
Modified: ant/ivy/core/branches/2.2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/CHANGES.txt?rev=1000222&r1=1000221&r2=1000222&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.2.x/CHANGES.txt Wed Sep 22 20:54:48 2010
@@ -111,6 +111,7 @@ for detailed view of each issue, please
2.2.0
=====================================
+- DOCUMENTATION: Spelling fixes on artifact description page (IVY-1230)
- DOCUMENTATION: Added missing documentation about the ivy:publish child
elements.
- DOCUMENTATION: Grammar, spelling, and clarity of Settings File documentation
(IVY-1216) (thanks to Steve Miller)
- DOCUMENTATION: Grammar, spelling, and clarity of Tutorial documentation
(IVY-1222) (thanks to Steve Miller)
Modified: ant/ivy/core/branches/2.2.x/doc/ivyfile/artifact.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/doc/ivyfile/artifact.html?rev=1000222&r1=1000221&r2=1000222&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/doc/ivyfile/artifact.html (original)
+++ ant/ivy/core/branches/2.2.x/doc/ivyfile/artifact.html Wed Sep 22 20:54:48
2010
@@ -34,9 +34,9 @@ The configurations in which an artifact
<li>conf attribute on artifact element</li>
<li>conf subelement</li>
</ul>
-The twos are equivalent, it is only a matter of preference. However, do not
mix both for one artifact.
+The two are equivalent, it is only a matter of preference. However, do not mix
both for one artifact.
-<span class="since">since 1.4</span> The artifact element as default values
for all its attributes, so if you want to declare a default artifact you can
just declare it like that:<code type="xml">
+<span class="since">since 1.4</span> The artifact element has default values
for all its attributes, so if you want to declare a default artifact you can
just declare it like that:<code type="xml">
<artifact />
</code>If this is the only artifact declared, then it's equivalent to having
no publication section at all.
