aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-09-21 22:05:12 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-09-21 22:05:12 +0100
commit6dd8bd8d2f9729c8ca245ccfd5cc533fe4f7e8b2 (patch)
treee24be93d5935d60bfb5a041929dd8fbb51589354 /docs
parentb07709f7417c3e30a6c09445585579a4616d2e81 (diff)
curl.1: Added information about optional login options to --user in manpage
Added missing information, from curl 7.31.0, regarding the use of the optional login options that may be specified as part of --user. For example: --user 'user:password;auth=NTLM' in IMAP, POP3 and SMTP protocols.
Diffstat (limited to 'docs')
-rw-r--r--docs/curl.127
1 files changed, 17 insertions, 10 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index 52714eadb..f90bdabf3 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -1535,16 +1535,23 @@ If this option is used several times, the last one will be used.
.IP "--trace-time"
Prepends a time stamp to each trace or verbose line that curl displays.
(Added in 7.14.0)
-.IP "-u, --user <user:password>"
-Specify the user name and password to use for server authentication. Overrides
-\fI-n, --netrc\fP and \fI--netrc-optional\fP.
-
-If you just give the user name (without entering a colon) curl will prompt for
-a password.
-
-If you use an SSPI-enabled curl binary and do NTLM authentication, you can
-force curl to pick up the user name and password from your environment by
-simply specifying a single colon with this option: "-u :".
+.IP "-u, --user <user:password;options>"
+Specify the user name, password and optional login options to use for server
+authentication. Overrides \fI-n, --netrc\fP and \fI--netrc-optional\fP.
+
+If you simply specify the user name, with or without the login options, curl
+will prompt for a password.
+
+If you use an SSPI-enabled curl binary and perform NTLM authentication, you
+can force curl to select the user name and password from your environment by
+simply specifying a single colon with this option: "-u :" or by specfying the
+login options on their own, for example "-u ;auth=NTLM".
+
+You can use the optional login options part to specify protocol specific
+options that may be used during authentication. At present only IMAP, POP3 and
+SMTP support login options as part of the user login information. For more
+information about the login options please see RFC 2384, RFC 5092 and IETF
+draft draft-earhart-url-smtp-00.txt (Added in 7.31.0).
If this option is used several times, the last one will be used.
.IP "-U, --proxy-user <user:password>"