aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-09-24 10:30:40 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-09-24 10:30:40 +0000
commit0639e2a6e21bbe2bc5f3508701d6a8e869bb8e0c (patch)
tree19e69ad8ffa5bc6b39933914faf333fc1a4b4ccd
parentf1d707705e10c9de16c2e9e59f37c637b0d7145e (diff)
--ftp-ssl-control requires SSL/TLS, it does not "try" it
-rw-r--r--docs/curl.12
-rw-r--r--src/main.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index 31403f5fb..ebb40eed4 100644
--- 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 763d10dfe..273ad64ae 100644
--- 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 []",