antoine 2004/06/02 14:22:36 Modified: . Tag: ANT_16_BRANCH WHATSNEW docs/manual Tag: ANT_16_BRANCH install.html docs/manual/OptionalTasks Tag: ANT_16_BRANCH ftp.html Log: Merge from HEAD Doc fix concerning library dependencies of the ftp task PR: 29334 Submitted by: Steve Cohen (scohen at apache dot org) Revision Changes Path No revision No revision 1.503.2.96 +3 -0 ant/WHATSNEW Index: WHATSNEW =================================================================== RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.95 retrieving revision 1.503.2.96 diff -u -r1.503.2.95 -r1.503.2.96 --- WHATSNEW 2 Jun 2004 21:13:17 -0000 1.503.2.95 +++ WHATSNEW 2 Jun 2004 21:22:36 -0000 1.503.2.96 @@ -98,6 +98,9 @@ Other changes: -------------- +* doc fix concerning the dependencies of the ftp task + Bugzilla Report 29334. + * <xmlvalidate> has now a property nested element, allowing to set string properties for the parser Bugzilla Report 23395. No revision No revision 1.59.2.11 +1 -1 ant/docs/manual/install.html Index: install.html =================================================================== RCS file: /home/cvs/ant/docs/manual/install.html,v retrieving revision 1.59.2.10 retrieving revision 1.59.2.11 diff -u -r1.59.2.10 -r1.59.2.11 --- install.html 17 Feb 2004 08:02:19 -0000 1.59.2.10 +++ install.html 2 Jun 2004 21:22:36 -0000 1.59.2.11 @@ -404,7 +404,7 @@ <td><a name="commons-net">commons-net.jar</td> <td>ftp, rexec and telnet tasks<br> jakarta-oro 2.0.1 or later is required in any case together with commons-net.<br> - For a use with a Microsoft FTP server, a minimum version of commons-net of 1.2.0 or CVS HEAD from February 2004 or later is required. + For a use with a Microsoft FTP server, a minimum version of commons-net of 1.2.1 is required. </td> <td><a href="http://jakarta.apache.org/commons/net/index.html" target="_top">http://jakarta.apache.org/commons/net/index.html</a></td> No revision No revision 1.19.2.6 +4 -2 ant/docs/manual/OptionalTasks/ftp.html Index: ftp.html =================================================================== RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ftp.html,v retrieving revision 1.19.2.5 retrieving revision 1.19.2.6 diff -u -r1.19.2.5 -r1.19.2.6 --- ftp.html 17 Feb 2004 08:02:19 -0000 1.19.2.5 +++ ftp.html 2 Jun 2004 21:22:36 -0000 1.19.2.6 @@ -15,8 +15,10 @@ to perform each task.</p> <p><b>Note:</b> This task depends on external libraries not included in the Ant distribution. See <a href="../install.html#commons-net">Library Dependencies</a> for more information.</p> -<p>The ftp task makes no attempt to determine what file system syntax is -required by the remote server, and defaults to Unix standards. +<p>The ftp task attempts to determine what file system is in place on the FTP server. +Supported server types are Unix, NT, OS2, VMS, and OS400. In addition, NT and OS400 servers +which have been configured to display the directory in Unix style are also supported correctly. +Otherwise, the system will default to Unix standards. <i>remotedir</i> must be specified in the exact syntax required by the ftp server. If the usual Unix conventions are not supported by the server, <i>separator</i> can be used to set the file separator that should be used
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]