From 4a8f6869db3a4ba7cd1bcb153c3d5b4298728afa Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 5 Apr 2022 13:32:26 +0200 Subject: [PATCH] English: use American spelling consistently Authorization, Initialization, Organization etc. Closes #8673 --- docs/URL-SYNTAX.md | 6 +++--- docs/cmdline-opts/sasl-authzid.d | 2 +- docs/examples/curlx.c | 4 ++-- docs/examples/imap-authzid.c | 4 ++-- docs/examples/pop3-authzid.c | 4 ++-- docs/examples/smtp-authzid.c | 4 ++-- docs/examples/synctime.c | 4 ++-- docs/libcurl/curl_easy_setopt.3 | 4 ++-- docs/libcurl/curl_global_init.3 | 4 ++-- docs/libcurl/curl_global_init_mem.3 | 2 +- docs/libcurl/opts/CURLOPT_SASL_AUTHZID.3 | 4 ++-- include/curl/curl.h | 2 +- lib/curl_sasl.c | 2 +- lib/hmac.c | 6 +++--- lib/setopt.c | 2 +- lib/socks.h | 4 ++-- lib/urldata.h | 2 +- lib/vtls/gskit.c | 3 +-- packages/OS400/README.OS400 | 2 +- packages/OS400/initscript.sh | 2 +- src/tool_cfgable.h | 2 +- src/tool_easysrc.c | 4 ++-- tests/convsrctest.pl | 4 ++-- 23 files changed, 38 insertions(+), 39 deletions(-) diff --git a/docs/URL-SYNTAX.md b/docs/URL-SYNTAX.md index 65dfc6ba22..0b452f87fb 100644 --- a/docs/URL-SYNTAX.md +++ b/docs/URL-SYNTAX.md @@ -317,13 +317,13 @@ Name, Attributes, Scope, Filter and Extension for a LDAP search. Each field is separated by a question mark and when that field is not required an empty string with the question mark separator should be included. -Search for the DN as `My Organisation`: +Search for the DN as `My Organization`: - ldap://ldap.example.com/o=My%20Organisation + ldap://ldap.example.com/o=My%20Organization the same search but will only return postalAddress attributes: - ldap://ldap.example.com/o=My%20Organisation?postalAddress + ldap://ldap.example.com/o=My%20Organization?postalAddress Search for an empty DN and request information about the `rootDomainNamingContext` attribute for an Active Directory server: diff --git a/docs/cmdline-opts/sasl-authzid.d b/docs/cmdline-opts/sasl-authzid.d index d80e30f52c..4e2a419a97 100644 --- a/docs/cmdline-opts/sasl-authzid.d +++ b/docs/cmdline-opts/sasl-authzid.d @@ -6,7 +6,7 @@ Category: auth Example: --sasl-authzid zid imap://example.com/ See-also: login-options --- -Use this authorisation identity (authzid), during SASL PLAIN authentication, +Use this authorization identity (authzid), during SASL PLAIN authentication, in addition to the authentication identity (authcid) as specified by --user. If the option is not specified, the server will derive the authzid from the diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c index 9450cdd4cb..97ad010294 100644 --- a/docs/examples/curlx.c +++ b/docs/examples/curlx.c @@ -3,7 +3,7 @@ This is a little program to demonstrate the usage of - - an ssl initialisation callback setting a user key and trustbases + - an SSL initialization callback setting a user key and trustbases coming from a pkcs12 file - using an ssl application callback to find a URI in the certificate presented during ssl session establishment. @@ -228,7 +228,7 @@ static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg) } -/* The SSL initialisation callback. The callback sets: +/* The SSL initialization callback. The callback sets: - a private key and certificate - a trusted ca certificate - a preferred cipherlist diff --git a/docs/examples/imap-authzid.c b/docs/examples/imap-authzid.c index cf8ea1084b..4bdeb4ed4e 100644 --- a/docs/examples/imap-authzid.c +++ b/docs/examples/imap-authzid.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2022, 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 @@ -45,7 +45,7 @@ int main(void) curl_easy_setopt(curl, CURLOPT_USERNAME, "user"); curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret"); - /* Set the authorisation identity (identity to act as) */ + /* Set the authorization identity (identity to act as) */ curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "shared-mailbox"); /* Force PLAIN authentication */ diff --git a/docs/examples/pop3-authzid.c b/docs/examples/pop3-authzid.c index f6b9fe87ae..1162844885 100644 --- a/docs/examples/pop3-authzid.c +++ b/docs/examples/pop3-authzid.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2022, 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 @@ -45,7 +45,7 @@ int main(void) curl_easy_setopt(curl, CURLOPT_USERNAME, "user"); curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret"); - /* Set the authorisation identity (identity to act as) */ + /* Set the authorization identity (identity to act as) */ curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "shared-mailbox"); /* Force PLAIN authentication */ diff --git a/docs/examples/smtp-authzid.c b/docs/examples/smtp-authzid.c index e3b95114b8..5463c305db 100644 --- a/docs/examples/smtp-authzid.c +++ b/docs/examples/smtp-authzid.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2022, 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 @@ -107,7 +107,7 @@ int main(void) curl_easy_setopt(curl, CURLOPT_USERNAME, "kurt"); curl_easy_setopt(curl, CURLOPT_PASSWORD, "xipj3plmq"); - /* Set the authorisation identity (identity to act as) */ + /* Set the authorization identity (identity to act as) */ curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "ursel"); /* Force PLAIN authentication */ diff --git a/docs/examples/synctime.c b/docs/examples/synctime.c index bdf047390d..edf555dfb3 100644 --- a/docs/examples/synctime.c +++ b/docs/examples/synctime.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2022, 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 @@ -39,7 +39,7 @@ * * Synchronising your computer clock via Internet time server usually relies * on DAYTIME, TIME, or NTP protocols. These protocols provide good accurate - * time synchronisation but it does not work very well through a + * time synchronization but it does not work very well through a * firewall/proxy. Some adjustment has to be made to the firewall/proxy for * these protocols to work properly. * diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index c3b753b3bd..66cb466c01 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2022, 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 @@ -264,7 +264,7 @@ Proxy TLS authentication methods. See \fICURLOPT_PROXY_TLSAUTH_TYPE(3)\fP .IP CURLOPT_PROXYAUTH HTTP proxy authentication methods. See \fICURLOPT_PROXYAUTH(3)\fP .IP CURLOPT_SASL_AUTHZID -SASL authorisation identity (identity to act as). See \fICURLOPT_SASL_AUTHZID(3)\fP +SASL authorization identity (identity to act as). See \fICURLOPT_SASL_AUTHZID(3)\fP .IP CURLOPT_SASL_IR Enable SASL initial response. See \fICURLOPT_SASL_IR(3)\fP .IP CURLOPT_XOAUTH2_BEARER diff --git a/docs/libcurl/curl_global_init.3 b/docs/libcurl/curl_global_init.3 index dec38a835a..8709a63455 100644 --- a/docs/libcurl/curl_global_init.3 +++ b/docs/libcurl/curl_global_init.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2022, 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 @@ .\" ************************************************************************** .TH curl_global_init 3 "11 May 2004" "libcurl 7.12" "libcurl Manual" .SH NAME -curl_global_init - Global libcurl initialisation +curl_global_init - Global libcurl initialization .SH SYNOPSIS .nf #include diff --git a/docs/libcurl/curl_global_init_mem.3 b/docs/libcurl/curl_global_init_mem.3 index 9b8b4bffcd..12a8b1487b 100644 --- a/docs/libcurl/curl_global_init_mem.3 +++ b/docs/libcurl/curl_global_init_mem.3 @@ -21,7 +21,7 @@ .\" ************************************************************************** .TH curl_global_init_mem 3 "10 May 2004" "libcurl 7.12.0" "libcurl Manual" .SH NAME -curl_global_init_mem - Global libcurl initialisation with memory callbacks +curl_global_init_mem - Global libcurl initialization with memory callbacks .SH SYNOPSIS .nf #include diff --git a/docs/libcurl/opts/CURLOPT_SASL_AUTHZID.3 b/docs/libcurl/opts/CURLOPT_SASL_AUTHZID.3 index 7468235ccd..174ab53795 100644 --- a/docs/libcurl/opts/CURLOPT_SASL_AUTHZID.3 +++ b/docs/libcurl/opts/CURLOPT_SASL_AUTHZID.3 @@ -22,7 +22,7 @@ .\" .TH CURLOPT_SASL_AUTHZID 3 "11 Sep 2019" "libcurl 7.66.0" "curl_easy_setopt options" .SH NAME -CURLOPT_SASL_AUTHZID \- authorisation identity (identity to act as) +CURLOPT_SASL_AUTHZID \- authorization identity (identity to act as) .SH SYNOPSIS .nf #include @@ -31,7 +31,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SASL_AUTHZID, char *authzid); .fi .SH DESCRIPTION Pass a char * as parameter, which should be pointing to the null-terminated -authorisation identity (authzid) for the transfer. Only applicable to the PLAIN +authorization identity (authzid) for the transfer. Only applicable to the PLAIN SASL authentication mechanism where it is optional. When not specified only the authentication identity (authcid) as specified by diff --git a/include/curl/curl.h b/include/curl/curl.h index 79de068923..3a2c2ea561 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -2049,7 +2049,7 @@ typedef enum { * (in seconds) */ CURLOPT(CURLOPT_MAXAGE_CONN, CURLOPTTYPE_LONG, 288), - /* SASL authorisation identity */ + /* SASL authorization identity */ CURLOPT(CURLOPT_SASL_AUTHZID, CURLOPTTYPE_STRINGPOINT, 289), /* allow RCPT TO command to fail for some recipients */ diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index 7e28c92fd3..48d6625ba4 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -670,7 +670,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct Curl_easy *data, #endif case SASL_OAUTH2: - /* Create the authorisation message */ + /* Create the authorization message */ if(sasl->authused == SASL_MECH_OAUTHBEARER) { result = Curl_auth_create_oauth_bearer_message(conn->user, hostname, diff --git a/lib/hmac.c b/lib/hmac.c index 590abe6d2e..85b175d45f 100644 --- a/lib/hmac.c +++ b/lib/hmac.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2022, 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 @@ -39,8 +39,8 @@ * Generic HMAC algorithm. * * This module computes HMAC digests based on any hash function. Parameters - * and computing procedures are set-up dynamically at HMAC computation - * context initialisation. + * and computing procedures are set-up dynamically at HMAC computation context + * initialization. */ static const unsigned char hmac_ipad = 0x36; diff --git a/lib/setopt.c b/lib/setopt.c index 8bfeec37ae..0df1afa614 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2602,7 +2602,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) #endif case CURLOPT_SASL_AUTHZID: - /* Authorisation identity (identity to act as) */ + /* Authorization identity (identity to act as) */ result = Curl_setstropt(&data->set.str[STRING_SASL_AUTHZID], va_arg(param, char *)); break; diff --git a/lib/socks.h b/lib/socks.h index b0c7f9b26b..f30c610a86 100644 --- a/lib/socks.h +++ b/lib/socks.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2022, 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 @@ -69,7 +69,7 @@ CURLproxycode Curl_SOCKS5(const char *proxy_name, #if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) /* - * This function handles the SOCKS5 GSS-API negotiation and initialisation + * This function handles the SOCKS5 GSS-API negotiation and initialization */ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, struct Curl_easy *data); diff --git a/lib/urldata.h b/lib/urldata.h index e77fae7d10..07eb19b870 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -983,7 +983,7 @@ struct connectdata { char *user; /* user name string, allocated */ char *passwd; /* password string, allocated */ char *options; /* options string, allocated */ - char *sasl_authzid; /* authorisation identity string, allocated */ + char *sasl_authzid; /* authorization identity string, allocated */ unsigned char httpversion; /* the HTTP version*10 reported by the server */ struct curltime now; /* "current" time */ struct curltime created; /* creation time */ diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c index 56d48497db..0d22c4c0ed 100644 --- a/lib/vtls/gskit.c +++ b/lib/vtls/gskit.c @@ -449,8 +449,7 @@ static CURLcode set_ciphers(struct Curl_easy *data, static int gskit_init(void) { - /* No initialisation needed. */ - + /* No initialization needed. */ return 1; } diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 8e2d19d7b1..e245aff992 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -264,7 +264,7 @@ _ Enter Qshell (QSH, not PASE) _ Change current directory to the curl installation directory _ Change current directory to ./packages/OS400 _ Edit file iniscript.sh. You may want to change tunable configuration - parameters, like debug info generation, optimisation level, listing option, + parameters, like debug info generation, optimization level, listing option, target library, ZLIB/LIBSSH2 availability and location, etc. _ Copy any file in the current directory to makelog (i.e.: cp initscript.sh makelog): this is intended to create the makelog file with diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh index 93e713cf95..e09072f8d2 100644 --- a/packages/OS400/initscript.sh +++ b/packages/OS400/initscript.sh @@ -73,7 +73,7 @@ setenv DYNBNDDIR 'CURL' # Dynamic binding directory. setenv SRVPGM "CURL.${SONAME}" # Service program. setenv TGTCCSID '500' # Target CCSID of objects. setenv DEBUG '*ALL' # Debug level. -setenv OPTIMIZE '10' # Optimisation level +setenv OPTIMIZE '10' # Optimization level setenv OUTPUT '*NONE' # Compilation output option. setenv TGTRLS '*CURRENT' # Target OS release. setenv IFSDIR '/curl' # Installation IFS directory. diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index 9b6eed0c8b..c7cbab4bd7 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -110,7 +110,7 @@ struct OperationConfig { struct curl_slist *mail_rcpt; char *mail_auth; bool mail_rcpt_allowfails; /* --mail-rcpt-allowfails */ - char *sasl_authzid; /* Authorisation identity (identity to use) */ + char *sasl_authzid; /* Authorization identity (identity to use) */ bool sasl_ir; /* Enable/disable SASL initial response */ bool proxytunnel; bool ftp_append; /* APPE on ftp */ diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c index 85a586d9d6..b6c7af7229 100644 --- a/src/tool_easysrc.c +++ b/src/tool_easysrc.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2022, 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 @@ -59,7 +59,7 @@ static const char *const srchead[]={ NULL }; /* easysrc_decl declarations come here */ -/* easysrc_data initialisations come here */ +/* easysrc_data initialization come here */ /* easysrc_code statements come here */ static const char *const srchard[]={ "/* Here is a list of options the curl code used that cannot get generated", diff --git a/tests/convsrctest.pl b/tests/convsrctest.pl index 829cbdb368..323f57b8e6 100755 --- a/tests/convsrctest.pl +++ b/tests/convsrctest.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, 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 @@ -136,7 +136,7 @@ sub generate_c { } elsif(! $seen_setopt) { if(/^\s*(int main|\{|CURLcode |CURL |hnd = curl_easy_init)/) { - # Initialisations handled by boilerplate + # Initialization handled by boilerplate next; } else {