From 0e17b3aa22a8c1cbc842d2325e341bc4cdd1bc35 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Sun, 25 Aug 2024 19:49:08 +0530
Subject: [PATCH] add entry for bz-68773 and update the documentation of ftp
 task to note the new useSecureDataChannel attribute

---
 WHATSNEW              | 5 +++++
 manual/Tasks/ftp.html | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/WHATSNEW b/WHATSNEW
index 44818c9584..91ed182404 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -22,6 +22,11 @@ Other changes:
    cases that will only be logged otherwise.
    Github Pull Request #206
 
+ * <ftp> task now has a new "useSecureDataChannel" attribute which
+   can be set to true, when ftps is enabled, to enable secure data
+   channel.
+   Bugzilla Report 68773
+
 Fixed bugs:
 -----------
 
diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html
index 29dff2cd3b..ae9639f957 100644
--- a/manual/Tasks/ftp.html
+++ b/manual/Tasks/ftp.html
@@ -353,6 +353,14 @@ <h3>Parameters</h3>
       <em>Since Ant 1.10.13</em></td>
     <td>No</td>
   </tr>
+  <tr>
+    <td>useSecureDataChannel</td>
+    <td>Whether to use a secure data channel when ftps is enabled. Boolean, which when
+      set to <var>true</var>, will execute a "PROT P" command to enable the secure data
+      channel. Defaults to <var>false</var> and the value is ignored when ftps is not enabled.<br/>
+      <em>Since Ant 1.10.15</em></td>
+    <td>No</td>
+  </tr>
 </table>
 <h3>Note about <var>remotedir</var> attribute</h3>
 <table>