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 1572858408352185a3ee1f401a59dd54986b8025..7d499665e08a4c530e3332dd87d0c622e1d5ca54 100644 (file)
--- a/docs/cmdline-opts/data.d
+++ b/docs/cmdline-opts/data.d
@@ -4,7 +4,7 @@ Arg: <data>
 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 8d04d4193a13e2daff3f62f730594da04a1457d9..0bbc3701f19cc43caf0e50b448bbc23f511cdd42 100644 (file)
--- a/docs/cmdline-opts/form.d
+++ b/docs/cmdline-opts/form.d
@@ -3,7 +3,7 @@ Short: F
 Arg: <name=content>
 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 d71cd43fe876957ecc68bf67f89f12c1da04d6f0..baaa1d534d3d2355e062bdbff45824d1e254b2ae 100644 (file)
--- 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