From fa083980c595dc150f369aa5d9d6e0161ceafa11 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 7 May 2014 19:45:16 +0100 Subject: curl.1: Added missing --login-options option ...and removed ;OPTIONS from --user as that functionality was removed in 7.34.0. --- docs/curl.1 | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/docs/curl.1 b/docs/curl.1 index 1d9269b85..a9ddcd7f5 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -910,6 +910,16 @@ values, but the actual timeout will decrease in accuracy as the specified timeout increases in decimal precision. See also the \fI--connect-timeout\fP option. +If this option is used several times, the last one will be used. +.IP "--login-options " +Specify the login options to use during server authentication. + +You can use the login options to specify protocol specific options that may +be used during authentication. At present only IMAP, POP3 and SMTP support +login options. 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.34.0). + If this option is used several times, the last one will be used. .IP "--mail-auth
" (SMTP) Specify a single address. This will be used to specify the @@ -1613,23 +1623,15 @@ 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 " -Specify the user name, password and optional login options to use for server -authentication. Overrides \fI-n, --netrc\fP and \fI--netrc-optional\fP. +.IP "-u, --user " +Specify the user name and password 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 simply specify the user name, 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 specifying 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). +specifying a single colon with this option: "-u :". If this option is used several times, the last one will be used. .IP "-U, --proxy-user " -- cgit v1.2.3