summaryrefslogtreecommitdiff
path: root/docs/cmdline-opts
diff options
context:
space:
mode:
authorMichael Kaufmann <mail@michael-kaufmann.ch>2018-11-03 16:58:18 +0100
committerMichael Kaufmann <mail@michael-kaufmann.ch>2018-11-05 20:34:01 +0100
commit53db15ba5524584196eedb3abe8d2e97fb5a3cc0 (patch)
tree9e249e6b15f8e4580dd837cd15a6c678e2d6d057 /docs/cmdline-opts
parenta77b640cc0ddace57758946881294db6f03db16e (diff)
downloadcurl-53db15ba5524584196eedb3abe8d2e97fb5a3cc0.tar.gz
netrc: don't ignore the login name specified with "--user"
- for "--netrc", don't ignore the login/password specified with "--user", only ignore the login/password in the URL. This restores the netrc behaviour of curl 7.61.1 and earlier. - fix the documentation of CURL_NETRC_REQUIRED - improve the detection of login/password changes when reading .netrc - don't read .netrc if both login and password are already set Fixes #3213 Closes #3224
Diffstat (limited to 'docs/cmdline-opts')
-rw-r--r--docs/cmdline-opts/netrc-file.d2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/cmdline-opts/netrc-file.d b/docs/cmdline-opts/netrc-file.d
index 0b5d2400c..50126d255 100644
--- a/docs/cmdline-opts/netrc-file.d
+++ b/docs/cmdline-opts/netrc-file.d
@@ -5,7 +5,7 @@ Added: 7.21.5
Mutexed: netrc
---
This option is similar to --netrc, except that you provide the path (absolute
-or relative) to the netrc file that Curl should use. You can only specify one
+or relative) to the netrc file that curl should use. You can only specify one
netrc file per invocation. If several --netrc-file options are provided,
the last one will be used.