From: Frank Gevaerts Date: Mon, 28 May 2018 12:17:51 +0000 (+0200) Subject: curl.1: Fix cmdline-opts reference errors. X-Git-Tag: curl-7_61_0~118 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c189c66080664f48758a938d852e5d0471c3621;p=thirdparty%2Fcurl.git curl.1: Fix cmdline-opts reference errors. --data, --form, and --ntlm were declared to be mutually exclusive with non-existing options. --data and --form referred to --upload (which is short for --upload-file and therefore did work, so this one was merely a bit confusing), --ntlm referred to --negotiated instead of --negotiate. Closes #2612 --- diff --git a/docs/cmdline-opts/data.d b/docs/cmdline-opts/data.d index 1572858408..7d499665e0 100644 --- a/docs/cmdline-opts/data.d +++ b/docs/cmdline-opts/data.d @@ -4,7 +4,7 @@ Arg: Help: HTTP POST data Protocols: HTTP See-also: data-binary data-urlencode data-raw -Mutexed: form head upload +Mutexed: form head upload-file --- Sends the specified data in a POST request to the HTTP server, in the same way that a browser does when a user has filled in an HTML form and presses the diff --git a/docs/cmdline-opts/form.d b/docs/cmdline-opts/form.d index 8d04d4193a..0bbc3701f1 100644 --- a/docs/cmdline-opts/form.d +++ b/docs/cmdline-opts/form.d @@ -3,7 +3,7 @@ Short: F Arg: Help: Specify multipart MIME data Protocols: HTTP SMTP IMAP -Mutexed: data head upload +Mutexed: data head upload-file --- For HTTP protocol family, this lets curl emulate a filled-in form in which a user has pressed the submit button. This causes curl to POST data using the diff --git a/docs/cmdline-opts/ntlm.d b/docs/cmdline-opts/ntlm.d index d71cd43fe8..baaa1d534d 100644 --- a/docs/cmdline-opts/ntlm.d +++ b/docs/cmdline-opts/ntlm.d @@ -1,6 +1,6 @@ Long: ntlm Help: Use HTTP NTLM authentication -Mutexed: basic negotiated digest anyauth +Mutexed: basic negotiate digest anyauth See-also: proxy-ntlm Protocols: HTTP Requires: TLS