svn commit: r559550 - in /ant/core/branches/ANT_17_BRANCH/docs/manual: CoreTasks/zip.html OptionalTasks/jlink.html

[mbenson]

Author: mbenson
Date: Wed Jul 25 11:25:21 2007
New Revision: 559550

URL: http://svn.apache.org/viewvc?view=rev&rev=559550
Log:
merge

Modified:
    ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/zip.html
    ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/jlink.html

Modified: ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/zip.html
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/zip.html?view=diff&rev=559550&r1=559549&r2=559550
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/zip.html (original)
+++ ant/core/branches/ANT_17_BRANCH/docs/manual/CoreTasks/zip.html Wed Jul 25 
11:25:21 2007
@@ -222,6 +222,7 @@
 <p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> and
 <code>&lt;zipfileset&gt;</code> have been supported as nested elements.</p>
 
+<a name="zipgroupfileset" />
 <h4>zipgroupfileset</h4>
 <p>A <code>&lt;zipgroupfileset&gt;</code> allows for multiple zip files to be 
 merged into the archive. Each file found in this fileset is added to the 
archive 

Modified: ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/jlink.html
URL: 
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/jlink.html?view=diff&rev=559550&r1=559549&r2=559550
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/jlink.html 
(original)
+++ ant/core/branches/ANT_17_BRANCH/docs/manual/OptionalTasks/jlink.html Wed 
Jul 25 11:25:21 2007
@@ -23,7 +23,10 @@
 
 <h2><a name="jlink">Jlink</a></h2>
 <h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated. Use the zipfileset and zipgroupfileset 
attributes of the <a href="../CoreTasks/jar.html">Jar task</a> or <a 
href="../CoreTasks/zip.html">Zip task</a> instead.</i></p>
+<p><i>This task has been deprecated. Use a <a 
href="../CoreTypes/zipfileset.html">zipfileset</a>
+ or <a href="../CoreTasks/zip.html#zipgroupfileset">zipgroupfileset</a> with 
the
+ <a href="../CoreTasks/jar.html">Jar task</a> or <a 
href="../CoreTasks/zip.html">Zip task</a>
+ instead.</i></p>
 
 <h3><b>Description:</b></h3>
 <p>Links entries from sub-builds and libraries.</p>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]