From 0cf385b3ed778d176feb7f22ab127bc05e327209 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 2 Jul 2024 09:22:24 +0200 Subject: [PATCH] language cleanups - remove contractions - write "hostname" and "website" per project standard - and some more Closes #359 --- .htaccess | 2 +- README.md | 10 +- _404.html | 4 +- _about.html | 22 +- _book.html | 2 +- _changes.html | 282 +++++++++++++------------- _donation.html | 2 +- _download.html | 2 +- _gethelp.html | 4 +- _index.html | 2 +- _news2.html | 2 +- _newslog.html | 162 +++++++-------- _sponsors.html | 6 +- _web-editing.html | 6 +- ca/listpem.pl | 2 +- curl.css | 2 +- dev/_howto.html | 16 +- dev/_index.html | 4 +- dev/_source.html | 4 +- dev/autocurl.txt | 4 +- dev/ccwarn.pm | 2 +- dev/dev.js | 4 +- dev/explainopts.t | 2 +- dev/ignores | 6 +- dev/log.cgi | 2 +- dev/summarize.pl | 14 +- dev/update.pl | 2 +- dl/dlfix.pl | 2 +- dl/dtime.pm | 22 +- dl/mktable.pl | 2 +- dl/mod_entry.cgi | 6 +- dl/pbase.pm | 52 ++--- dl/remcheck.pl | 16 +- dl/stuff.pm | 4 +- docs/CVE-2009-0037.md | 4 +- docs/CVE-2015-3236.md | 2 +- docs/CVE-2016-0754.md | 2 +- docs/CVE-2017-1000101.md | 2 +- docs/CVE-2017-1000254.md | 2 +- docs/CVE-2017-1000257.md | 2 +- docs/CVE-2017-7468.md | 2 +- docs/CVE-2017-8816.md | 2 +- docs/CVE-2017-8817.md | 2 +- docs/CVE-2017-8818.md | 2 +- docs/CVE-2017-9502.md | 2 +- docs/CVE-2018-14618.md | 2 +- docs/CVE-2018-16839.md | 2 +- docs/CVE-2018-16840.md | 2 +- docs/CVE-2018-16842.md | 2 +- docs/CVE-2020-8284.md | 2 +- docs/CVE-2023-38546.md | 2 +- docs/_caextract.html | 8 +- docs/_companies.html | 4 +- docs/_copyright.html | 2 +- docs/_index.html | 4 +- docs/_irc.html | 4 +- docs/_menu.html | 2 +- docs/_projdocs.html | 4 +- docs/_reldocs.html | 2 +- docs/_ssl-compared.html | 6 +- docs/_thename.html | 6 +- docs/videos/videolist.txt | 16 +- docs/vuln.pm | 4 +- last20threads.pl | 4 +- latest.pm | 4 +- libcurl/_competitors.html | 4 +- libcurl/_features.html | 12 +- libcurl/_index.html | 2 +- libcurl/_libwww.html | 18 +- libcurl/_mail.html | 2 +- libcurl/_neon.html | 8 +- libcurl/_theysay.html | 38 ++-- libcurl/_wininet.html | 34 ++-- libcurl/c/_curl_easy_header.html | 2 +- libcurl/c/_curl_mime_filename.html | 2 +- libcurl/c/_curl_version_info.html | 2 +- libcurl/c/_index.html | 2 +- libcurl/c/_options-in-examples.html | 2 +- libcurl/c/_tls-options.html | 2 +- libcurl/c/curlopt2href.pl | 2 +- libcurl/c/mkallfunc.pl | 2 +- libcurl/c/mkexam.pl | 2 +- libcurl/c/mkopts.pl | 2 +- libcurl/c/options-used-in-examples.pl | 2 +- mail/_lost.html | 6 +- mail/_mail.html | 4 +- mail/_mailman.html | 4 +- mail/list.cgi | 4 +- mail/mailman.t | 4 +- mirror/_index.html | 2 +- mk-download.pl | 4 +- mk-sponsors.pl | 2 +- tiny/_index.html | 2 +- windows/_microsoft.html | 2 +- 94 files changed, 478 insertions(+), 478 deletions(-) diff --git a/.htaccess b/.htaccess index 5fafdf6288..54b0735d6c 100644 --- a/.htaccess +++ b/.htaccess @@ -126,7 +126,7 @@ Header set Content-Security-Policy: "default-src 'self' curl.haxx.se www.curl.se # Google Custom Search requires unsafe-eval & unsafe-inline in the CSP which # knocks a giant hole in the protection a CSP provides. Therefore, only use # that on the pages where custom search is used to mitigate it somewhat. The -# search page that shows up on the 404 error page won't be matched by this, +# search page that shows up on the 404 error page will not be matched by this, # however. The following link is supposed to be updated when Google fixes this # CSP issue and this hack can be removed: # https://support.google.com/programmable-search/thread/60663049?hl=en diff --git a/README.md b/README.md index 03d8ea3c6a..ef41723f70 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # curl-www -This is (most of) the curl.se web site contents. It mostly builds static +This is (most of) the curl.se website contents. It mostly builds static HTML files that are preprocessed. ## Prerequisites -The web site is a on old custom made setup that mostly builds static HTML +The website is a on old custom made setup that mostly builds static HTML files from a set of source files using (GNU) `make`. The sources files are preprocessed with what is basically a souped-up C preprocessor called `fcpp` and a set of `perl` scripts. The manpages get converted to HTML with @@ -27,11 +27,11 @@ Make sure the following tools are in your $PATH. ## Build -Once you've cloned the Git repo the first time, invoke `sh bootstrap.sh` once +Once you have cloned the Git repo the first time, invoke `sh bootstrap.sh` once to get a symlink and some some initial local files setup, and then you can -build the web site locally by invoking make in the source root tree. +build the website locally by invoking make in the source root tree. -Note that this doesn't make you a complete web site mirror, as some scripts +Note that this does not make you a complete website mirror, as some scripts and files are only available on the real actual site, but should give you enough to let you load most HTML pages locally. diff --git a/_404.html b/_404.html index ffd992168a..f23916b44c 100644 --- a/_404.html +++ b/_404.html @@ -28,10 +28,10 @@

This resource is gone!

Whatever you hoped you were going to get when you asked for this particular - URL, it isn't here. We may have removed some old cruft and hope that you + URL, it is not here. We may have removed some old cruft and hope that you will find your way to the new content instead, you may have pasted a bad URL or we may have screwed up somewhere when we edited content on the site. - We just can't tell. + We just cannot tell.

A humble suggestion is that you start over on diff --git a/_about.html b/_about.html index 242fdb68ea..8a123a6b91 100644 --- a/_about.html +++ b/_about.html @@ -1,6 +1,6 @@ #include "_doctype.html" - curl - About curl Web Site + curl - About curl website #include "css.t" @@ -13,18 +13,18 @@ #include "docs/_menu.html" WHERE3(Docs, "/docs/", Project, "/docs/projdocs.html", About) -TITLE(About the curl Web Site) +TITLE(About the curl website)

Related:
Online Docs
Mirrors

- This web site is dedicated to covering curl, libcurl and related issues only. + This website is dedicated to covering curl, libcurl and related issues only.

- If you have any complaints, ideas or suggestions for this web site, - don't hesitate to mail feedback to website, + do not hesitate to mail feedback to curl-web@haxx.se or post it on the curl-users mailing list. We do make a serious effort to please our audience. @@ -33,7 +33,7 @@ proper curl mailing list.

-SUBTITLE(The curl web site contents are...) +SUBTITLE(The curl website contents are...)

@@ -1421,7 +1421,7 @@ BGF select: avoid returning an error on EINTR from select() or poll() BGF test425: fix the log directory for the upload BGF url: provide better error message when URLs fail to parse - BGF urlapi: allow numerical parts in the host name + BGF urlapi: allow numerical parts in the hostname BGF vquic.c: make recvfrom_packets static, avoid compiler warning @@ -1473,12 +1473,12 @@ BGF content_encoding: only do transfer-encoding compression if asked to BGF cookie: address PVS nits BGF cookie: clarify that init with data set to NULL reads no file - BGF curl: do NOT append file name to path for upload when there's a query + BGF curl: do NOT append filename to path for upload when there's a query BGF curl_easy_getinfo.3: typo fix (duplicated "from the") BGF curl_easy_unescape.3: rename the argument BGF curl_path: bring back support for SFTP path ending in /~ BGF curl_url_set.3: mention that users can set content rather freely - BGF CURLOPT_IPRESOLVE.3: this for host names, not IP addresses + BGF CURLOPT_IPRESOLVE.3: this for hostnames, not IP addresses BGF data.d: emphasize no conversion BGF digest: clear target buffer BGF doc: curl_mime_init() strong easy binding was relaxed in 7.87.0 @@ -1505,7 +1505,7 @@ BGF h2/h3: replace `state.drain` counter with `state.dselect_bits` BGF hash: fix assigning same value BGF headers: clear (possibly) lingering pointer in init - BGF hostcheck: fix host name wildcard checking + BGF hostcheck: fix hostname wildcard checking BGF hostip: add locks around use of global buffer for alarm() BGF hostip: enforce a maximum DNS cache size independent of timeout value BGF HTTP-COOKIES.md: mention the #HttpOnly_ prefix @@ -1527,7 +1527,7 @@ BGF KNOWN_BUGS: remove fixed or outdated issues, move non-bugs BGF lib/cmake: add HAVE_WRITABLE_ARGV check BGF lib/sha256.c: typo fix in comment (duplicated "is available") - BGF lib1560: verify that more bad host names are rejected + BGF lib1560: verify that more bad hostnames are rejected BGF lib: add `bufq` and `dynhds` BGF lib: remove CURLX_NO_MEMORY_CALLBACKS BGF lib: unify the upload/method handling @@ -1762,7 +1762,7 @@ BGF url: fix the SSH connection reuse check BGF url: only reuse connections with same GSS delegation BGF url: remove dummy protocol handler - BGF urlapi: '%' is illegal in host names + BGF urlapi: '%' is illegal in hostnames BGF urlapi: avoid mutating internals in getter routine BGF urlapi: parse IPv6 literals without ENABLE_IPV6 BGF urlapi: take const args in _dup and _get functions @@ -1798,7 +1798,7 @@ BGF runtests: fix "uninitialized value $port" BGF setopt: allow HTTP3 when HTTP2 is not defined BGF socketpair: allow EWOULDBLOCK when reading the pair check bytes - BGF socks: allow using DoH to resolve host names + BGF socks: allow using DoH to resolve hostnames BGF tests-httpd: add proxy tests BGF tests: make sure gnuserv-tls has SRP support before using it BGF tests: make the telnet server shut down a socket gracefully @@ -1827,7 +1827,7 @@ BGF cf-socket: keep sockaddr local in the socket filters BGF cfilters:Curl_conn_get_select_socks: use the first non-connected filter BGF CI: add a workflow to automatically label pull requests - BGF CI: add pytest GHA to CI test/tests-httpd on a HTTP/3 setup + BGF CI: add pytest GHA to CI test/tests-httpd on an HTTP/3 setup BGF CI: Retry failed downloads to reduce spurious failures BGF CI: update wolfssl / wolfssh to 5.5.4 / 1.4.12 BGF cmake: bump requirement to 3.7 @@ -1885,7 +1885,7 @@ BGF haxproxy: send before TLS handhshake BGF header.d: add a header file example BGF hsts.d: explain hsts more - BGF hsts: handle adding the same host name again + BGF hsts: handle adding the same hostname again BGF HTTP/[23]: continue upload when state.drain is set BGF http2: aggregate small SETTINGS/PRIO/WIN_UPDATE frames BGF http2: fix compiler warning due to uninitialized variable @@ -2087,7 +2087,7 @@ BGF idn: remove Curl_win32_ascii_to_idn BGF INSTALL: update operating systems and CPU archs BGF KNOWN_BUGS: remove eight entries - BGF lib1560: add some basic IDN host name tests + BGF lib1560: add some basic IDN hostname tests BGF lib: connection filters (cfilter) addition to curl: BGF lib: feature deprecation warnings in gcc >= 4.3 BGF lib: fix some type mismatches and remove unneeded typecasts @@ -2153,7 +2153,7 @@ BGF tool_operate: when aborting, make sure there is a non-NULL error buffer BGF tool_paramhlp: free the proto strings on exit BGF url: move back the IDN conversion of proxy names - BGF urlapi: reject more bad letters from the host name: &+() + BGF urlapi: reject more bad letters from the hostname: &+() BGF urldata: change port num storage to int and unsigned short BGF vms: remove SIZEOF_SHORT BGF vtls: fix build without proxy support @@ -2307,7 +2307,7 @@ BGF mqtt: return error for too long topic BGF mqtt: spell out CONNECT in comments BGF msh3: change the static_assert to make the code C89 - BGF netrc: compare user name case sensitively + BGF netrc: compare username case sensitively BGF netrc: replace fgets with Curl_get_line BGF netrc: use the URL-decoded user BGF ngtcp2: fix build errors due to changes in ngtcp2 library @@ -2366,7 +2366,7 @@ BGF urlapi: detect scheme better when not guessing BGF urlapi: fix parsing URL without slash with CURLU_URLENCODE BGF urlapi: leaner with fewer allocs - BGF urlapi: reject more bad characters from the host name field + BGF urlapi: reject more bad characters from the hostname field BGF winbuild/MakefileBuild.vc: handle spaces in libssh(2) include paths BGF winbuild: use NMake batch-rules for compilation BGF windows: add .rc support to autotools builds @@ -2651,7 +2651,7 @@ BGF ngtcp2: send appropriate connection close error code BGF ngtcp2: support boringssl crypto backend BGF ngtcp2: use helper funcs to simplify TLS handshake integration - BGF ntlm: provide a fixed fake host name + BGF ntlm: provide a fixed fake hostname BGF projects: fix third-party SSL library build paths for Visual Studio BGF quic: add Curl_quic_idle BGF quiche: support ca-fallback @@ -2659,7 +2659,7 @@ BGF remote-name.d: mention --output-dir BGF runtests.pl: add the --repeat parameter to the --help output BGF runtests: fix skipping tests not done event-based - BGF runtests: skip starting the ssh server if user name is lacking + BGF runtests: skip starting the ssh server if username is lacking BGF scripts/copyright.pl: fix the exclusion to not ignore manpages BGF sectransp: check for a function defined when __BLOCKS__ is undefined BGF select: return error from "lethal" poll/select errors @@ -2702,7 +2702,7 @@ RELEASEVIDEO(7.83.1, "https://youtu.be/mnsCTd4cwyI")

Bugfixes:

@@ -2779,7 +2779,7 @@ BGF curl: error out if -T and -d are used for the same URL BGF curl: error out when options need features not present in libcurl BGF curl: escape '?' in generated --libcurl code - BGF curl: fix segmentation fault for empty output file names. + BGF curl: fix segmentation fault for empty output filenames. BGF curl_easy_header: fix typos in documentation BGF CURLINFO_PRIMARY_PORT.3: clarify which port this is BGF CURLOPT*TLSAUTH.3: they only work with OpenSSL or GnuTLS @@ -3039,7 +3039,7 @@ BGF schannel: move the algIds array out of schannel.h BGF scripts/cijobs.pl: output data about all currect CI jobs BGF scripts/completion.pl: improve zsh completion - BGF scripts/copyright.pl: support many provided file names on the cmdline + BGF scripts/copyright.pl: support many provided filenames on the cmdline BGF scripts/delta: check the file delta for current branch BGF sectransp: mark a 3DES cipher as weak BGF setopt: do bounds-check before strdup @@ -3057,7 +3057,7 @@ BGF unit1610: init SSL library before calling SHA256 functions BGF url: exclude zonefrom_url when no ipv6 is available BGF url: given a user in the URL, find pwd for that user in netrc - BGF url: keep trailing dot in host name + BGF url: keep trailing dot in hostname BGF url: make Curl_disconnect return void BGF urlapi: handle "redirects" smarter BGF urldata: CONN_IS_PROXIED replaces bits.proxy when proxy can be disabled @@ -3079,7 +3079,7 @@ RELEASEVIDEO(7.81.0, "https://youtu.be/OfTF8kmcSlA")

Changes:

Bugfixes:

Bugfixes:

SUBTITLE(Fixed in 7.58.0 - January 24 2018)

Changes:

Bugfixes: @@ -6709,7 +6709,7 @@ BGF http2: fix "Value stored to 'hdbuf' is never read" scan-build error BGF http2: fix "Value stored to 'end' is never read" scan-build error BGF Curl_open: fix OOM return error correctly - BGF url: reject ASCII control characters and space in host names + BGF url: reject ASCII control characters and space in hostnames BGF examples/rtsp: clear RANGE again after use BGF connect: improve the bind error message BGF make: fix "make distclean" @@ -6927,7 +6927,7 @@

Bugfixes:

Bugfixes:

@@ -11554,7 +11554,7 @@ BGF CURLOPT_FTP_CREATE_MISSING_DIRS works for third party transfers BGF memory leak for cookies received with max-age set BGF potential memory leaks in the window name resolver - BGF URLs with ?-letters in the user name or password fields + BGF URLs with ?-letters in the username or password fields BGF libcurl error message is now provided when send() fails BGF no more SIGPIPE on Mac OS X and other SO_NOSIGPIPE-supporting platforms BGF HTTP resume was refused if redirected @@ -11636,7 +11636,7 @@ BGF the msvc curllib.dsp now builds the libcurl.lib file BGF builds fine on VMS BGF builds fine on NetWare - BGF HTTP Digest authentication with proxies uses correct user name + password + BGF HTTP Digest authentication with proxies uses correct username + password BGF builds fine with lcc-win32 @@ -11668,7 +11668,7 @@ (which is as high a signed 64 bit number can reach) BGF general HTTP authentication improvements BGF HTTP Digest authentication with the proxy works - BGF mulipart formposting with -F and file names with spaces work again + BGF mulipart formposting with -F and filenames with spaces work again BGF curl_easy_duphandle() now works when ares-enabled BGF HTTP Digest authentication works a lot more like the RFC says BGF curl works with telnet and stdin properly on Windows @@ -11709,7 +11709,7 @@ BGF fixed a minor very old progress meter final update bug BGF added checks for a working NI_WITHSCOPEID before that is used BGF fixed a flaw that prevented ares name resolve timeouts to occur - BGF getting user name from http_proxy env variable works now + BGF getting username from http_proxy env variable works now BGF fixed too early name resolve timeouts with ares BGF HTTP Digest "re-negotiation" works now BGF CURLOPT_FAILONERROR (-f/--fail) works with all kinds of authentication @@ -11805,7 +11805,7 @@

Bugfixes:

Bugfixes:

@@ -12477,7 +12477,7 @@ BGF bugfixed the redirected stderr feature BGF more test cases added BGF libcurl now verifies the CN name of server certificates when SSLing - BGF curl -E supports file names with driver letters now on windows + BGF curl -E supports filenames with driver letters now on windows BGF curl-config --libs now includes the path to the installed libcurl BGF file:// with "relative" paths now work like other tools/libs BGF curl builds under RISC OS and OpenVMS now @@ -12652,7 +12652,7 @@

Bugfixes:

@@ -12764,7 +12764,7 @@ @@ -13011,7 +13011,7 @@ original URL had cgi-parameters that contained a slash. Nusu's page again. BGF Corrected the NO_PROXY usage. It is a list of substrings that if one of - them matches the tail of the host name it should connect to, curl should + them matches the tail of the hostname it should connect to, curl should not use a proxy to connect there. BGF Fixed a memory bug with http-servers that sent Location: to a Location: page. @@ -13072,7 +13072,7 @@ @@ -13655,9 +13655,9 @@

Bugfixes:

@@ -13683,7 +13683,7 @@ SUBTITLE(Fixed in 3.2 - December 1 1997)

Changes:

@@ -13694,13 +13694,13 @@ progress meter and time control. BGF alarm() usage removed completely BGF FTP get can now list directory contents if the path ends with a slash '/'. - Urlget on a ftp-path that doesn't end with a slash means urlget will - attempt getting it as a file name. + Urlget on a ftp-path that does not end with a slash means urlget will + attempt getting it as a filename. BGF FTP upload now allows the size of the uploaded file to be provided, and thus it can better check it actually uploaded the whole file. It also makes the progress meter for uploads much better! BGF Made the parameter parsing fail in cases like 'urlget -r 900' which - previously tried to connect to the host named '900'. + previously tried to connect to the hostnamed '900'. @@ -13719,7 +13719,7 @@ CHG Restructured the source quite a lot. Changed the urlget() interface. This way, we will survive changes much better. New features can come and old can be removed without us needing - to change the interface. I've written a small explanation in urlget.h + to change the interface. I have written a small explanation in urlget.h that explains it. CHG New flags include -t, -T, -O and -h. The -h text is generated by the new mkhelp script. @@ -13749,7 +13749,7 @@

Changes:

Bugfixes:

@@ -13918,7 +13918,7 @@

Bugfixes:

diff --git a/_donation.html b/_donation.html index 67af4f973f..dd388b5733 100644 --- a/_donation.html +++ b/_donation.html @@ -31,7 +31,7 @@

To ensure that the curl project continues to strive. Even open source projects has expenses! You can use curl forever without paying anything, but - maybe you think you've got quite a lot and feel you could contribute a + maybe you think you have got quite a lot and feel you could contribute a little back?

See also Mary Gardiner's excellent diff --git a/_download.html b/_download.html index f450599eab..48366e10d5 100644 --- a/_download.html +++ b/_download.html @@ -61,7 +61,7 @@

If you have newer archives or archives for platforms not already present in - this table, we'd like to add them to this table with a pointer to your + this table, we would like to add them to this table with a pointer to your location. Mail curl-release and tell us! diff --git a/_gethelp.html b/_gethelp.html index 7deb9655b9..ed8f58641e 100644 --- a/_gethelp.html +++ b/_gethelp.html @@ -35,7 +35,7 @@

  • Learn about curl stuff from this set of video presentations
  • Research the documentation - section of this web site + section of this website SUBTITLE(Bugs or issues?) @@ -52,7 +52,7 @@ the curl-library mailing list
  • submit a pull-request on github -
  • see also the development section of the web site +
  • see also the development section of the website SUBTITLE(Paying for support?) diff --git a/_index.html b/_index.html index 97d09a813e..5a2425a127 100644 --- a/_index.html +++ b/_index.html @@ -76,7 +76,7 @@

    Supports...

    DICT, FILE, FTP, FTPS, GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, MQTT, POP3, POP3S, RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, -SMTPS, TELNET, TFTP, WS and WSS. curl supports TLS certificates, HTTP POST, +SMTPS, TELNET, TFTP, WS and WSS. curl supports TLS certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, proxies (SOCKS4, SOCKS5, HTTP and HTTPS), HTTP/2, HTTP/3, cookies, user+password authentication (Basic, Plain, Digest, CRAM-MD5, SCRAM-SHA, NTLM, Negotiate, Kerberos, Bearer tokens diff --git a/_news2.html b/_news2.html index fb2a0ffe71..36654539e9 100644 --- a/_news2.html +++ b/_news2.html @@ -23,7 +23,7 @@

    - You'll find some of the older news here. + you will find some of the older news here. #include "_footer.html" diff --git a/_newslog.html b/_newslog.html index b7c68dfe14..b436cef4ee 100644 --- a/_newslog.html +++ b/_newslog.html @@ -1081,18 +1081,18 @@ The git repositories on github for the source and - the web site have now been + the website have now been moved over to its new home there: the curl organization. NCOLE - NSUBJ(web site over HTTPS) + NSUBJ(website over HTTPS) NDATE(January 29 2016) NCOLS - The curl web site is now served over HTTPS and with HTTP/2 - with + The curl website is now served over HTTPS and with HTTP/2 - with certificates from Let's Encrypt. Starting February 3, the curl site automatically redirects all http accesses to its https version. No more HTTP accesses to contents. @@ -1198,7 +1198,7 @@ since Spamhaus deems our ISP to be irresponsible and blacklists us.

    - We have a fixed IP and we've done nothing wrong here, but apparently + We have a fixed IP and we have done nothing wrong here, but apparently collective punishment is a method. NCOLE @@ -1287,7 +1287,7 @@ This release comes bundled with no less than four different security advisories: