--ftp-ssl-control requires SSL/TLS, it does not "try" it

diff --git a/docs/curl.1 b/docs/curl.1
index 31403f5fb61fab50c84e75c7c24f4bf9b9914c93..ebb40eed41cbfff95be8756e5d761f261961ac8f 100644 (file)
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -418,7 +418,7 @@ encryption required. (Added in 7.11.0)
 
 If this option is used twice, the second will again disable this.
 .IP "--ftp-ssl-control"
-(FTP) Try SSL/TLS for the ftp login, clear for transfer.  Allows secure
+(FTP) Required SSL/TLS for the ftp login, clear for transfer.  Allows secure
 authentication, but non-encrypted data transfers for efficiency.  Fails the
 transfer if the server doesn't support SSL/TLS.  (Added in 7.16.0)
 

diff --git a/src/main.c b/src/main.c
index 763d10dfe1177c4fae7b494f2eeeda18dd0fa83e..273ad64ae08786c9e8a7920b63b880899b9b91c3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -520,9 +520,9 @@ static void help(void)
     "    --ftp-method [multicwd/nocwd/singlecwd] Control CWD usage (F)",
     "    --ftp-pasv      Use PASV/EPSV instead of PORT (F)",
     "    --ftp-skip-pasv-ip Skip the IP address for PASV (F)\n"
-    "    --ftp-ssl       Try SSL/TLS for the ftp transfer (F)",
-    "    --ftp-ssl-control Try SSL/TLS for the ftp login, clear for transfer (F)",
-    "    --ftp-ssl-reqd  Require SSL/TLS for the ftp transfer (F)",
+    "    --ftp-ssl       Try SSL/TLS for ftp transfer (F)",
+    "    --ftp-ssl-control Require SSL/TLS for ftp login, clear for transfer (F)",
+    "    --ftp-ssl-reqd  Require SSL/TLS for ftp transfer (F)",
     " -F/--form <name=content> Specify HTTP multipart POST data (H)",
     "    --form-string <name=string> Specify HTTP multipart POST data (H)",
     " -g/--globoff       Disable URL sequences and ranges using {} and []",