From 7a92f865b43aac942ae5755a7a3a06775751fdea Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 17 Dec 2021 11:02:18 +0100 Subject: [PATCH] misc: s/e-mail/email Consistency is king. Following the lead in everything curl. Closes #8159 --- docs/FEATURES.md | 10 +++++----- docs/INTERNALS.md | 2 +- docs/KNOWN_BUGS | 2 +- docs/MAIL-ETIQUETTE | 2 +- docs/cmdline-opts/form.d | 2 +- docs/cmdline-opts/mail-rcpt.d | 2 +- docs/examples/imap-append.c | 2 +- docs/examples/imap-authzid.c | 2 +- docs/examples/imap-copy.c | 2 +- docs/examples/imap-fetch.c | 4 ++-- docs/examples/imap-search.c | 4 ++-- docs/examples/imap-store.c | 2 +- docs/examples/pop3-authzid.c | 2 +- docs/examples/pop3-dele.c | 4 ++-- docs/examples/pop3-retr.c | 4 ++-- docs/examples/pop3-top.c | 4 ++-- docs/examples/smtp-authzid.c | 2 +- docs/examples/smtp-expn.c | 4 ++-- docs/examples/smtp-mail.c | 2 +- docs/examples/smtp-mime.c | 12 ++++++------ docs/examples/smtp-vrfy.c | 4 ++-- docs/libcurl/curl_mime_init.3 | 2 +- docs/libcurl/curl_mime_subparts.3 | 2 +- docs/libcurl/libcurl-tutorial.3 | 18 +++++++++--------- docs/libcurl/opts/CURLOPT_MIMEPOST.3 | 2 +- lib/imap.c | 2 +- lib/smtp.c | 2 +- tests/data/test648 | 6 +++--- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/FEATURES.md b/docs/FEATURES.md index 38e2ac3ed..a52d5da3a 100644 --- a/docs/FEATURES.md +++ b/docs/FEATURES.md @@ -147,7 +147,7 @@ - authentication: Plain, Login, CRAM-MD5, Digest-MD5, NTLM (9), Kerberos 5 (4) and External. - - send e-mails + - send emails - mail from support - mail size support - mail auth support for trusted server-to-server relaying @@ -165,8 +165,8 @@ - authentication: Clear Text, APOP and SASL - SASL based authentication: Plain, Login, CRAM-MD5, Digest-MD5, NTLM (9), Kerberos 5 (4) and External. - - list e-mails - - retrieve e-mails + - list emails + - retrieve emails - enhanced command support for: CAPA, DELE, TOP, STAT, UIDL and NOOP via custom requests - via http-proxy @@ -184,8 +184,8 @@ Kerberos 5 (4) and External. - list the folders of a mailbox - select a mailbox with support for verifying the UIDVALIDITY - - fetch e-mails with support for specifying the UID and SECTION - - upload e-mails via the append command + - fetch emails with support for specifying the UID and SECTION + - upload emails via the append command - enhanced command support for: EXAMINE, CREATE, DELETE, RENAME, STATUS, STORE, COPY and UID via custom requests - via http-proxy diff --git a/docs/INTERNALS.md b/docs/INTERNALS.md index 875d73998..b0f55de5e 100644 --- a/docs/INTERNALS.md +++ b/docs/INTERNALS.md @@ -357,7 +357,7 @@ LDAP E-mail ====== - The e-mail related source code is in `lib/imap.c`, `lib/pop3.c` and + The email related source code is in `lib/imap.c`, `lib/pop3.c` and `lib/smtp.c`. diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index 7987b5d36..dabd8c005 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -570,7 +570,7 @@ problems may have been fixed or changed somewhat since this was written. 6.4 Negotiate and Kerberos V5 need a fake user name In order to get Negotiate (SPNEGO) authentication to work in HTTP or Kerberos - V5 in the e-mail protocols, you need to provide a (fake) user name (this + V5 in the email protocols, you need to provide a (fake) user name (this concerns both curl and the lib) because the code wrongly only considers authentication if there's a user name provided by setting conn->bits.user_passwd in url.c https://curl.se/bug/view.cgi?id=440 How? diff --git a/docs/MAIL-ETIQUETTE b/docs/MAIL-ETIQUETTE index 5cad67fea..eef37d339 100644 --- a/docs/MAIL-ETIQUETTE +++ b/docs/MAIL-ETIQUETTE @@ -225,7 +225,7 @@ MAIL ETIQUETTE A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. - Q: What is the most annoying thing in e-mail? + Q: What is the most annoying thing in email? Apart from the screwed up read order (especially when mixed together in a thread when someone responds using the mandated bottom-posting style), it diff --git a/docs/cmdline-opts/form.d b/docs/cmdline-opts/form.d index b7cd093dc..12012daa6 100644 --- a/docs/cmdline-opts/form.d +++ b/docs/cmdline-opts/form.d @@ -107,7 +107,7 @@ followed by a content type specification. .br - a multipart can be terminated with a '=)' argument. -Example: the following command sends an SMTP mime e-mail consisting in an +Example: the following command sends an SMTP mime email consisting in an inline part in two alternative formats: plain text and HTML. It attaches a text file: diff --git a/docs/cmdline-opts/mail-rcpt.d b/docs/cmdline-opts/mail-rcpt.d index 240f7e5c4..8a3b43c15 100644 --- a/docs/cmdline-opts/mail-rcpt.d +++ b/docs/cmdline-opts/mail-rcpt.d @@ -7,7 +7,7 @@ Category: smtp Example: --mail-rcpt user@example.net smtp://example.com See-also: mail-rcpt-allowfails --- -Specify a single e-mail address, user name or mailing list name. Repeat this +Specify a single email address, user name or mailing list name. Repeat this option several times to send to multiple recipients. When performing an address verification (VRFY command), the recipient should be diff --git a/docs/examples/imap-append.c b/docs/examples/imap-append.c index e36cb10c0..045f896b8 100644 --- a/docs/examples/imap-append.c +++ b/docs/examples/imap-append.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * IMAP example showing how to send e-mails + * IMAP example showing how to send emails * */ diff --git a/docs/examples/imap-authzid.c b/docs/examples/imap-authzid.c index 12b566e89..cfa6fe448 100644 --- a/docs/examples/imap-authzid.c +++ b/docs/examples/imap-authzid.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * IMAP example showing how to retreieve e-mails from a shared mailed box + * IMAP example showing how to retreieve emails from a shared mailed box * */ diff --git a/docs/examples/imap-copy.c b/docs/examples/imap-copy.c index 3efa71389..4d3040381 100644 --- a/docs/examples/imap-copy.c +++ b/docs/examples/imap-copy.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * IMAP example showing how to copy an e-mail from one folder to another + * IMAP example showing how to copy an email from one folder to another * */ diff --git a/docs/examples/imap-fetch.c b/docs/examples/imap-fetch.c index 0fa584ae2..d8356e23c 100644 --- a/docs/examples/imap-fetch.c +++ b/docs/examples/imap-fetch.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * IMAP example showing how to retreieve e-mails + * IMAP example showing how to retreieve emails * */ diff --git a/docs/examples/imap-search.c b/docs/examples/imap-search.c index da3f2f99d..2ef6941aa 100644 --- a/docs/examples/imap-search.c +++ b/docs/examples/imap-search.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * IMAP example showing how to search for new e-mails + * IMAP example showing how to search for new emails * */ diff --git a/docs/examples/imap-store.c b/docs/examples/imap-store.c index 9a87a7993..fb45fc403 100644 --- a/docs/examples/imap-store.c +++ b/docs/examples/imap-store.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * IMAP example showing how to modify the properties of an e-mail + * IMAP example showing how to modify the properties of an email * */ diff --git a/docs/examples/pop3-authzid.c b/docs/examples/pop3-authzid.c index 55a9ef619..45e36362f 100644 --- a/docs/examples/pop3-authzid.c +++ b/docs/examples/pop3-authzid.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * POP3 example showing how to retrieve e-mails from a shared mailbox + * POP3 example showing how to retrieve emails from a shared mailbox * */ diff --git a/docs/examples/pop3-dele.c b/docs/examples/pop3-dele.c index ce6deee20..ff732d14c 100644 --- a/docs/examples/pop3-dele.c +++ b/docs/examples/pop3-dele.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * POP3 example showing how to delete e-mails + * POP3 example showing how to delete emails * */ diff --git a/docs/examples/pop3-retr.c b/docs/examples/pop3-retr.c index aef20d49e..39b0e96a4 100644 --- a/docs/examples/pop3-retr.c +++ b/docs/examples/pop3-retr.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * POP3 example showing how to retrieve e-mails + * POP3 example showing how to retrieve emails * */ diff --git a/docs/examples/pop3-top.c b/docs/examples/pop3-top.c index 56d76a61a..696570b8d 100644 --- a/docs/examples/pop3-top.c +++ b/docs/examples/pop3-top.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * POP3 example showing how to retrieve only the headers of an e-mail + * POP3 example showing how to retrieve only the headers of an email * */ diff --git a/docs/examples/smtp-authzid.c b/docs/examples/smtp-authzid.c index b315b215c..e3b95114b 100644 --- a/docs/examples/smtp-authzid.c +++ b/docs/examples/smtp-authzid.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * Send e-mail on behalf of another user with SMTP + * Send email on behalf of another user with SMTP * */ diff --git a/docs/examples/smtp-expn.c b/docs/examples/smtp-expn.c index 2c11c4f84..f02b56d1d 100644 --- a/docs/examples/smtp-expn.c +++ b/docs/examples/smtp-expn.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * SMTP example showing how to expand an e-mail mailing list + * SMTP example showing how to expand an email mailing list * */ @@ -29,7 +29,7 @@ #include #include -/* This is a simple example showing how to expand an e-mail mailing list. +/* This is a simple example showing how to expand an email mailing list. * * Notes: * diff --git a/docs/examples/smtp-mail.c b/docs/examples/smtp-mail.c index 2c0cfb253..df50f80f6 100644 --- a/docs/examples/smtp-mail.c +++ b/docs/examples/smtp-mail.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * Send e-mail with SMTP + * Send email with SMTP * */ diff --git a/docs/examples/smtp-mime.c b/docs/examples/smtp-mime.c index 564f920d2..91dfe0530 100644 --- a/docs/examples/smtp-mime.c +++ b/docs/examples/smtp-mime.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * SMTP example showing how to send mime e-mails + * SMTP example showing how to send mime emails * */ @@ -52,17 +52,17 @@ static const char *headers_text[] = { }; static const char inline_text[] = - "This is the inline text message of the e-mail.\r\n" + "This is the inline text message of the email.\r\n" "\r\n" - " It could be a lot of lines that would be displayed in an e-mail\r\n" + " It could be a lot of lines that would be displayed in an email\r\n" "viewer that is not able to handle HTML.\r\n"; static const char inline_html[] = "\r\n" - "

This is the inline HTML message of the e-mail.

" + "

This is the inline HTML message of the email.

" "
\r\n" "

It could be a lot of HTML data that would be displayed by " - "e-mail viewers able to handle HTML.

" + "email viewers able to handle HTML.

" "\r\n"; @@ -109,7 +109,7 @@ int main(void) mime = curl_mime_init(curl); /* The inline part is an alternative proposing the html and the text - versions of the e-mail. */ + versions of the email. */ alt = curl_mime_init(curl); /* HTML message. */ diff --git a/docs/examples/smtp-vrfy.c b/docs/examples/smtp-vrfy.c index 26819a50a..3720351d3 100644 --- a/docs/examples/smtp-vrfy.c +++ b/docs/examples/smtp-vrfy.c @@ -21,7 +21,7 @@ ***************************************************************************/ /* - * SMTP example showing how to verify an e-mail address + * SMTP example showing how to verify an email address * */ @@ -29,7 +29,7 @@ #include #include -/* This is a simple example showing how to verify an e-mail address from an +/* This is a simple example showing how to verify an email address from an * SMTP server. * * Notes: diff --git a/docs/libcurl/curl_mime_init.3 b/docs/libcurl/curl_mime_init.3 index 9a553aa73..fbce2b2f8 100644 --- a/docs/libcurl/curl_mime_init.3 +++ b/docs/libcurl/curl_mime_init.3 @@ -36,7 +36,7 @@ using option \fICURLOPT_MIMEPOST(3)\fP within a \fIcurl_easy_setopt(3)\fP call. Using a mime handle is the recommended way to post an HTTP form, format and -send a multi-part e-mail with SMTP or upload such an e-mail to an IMAP server. +send a multi-part email with SMTP or upload such an email to an IMAP server. .SH EXAMPLE .nf CURL *easy = curl_easy_init(); diff --git a/docs/libcurl/curl_mime_subparts.3 b/docs/libcurl/curl_mime_subparts.3 index 06c331f79..af842dbdf 100644 --- a/docs/libcurl/curl_mime_subparts.3 +++ b/docs/libcurl/curl_mime_subparts.3 @@ -45,7 +45,7 @@ is retained. It is possible to unassign previous part's contents by setting .SH EXAMPLE .nf /* The inline part is an alternative proposing the html and the text - versions of the e-mail. */ + versions of the email. */ alt = curl_mime_init(curl); /* HTML message. */ diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libcurl-tutorial.3 index c031968b0..266495b44 100644 --- a/docs/libcurl/libcurl-tutorial.3 +++ b/docs/libcurl/libcurl-tutorial.3 @@ -1188,12 +1188,12 @@ this behavior by setting \fICURLOPT_FTP_USE_EPRT(3)\fP to zero. .SH "MIME API revisited for SMTP and IMAP" In addition to support HTTP multi-part form fields, the MIME API can be used -to build structured e-mail messages and send them via SMTP or append such +to build structured email messages and send them via SMTP or append such messages to IMAP directories. -A structured e-mail message may contain several parts: some are displayed +A structured email message may contain several parts: some are displayed inline by the MUA, some are attachments. Parts can also be structured as -multi-part, for example to include another e-mail message or to offer several +multi-part, for example to include another email message or to offer several text formats alternatives. This can be nested to any level. To build such a message, you prepare the nth-level multi-part and then include @@ -1202,19 +1202,19 @@ it as a source to the parent multi-part using function bound to its parent multi-part, a nth-level multi-part belongs to it and should not be freed explicitly. -E-mail messages data is not supposed to be non-ascii and line length is -limited: fortunately, some transfer encodings are defined by the standards -to support the transmission of such incompatible data. Function +Email messages data is not supposed to be non-ascii and line length is +limited: fortunately, some transfer encodings are defined by the standards to +support the transmission of such incompatible data. Function \fIcurl_mime_encoder(3)\fP tells a part that its source data must be encoded before being sent. It also generates the corresponding header for that part. -If the part data you want to send is already encoded in such a scheme, -do not use this function (this would over-encode it), but explicitly set the +If the part data you want to send is already encoded in such a scheme, do not +use this function (this would over-encode it), but explicitly set the corresponding part header. Upon sending such a message, libcurl prepends it with the header list set with \fICURLOPT_HTTPHEADER(3)\fP, as 0th-level mime part headers. -Here is an example building an e-mail message with an inline plain/html text +Here is an example building an email message with an inline plain/html text alternative and a file attachment encoded in base64: .nf diff --git a/docs/libcurl/opts/CURLOPT_MIMEPOST.3 b/docs/libcurl/opts/CURLOPT_MIMEPOST.3 index cb4b00bdb..8956be7df 100644 --- a/docs/libcurl/opts/CURLOPT_MIMEPOST.3 +++ b/docs/libcurl/opts/CURLOPT_MIMEPOST.3 @@ -34,7 +34,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MIMEPOST, mime); Pass a mime handle previously obtained from \fIcurl_mime_init(3)\fP. This setting is supported by the HTTP protocol to post forms and by the -SMTP and IMAP protocols to provide the e-mail data to send/upload. +SMTP and IMAP protocols to provide the email data to send/upload. This option is the preferred way of posting an HTTP form, replacing and extending the deprecated \fICURLOPT_HTTPPOST(3)\fP option. diff --git a/lib/imap.c b/lib/imap.c index bea964f79..958ad1456 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -329,7 +329,7 @@ static bool imap_endofresp(struct Curl_easy *data, struct connectdata *conn, /* Do we have a continuation response? This should be a + symbol followed by a space and optionally some text as per RFC-3501 for the AUTHENTICATE and APPEND commands and as outlined in Section 4. Examples of RFC-4959 but - some e-mail servers ignore this and only send a single + instead. */ + some email servers ignore this and only send a single + instead. */ if(imap && !imap->custom && ((len == 3 && line[0] == '+') || (len >= 2 && !memcmp("+ ", line, 2)))) { switch(imapc->state) { diff --git a/lib/smtp.c b/lib/smtp.c index 8e0b04609..6c0829378 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -222,7 +222,7 @@ static bool smtp_endofresp(struct Curl_easy *data, struct connectdata *conn, /* Do we have a command response? This should be the response code followed by a space and optionally some text as per RFC-5321 and as outlined in - Section 4. Examples of RFC-4954 but some e-mail servers ignore this and + Section 4. Examples of RFC-4954 but some email servers ignore this and only send the response code instead as per Section 4.2. */ if(line[3] == ' ' || len == 5) { char tmpline[6]; diff --git a/tests/data/test648 b/tests/data/test648 index 15a75e7cd..3683530d7 100644 --- a/tests/data/test648 +++ b/tests/data/test648 @@ -27,7 +27,7 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the e-mail inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@log/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another" +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the email inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@log/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another" This is an attached file. @@ -60,8 +60,8 @@ To: another Content-Transfer-Encoding: quoted-printable Content-disposition: "inline" -This is the e-mail inline text with a very long line containing the special= - character =3D and that should be split by encoder. +This is the email inline text with a very long line containing the special = +character =3D and that should be split by encoder. ------------------------------ Content-Disposition: attachment; filename="test%TESTNUMBER.txt" Content-Transfer-Encoding: base64