aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-05-05 11:28:03 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-05-05 11:28:03 +0200
commitfda0985bfde585f66dc64d2cd7483fcd10c45e5d (patch)
treef18b10a77359691d85614ee3b4f82ef51e8d9a16 /docs
parent93ec4555ff102e20ff04a7c3509f8b1e46757033 (diff)
curl.1: minor edit of --ftp-ssl*
Diffstat (limited to 'docs')
-rw-r--r--docs/curl.17
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index 49016d134..b84d2f544 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -1228,13 +1228,14 @@ non-secure connection if the server doesn't support SSL/TLS. See also
\fI--ftp-ssl-control\fP and \fI--ssl-reqd\fP for different levels of
encryption required. (Added in 7.20.0)
-This option was formerly known as \fI--ftp-ssl\fP (Added in 7.11.0) and that
-can still be used but will be removed in a future version.
+This option was formerly known as \fI--ftp-ssl\fP (Added in 7.11.0). That
+option name can still be used but will be removed in a future version.
.IP "--ssl-reqd"
(FTP, POP3, IMAP, SMTP) Require SSL/TLS for the connection. Terminates the
connection if the server doesn't support SSL/TLS. (Added in 7.20.0)
-This option was formerly known as \fI--ftp-ssl-reqd\fP (added in 7.15.5) and
+This option was formerly known as \fI--ftp-ssl-reqd\fP (added in 7.15.5). That
+option name can still be used but will be removed in a future version.
.IP "--socks4 <host[:port]>"
Use the specified SOCKS4 proxy. If the port number is not specified, it is
assumed at port 1080. (Added in 7.15.2)