summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2010-01-02 22:09:31 +0000
committerDaniel Stenberg <daniel@haxx.se>2010-01-02 22:09:31 +0000
commit2c93ec5303f0a3d46d10dbcee98e46a0b413a59b (patch)
treefda78920f00c99f178c9ebc9aed83b89d526983b /docs
parentd79b5a06137a04e76fffd64d2636f747b5ffd3bc (diff)
downloadcurl-2c93ec5303f0a3d46d10dbcee98e46a0b413a59b.tar.gz
- Make curl support --ssl and --ssl-reqd instead of the previous FTP-specific
versions --ftp-ssl and --ftp-ssl-reqd as these options are now used to control SSL/TLS for IMAP, POP3 and SMTP as well in addition to FTP. The old option names are still working but the new ones are the prefered ones (listed and documented).
Diffstat (limited to 'docs')
-rw-r--r--docs/curl.125
1 files changed, 15 insertions, 10 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index 27f81f276..35b4e6330 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____|
.\" *
-.\" * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
.\" *
.\" * This software is licensed as described in the file COPYING, which
.\" * you should have received as part of this distribution. The terms
@@ -466,19 +466,24 @@ This option has no effect if PORT, EPRT or EPSV is used instead of PASV.
FTP servers, mainly drftpd, require this non-standard command for
directory listings as well as up and downloads in PASV mode.
(Added in 7.20.x)
-.IP "--ftp-ssl"
-(FTP) Try to use SSL/TLS for the FTP connection. Reverts to a non-secure
-connection if the server doesn't support SSL/TLS. See also
-\fI--ftp-ssl-control\fP and \fI--ftp-ssl-reqd\fP for different levels of
-encryption required. (Added in 7.11.0)
+.IP "--ssl"
+(FTP, POP3, IMAP, SMTP) Try to use SSL/TLS for the connection. Reverts to a
+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.
.IP "--ftp-ssl-control"
(FTP) Require 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)
-.IP "--ftp-ssl-reqd"
-(FTP) Require SSL/TLS for the FTP connection.
-Terminates the connection if the server doesn't support SSL/TLS.
-(Added in 7.15.5)
+.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
+that can still be used but will be removed in a future version.
.IP "--ftp-ssl-ccc"
(FTP) Use CCC (Clear Command Channel)
Shuts down the SSL/TLS layer after authenticating. The rest of the