From 231e15c24e8fc748aef8011f97fc9830d994f5cf Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Tue, 17 Feb 2004 07:59:36 +0000
Subject: [PATCH] Fix information concerning library requirements for ftp task.
 jakarta-oro 2.0.1 or greater commons-net 1.2.0 or greater when using MS FTP
 servers

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276099 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/OptionalTasks/ftp.html |  9 +--------
 docs/manual/install.html           | 11 +++++------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/docs/manual/OptionalTasks/ftp.html b/docs/manual/OptionalTasks/ftp.html
index 397891c51..ed4a8ac21 100644
--- a/docs/manual/OptionalTasks/ftp.html
+++ b/docs/manual/OptionalTasks/ftp.html
@@ -13,7 +13,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
@@ -28,13 +28,6 @@ This task does not currently use the proxy information set by the
 <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.
diff --git a/docs/manual/install.html b/docs/manual/install.html
index b21369cd2..1f80829b2 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -303,9 +303,8 @@ Installing Ant / Optional Tasks</a> section above.</p>
   <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>
@@ -401,10 +400,10 @@ or a release of commons-net after 1.1.0 and jakarta-oro after 2.0.8</td>
            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>