antoine     2004/02/17 00:02:19

  Modified:    docs/manual Tag: ANT_16_BRANCH install.html
               docs/manual/OptionalTasks Tag: ANT_16_BRANCH ftp.html
  Log:
  Merge from HEAD
  Try to give better explanations concerning the library requirements for
  ftp task
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.59.2.10 +5 -6      ant/docs/manual/install.html
  
  Index: install.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/install.html,v
  retrieving revision 1.59.2.9
  retrieving revision 1.59.2.10
  diff -u -r1.59.2.9 -r1.59.2.10
  --- install.html      9 Feb 2004 22:12:06 -0000       1.59.2.9
  +++ install.html      17 Feb 2004 08:02:19 -0000      1.59.2.10
  @@ -304,9 +304,8 @@
     <tr>
       <td>jakarta-oro-2.0.7.jar</td>
       <td>regexp type with mappers and the perforce tasks<br>
  -    For the use of the FTP task together with MS FTP servers,
  -    you need CVS HEAD of commons-net and jakarta-oro after 2004-02-01 
  -or a release of commons-net after 1.1.0 and jakarta-oro after 2.0.8</td>
  +    To use the FTP task,
  +you need jakarta-oro 2.0.1 or later, and <a 
href="#commons-net">commons-net</a></td>
       <td><a href="http://jakarta.apache.org/oro/"; 
target="_top">http://jakarta.apache.org/oro/</a></td>
     </tr>
     <tr>
  @@ -402,10 +401,10 @@
              
target="_top">http://jakarta.apache.org/log4j/docs/index.html</a></td>
     </tr>
     <tr>
  -    <td>commons-net.jar</td>
  +    <td><a name="commons-net">commons-net.jar</td>
       <td>ftp, rexec and telnet tasks<br>
  -    In order to interact successfully with a MS FTP server, you need CVS 
HEAD of commons-net and jakarta-oro after 2004-02-01 
  -or a release of commons-net after 1.1.0 and jakarta-oro after 2.0.8.<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.
       </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.5  +1 -8      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.4
  retrieving revision 1.19.2.5
  diff -u -r1.19.2.4 -r1.19.2.5
  --- ftp.html  9 Feb 2004 22:12:11 -0000       1.19.2.4
  +++ ftp.html  17 Feb 2004 08:02:19 -0000      1.19.2.5
  @@ -14,7 +14,7 @@
   list, delete files, and create directories.  See below for descriptions and 
examples of how
   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#librarydependencies">Library Dependencies</a> 
for more information.</p>
  +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.
   <i>remotedir</i> must be specified in the exact syntax required by the ftp
  @@ -29,13 +29,6 @@
   <a href="setproxy.html">&lt;setproxy&gt;</a> task, and cannot go through
   a firewall via socks. 
   <p>
  -<b>Use of the FTP task with Microsoft FTP servers
  -</b>
  -<p>
  -To use the FTP task with Microsoft FTP servers, 
  -you need CVS HEAD of commons-net and jakarta-oro after 2004-02-01 
  -or a release of commons-net after 1.1.0 and jakarta-oro after 2.0.8.
  -</p>
   <b>Warning: </b> there have been problems reported concerning the ftp get 
with newer attribute.
   Problems might be due to format of ls -l differing from what is expected by 
commons-net,
   for instance due to specificities of langage used by the ftp server in the 
directory listing.
  
  
  

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

Reply via email to