From 4d145346aee49bb8a828fbcd97b515b5465183f0 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 26 Jul 2021 02:54:13 -0400 Subject: docs: fix grammar Fixes https://github.com/curl/curl/issues/7444 Fixes https://github.com/curl/curl/issues/7451 Fixes https://github.com/curl/curl/issues/7465 Closes https://github.com/curl/curl/pull/7495 --- docs/cmdline-opts/location.d | 2 +- docs/cmdline-opts/mail-rcpt-allowfails.d | 5 +++-- docs/cmdline-opts/quote.d | 11 ++++++----- docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 | 5 +++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/cmdline-opts/location.d b/docs/cmdline-opts/location.d index c70b2eba8..6bf763d3a 100644 --- a/docs/cmdline-opts/location.d +++ b/docs/cmdline-opts/location.d @@ -14,7 +14,7 @@ intercept the user+password. See also --location-trusted on how to change this. You can limit the amount of redirects to follow by using the --max-redirs option. -When curl follows a redirect and if the request is a POST, it will do the +When curl follows a redirect and if the request is a POST, it will send the following request with a GET if the HTTP response was 301, 302, or 303. If the response code was any other 3xx code, curl will re-send the following request using the same unmodified method. diff --git a/docs/cmdline-opts/mail-rcpt-allowfails.d b/docs/cmdline-opts/mail-rcpt-allowfails.d index 76457c32e..e96be3e71 100644 --- a/docs/cmdline-opts/mail-rcpt-allowfails.d +++ b/docs/cmdline-opts/mail-rcpt-allowfails.d @@ -12,5 +12,6 @@ The default behavior can be changed by passing --mail-rcpt-allowfails command-line option which will make curl ignore errors and proceed with the remaining valid recipients. -In case when all recipients cause RCPT TO command to fail, curl will abort SMTP -conversation and return the error received from to the last RCPT TO command. \ No newline at end of file +If all recipients trigger RCPT TO failures and this flag is specified, curl +will still abort the SMTP conversation and return the error received from to +the last RCPT TO command. diff --git a/docs/cmdline-opts/quote.d b/docs/cmdline-opts/quote.d index 6e4fd08f1..f0e7be7a5 100644 --- a/docs/cmdline-opts/quote.d +++ b/docs/cmdline-opts/quote.d @@ -14,12 +14,13 @@ has changed the working directory, just before the transfer command(s), prefix the command with a '+' (this is only supported for FTP). You may specify any number of commands. -If the server returns failure for one of the commands, the entire operation -will be aborted. You must send syntactically correct FTP commands as RFC 959 -defines to FTP servers, or one of the commands listed below to SFTP servers. +By default curl will stop at first failure. To make curl continue even if the +command fails, prefix the command with an asterisk (*). Otherwise, if the +server returns failure for one of the commands, the entire operation will be +aborted. -Prefix the command with an asterisk (*) to make curl continue even if the -command fails as by default curl will stop at first failure. +You must send syntactically correct FTP commands as RFC 959 defines to FTP +servers, or one of the commands listed below to SFTP servers. This option can be used multiple times. diff --git a/docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 b/docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 index 0c02da3d6..79fca084f 100644 --- a/docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 +++ b/docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 @@ -39,8 +39,9 @@ return an error. The default behavior can be changed by setting \fIignore\fP to 1L which will make curl ignore errors and proceed with the remaining valid recipients. -In case when all recipients cause RCPT TO command to fail, curl will abort SMTP -conversation and return the error received from to the last RCPT TO command. +If all recipients trigger RCPT TO failures and this flag is specified, curl +will still abort the SMTP conversation and return the error received from to +the last RCPT TO command. .SH DEFAULT 0 .SH PROTOCOLS -- cgit v1.2.1