From: Rich Bowen Date: Mon, 20 Apr 2026 12:45:42 +0000 (+0000) Subject: docs: normalize British spellings to American English per style guide X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=0803dfe482cb2b02a71bda999f1017b5b2d1150b;p=thirdparty%2Fapache%2Fhttpd.git docs: normalize British spellings to American English per style guide git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933179 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/caching.xml b/docs/manual/caching.xml index 47a6e11493..b8fb632b3d 100644 --- a/docs/manual/caching.xml +++ b/docs/manual/caching.xml @@ -860,7 +860,7 @@ sys 0m0.000s .htaccess files would be a very expensive operation, partially defeating the point of caching (to speed up requests), mod_cache makes no decision about whether a cached - entity is authorised for serving. In other words; if + entity is authorized for serving. In other words; if mod_cache has cached some content, it will be served from the cache as long as that content has not expired.

@@ -916,7 +916,7 @@ sys 0m0.000s Another example is so-called HTTP request-smuggling attacks.

This document is not the correct place for an in-depth discussion - of HTTP request smuggling (instead, try your favourite search engine) + of HTTP request smuggling (instead, try your favorite search engine) however it is important to be aware that it is possible to make a series of requests, and to exploit a vulnerability on an origin webserver such that the attacker can entirely control the content diff --git a/docs/manual/developer/modules.xml b/docs/manual/developer/modules.xml index 87e48f1366..e1f7f2e181 100644 --- a/docs/manual/developer/modules.xml +++ b/docs/manual/developer/modules.xml @@ -171,7 +171,7 @@ module MODULE_VAR_EXPORT module_name_module =

Some of these read directly across, some don't. I'll try to - summarise what should be done below.

+ summarize what should be done below.

The stages that read directly across :

diff --git a/docs/manual/developer/new_api_2_4.xml b/docs/manual/developer/new_api_2_4.xml index 966d1eaf71..1caaef0193 100644 --- a/docs/manual/developer/new_api_2_4.xml +++ b/docs/manual/developer/new_api_2_4.xml @@ -56,7 +56,7 @@ ap_expr (NEW!)

Introduces a new API to parse and evaluate boolean and algebraic expressions, including provision for a standard syntax and - customised variants.

+ customized variants.

diff --git a/docs/manual/developer/output-filters.xml b/docs/manual/developer/output-filters.xml index c8536fc6f3..778f2867e9 100644 --- a/docs/manual/developer/output-filters.xml +++ b/docs/manual/developer/output-filters.xml @@ -143,7 +143,7 @@ apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb) sentinel is in fact not a valid bucket structure; any attempt to call normal bucket functions (such as apr_bucket_read) on the sentinel will have undefined - behaviour (i.e. will crash the process).

+ behavior (i.e. will crash the process).

There are a variety of functions and macros for traversing and manipulating bucket brigades; see the ctx; if (state == NULL) { - /* First invocation for this response: initialise state structure. + /* First invocation for this response: initialize state structure. */ f->ctx = state = apr_palloc(f->r->pool, sizeof *state); diff --git a/docs/manual/env.xml b/docs/manual/env.xml index adb45003ad..e8218b23d3 100644 --- a/docs/manual/env.xml +++ b/docs/manual/env.xml @@ -429,7 +429,7 @@

prefer-language -

This influences mod_negotiation's behaviour. If +

This influences mod_negotiation's behavior. If it contains a language tag (such as en, ja or x-klingon), mod_negotiation tries to deliver a variant with that language. If there's no such variant, diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml index 5334eb32be..75f4d7e527 100644 --- a/docs/manual/logs.xml +++ b/docs/manual/logs.xml @@ -609,7 +609,7 @@ CustomLog "|/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" common CustomLog "|$/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" common -

This was the default behaviour for Apache 2.2. +

This was the default behavior for Apache 2.2. Depending on the shell specifics this might lead to an additional shell process for the lifetime of the logging pipe program and signal handling problems during restart. diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 3ac229e50b..acb31bc848 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -436,7 +436,7 @@ NoDecode option available in 2.3.12 and later. Allow use of AllowOverride option to treat invalid (unrecognized or disallowed) directives in .htaccess as nonfatal. Instead of causing an Internal Server - Error, disallowed or unrecognised directives will be ignored + Error, disallowed or unrecognized directives will be ignored and a warning logged:

@@ -689,7 +689,7 @@ LastModified date.

CacheIgnoreHeaders takes a space separated list of HTTP headers that should not be stored in the cache. If only hop-by-hop headers not should be stored in the cache (the RFC 2616 compliant - behaviour), CacheIgnoreHeaders can be set to + behavior), CacheIgnoreHeaders can be set to None.

Example 1 @@ -707,7 +707,7 @@ LastModified date. Warning: If headers like Expires which are needed for proper cache management are not stored due to a - CacheIgnoreHeaders setting, the behaviour of + CacheIgnoreHeaders setting, the behavior of mod_cache is undefined. diff --git a/docs/manual/mod/mod_dbd.xml b/docs/manual/mod/mod_dbd.xml index da26eea142..07ba810a79 100644 --- a/docs/manual/mod/mod_dbd.xml +++ b/docs/manual/mod/mod_dbd.xml @@ -41,7 +41,7 @@
Connection Pooling

This module manages database connections, in a manner - optimised for the platform. On non-threaded platforms, + optimized for the platform. On non-threaded platforms, it provides a persistent connection in the manner of classic LAMP (Linux, Apache, Mysql, Perl/PHP/Python). On threaded platform, it provides an altogether more diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml index ac826d4647..fbe2d0e486 100644 --- a/docs/manual/mod/mod_dir.xml +++ b/docs/manual/mod/mod_dir.xml @@ -152,7 +152,7 @@ a directory

The argument can be:

  • on: issues a 302 redirection to the index resource.
    • -
  • off: does not issue a redirection. This is the legacy behaviour of mod_dir.
    • +
  • off: does not issue a redirection. This is the legacy behavior of mod_dir.
  • permanent: issues a 301 (permanent) redirection to the index resource.
  • temp: this has the same effect as on
  • seeother: issues a 303 redirection (also known as "See Other") to the index resource.
    • diff --git a/docs/manual/mod/mod_filter.xml b/docs/manual/mod/mod_filter.xml index 0140e880ab..d08cf64aac 100644 --- a/docs/manual/mod/mod_filter.xml +++ b/docs/manual/mod/mod_filter.xml @@ -162,7 +162,7 @@ FilterChain SSI
    Server side Includes (SSI)
    The same as the above but dispatching on handler (classic - SSI behaviour; .shtml files get processed). + SSI behavior; .shtml files get processed). FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'" FilterChain SSI @@ -237,7 +237,7 @@ FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'" modules. For httpd 2.1 and later, the ap_register_output_filter_protocol and ap_filter_protocol API enables filter modules to - declare their own behaviour.

    + declare their own behavior.

    At the same time, mod_filter should not interfere with a filter that wants to handle all aspects of the protocol. By diff --git a/docs/manual/mod/mod_firehose.xml b/docs/manual/mod/mod_firehose.xml index c0c9570063..47b8d50b50 100644 --- a/docs/manual/mod/mod_firehose.xml +++ b/docs/manual/mod/mod_firehose.xml @@ -32,7 +32,7 @@

    mod_firehose provides a mechanism to record data being passed between the httpd server and the client at the raw connection level to either a file or a pipe in such a way that the - data can be analysed or played back to the server at a future date. + data can be analyzed or played back to the server at a future date. It can be thought of as "tcpdump for httpd".

    Connections are recorded after the SSL has been stripped, and can @@ -76,7 +76,7 @@ webserver has been built against APR v2.0 or later, and an optional "nonblock" parameter is specified all file writes will be non blocking, and buffer overflows will cause debugging data to be lost. - In this case it is possible to prioritise the running of the server + In this case it is possible to prioritize the running of the server over the recording of firehose data.

diff --git a/docs/manual/mod/mod_http2.xml b/docs/manual/mod/mod_http2.xml index 7349513ff9..bec2af3523 100644 --- a/docs/manual/mod/mod_http2.xml +++ b/docs/manual/mod/mod_http2.xml @@ -959,7 +959,7 @@ H2TLSCoolDownSecs 0

With the default 0, no padding bytes are added to any payload - frames, e.g. HEADERS, DATA and PUSH_PROMISE. This is the behaviour + frames, e.g. HEADERS, DATA and PUSH_PROMISE. This is the behavior of previous versions. It means that under certain conditions, an observer of network traffic can see the length of those frames in the TLS stream. @@ -985,7 +985,7 @@ H2TLSCoolDownSecs 0 H2OutputBuffering - Determine buffering behaviour of output + Determine buffering behavior of output H2OutputBuffering on|off H2OutputBuffering on @@ -997,7 +997,7 @@ H2TLSCoolDownSecs 0

The directive H2OutputBuffering controls the buffering of stream output. - The default is on, which is the behaviour of previous versions. When off, all + The default is on, which is the behavior of previous versions. When off, all bytes are made available immediately to the main connection for sending them out to the client. This fixes interop issues with certain flavours of gRPC.

diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml index bedb52281a..f6ef79537f 100644 --- a/docs/manual/mod/mod_include.xml +++ b/docs/manual/mod/mod_include.xml @@ -990,7 +990,7 @@ SSITimeFormat "%R, %B %d, %Y" response by adding no-etag to the request notes.

The SSIETag directive suppresses this - behaviour, and allows the server to generate an ETag header. + behavior, and allows the server to generate an ETag header. This can be used to enable caching of the output. Note that a backend server or dynamic content generator may generate an ETag of its own, ignoring no-etag, and this ETag will be passed by @@ -1030,7 +1030,7 @@ server. the Last-Modified header is stripped from the response.

The SSILastModified directive overrides this - behaviour, and allows the Last-Modified header to be respected + behavior, and allows the Last-Modified header to be respected if already present, or set if the header is not already present. This can be used to enable caching of the output. SSILastModified can take on the following values:

diff --git a/docs/manual/mod/mod_md.xml b/docs/manual/mod/mod_md.xml index c6444b73d5..e024816fbb 100644 --- a/docs/manual/mod/mod_md.xml +++ b/docs/manual/mod/mod_md.xml @@ -1460,7 +1460,7 @@ MDMessageCmd /etc/apache/md-message Available in version 2.4.58 and later

- The mode `all` is the behaviour as in all previous versions. Both ServerName + The mode `all` is the behavior as in all previous versions. Both ServerName and ServerAlias are inspected to find the MDomain matching a VirtualHost. This automatically detects coverage, even when you only have added one of the names to an MDomain. diff --git a/docs/manual/mod/mod_policy.xml b/docs/manual/mod/mod_policy.xml index 915f270f56..bbc9f8ff67 100644 --- a/docs/manual/mod/mod_policy.xml +++ b/docs/manual/mod/mod_policy.xml @@ -177,7 +177,7 @@ : Enforce a minimum HTTP version within a request

When a request is encountered with an HTTP version number less than the required minimum version, the request is rejected. The following - version numbers are recognised: + version numbers are recognized:
  • HTTP/1.1
  • HTTP/1.0
  • HTTP/0.9
    • diff --git a/docs/manual/mod/mod_proxy_fcgi.xml b/docs/manual/mod/mod_proxy_fcgi.xml index 65b571d9ee..8603533fa7 100644 --- a/docs/manual/mod/mod_proxy_fcgi.xml +++ b/docs/manual/mod/mod_proxy_fcgi.xml @@ -203,7 +203,7 @@ ProxyPass "/myapp/" "balancer://myappcluster/"
    Environment Variables

    In addition to the configuration directives that control the - behaviour of mod_proxy, there are a number of + behavior of mod_proxy, there are a number of environment variables that control the FCGI protocol provider:

    diff --git a/docs/manual/mod/mod_proxy_html.xml b/docs/manual/mod/mod_proxy_html.xml index 57e60e2026..ce7bdcfec6 100644 --- a/docs/manual/mod/mod_proxy_html.xml +++ b/docs/manual/mod/mod_proxy_html.xml @@ -76,7 +76,7 @@ stylesheets or scripts: for those you should use another parser such as The main customisation directives are ProxyHTMLLinks and ProxyHTMLEvents. By default these are set in configuration file proxy-html.conf, which also contains -comments to help you customise your parser if required.

    +comments to help you customize your parser if required.

    For historical reasons, configuring mod_proxy_html to rewrite URLs in scripting events does not by default rewrite URLs in stylesheets. This can be changed by uncommenting the relevant line in @@ -210,7 +210,7 @@ will be considered as HTML links.

    (note that this happens automatically for HTML links).

l

Opposite to L. Overrides the one-change-only default -behaviour with HTML links.

+behavior with HTML links.

R

Use Regular Expression matching-and-replace. from-pattern is a regexp, and to-pattern a replacement string that may be diff --git a/docs/manual/mod/mod_proxy_http.xml b/docs/manual/mod/mod_proxy_http.xml index 7f3cef5f26..dd0e311a0a 100644 --- a/docs/manual/mod/mod_proxy_http.xml +++ b/docs/manual/mod/mod_proxy_http.xml @@ -54,7 +54,7 @@

Environment Variables

In addition to the configuration directives that control the - behaviour of mod_proxy, there are a number of + behavior of mod_proxy, there are a number of environment variables that control the HTTP protocol provider. Environment variables below that don't specify specific values are enabled when set to any value.

diff --git a/docs/manual/mod/mod_proxy_scgi.xml b/docs/manual/mod/mod_proxy_scgi.xml index 72c00c350d..b24a01feb4 100644 --- a/docs/manual/mod/mod_proxy_scgi.xml +++ b/docs/manual/mod/mod_proxy_scgi.xml @@ -78,7 +78,7 @@ ProxyPass "/scgi-bin/" "balancer://somecluster/"
Environment Variables

In addition to the configuration directives that control the - behaviour of mod_proxy, an environment + behavior of mod_proxy, an environment variable may also control the SCGI protocol provider:

@@ -112,7 +112,7 @@ header optimizations, which are not possible if the file comes over the backend socket. Additionally, the file contents are not transmitted twice.

The ProxySCGISendfile argument determines the - gateway behaviour:

+ gateway behavior:

Off
No special handling takes place.
diff --git a/docs/manual/mod/mod_session.xml b/docs/manual/mod/mod_session.xml index e851b3042f..b6935a0afc 100644 --- a/docs/manual/mod/mod_session.xml +++ b/docs/manual/mod/mod_session.xml @@ -187,7 +187,7 @@ SessionHeader X-Replace-Session

Using the "show cookies" feature of your browser, you would have seen a clear text representation of the session. This could potentially be a problem should the end user need to be kept unaware of the contents of - the session, or where a third party could gain unauthorised access to the + the session, or where a third party could gain unauthorized access to the data within the session.

The contents of the session can be optionally encrypted before being diff --git a/docs/manual/mod/mod_socache_memcache.xml b/docs/manual/mod/mod_socache_memcache.xml index 94a64ad84e..49513dcea2 100644 --- a/docs/manual/mod/mod_socache_memcache.xml +++ b/docs/manual/mod/mod_socache_memcache.xml @@ -76,7 +76,7 @@

Before Apache 2.4.17, this timeout was hardcoded and its value was 600 usec. - So, the closest configuration to match the legacy behaviour is to set + So, the closest configuration to match the legacy behavior is to set MemcacheConnTTL to 1ms.

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 157131265b..433bb453ab 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -1399,7 +1399,7 @@ CRL checks are applied to all certificates in the chain, while setting it to

The flag no_crl_for_cert_ok allows to restore - previous behaviour. + previous behavior.

@@ -3133,7 +3133,7 @@ though the syntax / allowable values for the parameters may sometimes differ.

SSLOpenSSLConfCmd is only used for features of OpenSSL which are not configurable by mod_ssl. It is possible that -mod_ssl behaviour will change across versions of httpd where +mod_ssl behavior will change across versions of httpd where SSLOpenSSLConfCmd is used.

diff --git a/docs/manual/mod/mod_substitute.xml b/docs/manual/mod/mod_substitute.xml index f8d17ad5e9..ae090f52de 100644 --- a/docs/manual/mod/mod_substitute.xml +++ b/docs/manual/mod/mod_substitute.xml @@ -211,7 +211,7 @@ Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i" context (off). The latter was the default in versions 2.4 and earlier, but changed starting with 2.5, hence SubstituteInheritBefore - set to off allows to restore the legacy behaviour. + set to off allows to restore the legacy behavior. SubstituteInheritBefore is itself inherited, hence contexts that inherit it (those that don't specify their own SubstituteInheritBefore value) will apply the diff --git a/docs/manual/mod/mod_xml2enc.xml b/docs/manual/mod/mod_xml2enc.xml index c5fa7ad4d4..44aa3eb2d9 100644 --- a/docs/manual/mod/mod_xml2enc.xml +++ b/docs/manual/mod/mod_xml2enc.xml @@ -53,7 +53,7 @@ for 2.2.x versions xml2enc_filter optional function to postprocess to another encoding. Using mod_xml2enc with an enabled module, no configuration is necessary: the other module will configure mod_xml2enc for you - (though you may still want to customise it using the configuration + (though you may still want to customize it using the configuration directives below).

Non-enabled modules
@@ -146,10 +146,10 @@ xml2EncDefault iso-8859-1

This server-wide directive aliases one or more encoding to another - encoding. This enables encodings not recognised by libxml2 to be handled + encoding. This enables encodings not recognized by libxml2 to be handled internally by libxml2's encoding support using the translation table for - a recognised encoding. This serves two purposes: to support character sets - (or names) not recognised either by libxml2 or iconv, and to skip + a recognized encoding. This serves two purposes: to support character sets + (or names) not recognized either by libxml2 or iconv, and to skip conversion for an encoding where it is known to be unnecessary.

 diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index 6cdca18696..1f9c2357e9 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -276,7 +276,7 @@ Listen 192.170.2.5:8000 IPv6 address without also accepting connections via IPv4, or conflicting with a Listen directive using an IPv4 address bound to the same port. (If the server is built with IPv4-mapped - addresses disabled, this is the default behaviour and + addresses disabled, this is the default behavior and this option has no effect.)
  • multipathtcp: Enable the use of diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml index 38ed6703e8..49760ddb1b 100644 --- a/docs/manual/new_features_2_2.xml +++ b/docs/manual/new_features_2_2.xml @@ -253,7 +253,7 @@ example when several modules each maintain their own connections.

    Apache 2.1 and later provides the ap_dbd API for - managing database connections (including optimised strategies + managing database connections (including optimized strategies for threaded and unthreaded MPMs), while APR 1.2 and later provides the apr_dbd API for interacting with the database.

    diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml index 18623541a9..a8005e20f3 100644 --- a/docs/manual/new_features_2_4.xml +++ b/docs/manual/new_features_2_4.xml @@ -267,7 +267,7 @@
    Where possible, mod_cache directives can now be set per directory, instead of per server.
    -
    The base URL of cached URLs can be customised, so that a cluster of +
    The base URL of cached URLs can be customized, so that a cluster of caches can share the same endpoint URL prefix.
    mod_cache is now capable of serving stale cached diff --git a/docs/manual/programs/htcacheclean.xml b/docs/manual/programs/htcacheclean.xml index 2653fc65d8..295ef2fa4b 100644 --- a/docs/manual/programs/htcacheclean.xml +++ b/docs/manual/programs/htcacheclean.xml @@ -103,7 +103,7 @@ the -t option.
    -n
    -
    Be nice. This causes slower processing in favour of other +
    Be nice. This causes slower processing in favor of other processes. htcacheclean will sleep from time to time so that (a) the disk IO will be delayed and (b) the kernel can schedule other processes in the meantime.
    diff --git a/docs/manual/stopping.xml b/docs/manual/stopping.xml index d169d2288b..64ab6c9c11 100644 --- a/docs/manual/stopping.xml +++ b/docs/manual/stopping.xml @@ -218,7 +218,7 @@ syntax error(s). (Mutex) and Unix socket files (ScriptSock) contain the server PID, and should coexist without problem. However, if a configuration - directive, third-party module or persistent CGI utilises any other on-disk + directive, third-party module or persistent CGI utilizes any other on-disk lock or state files, care should be taken to ensure that multiple running instances of httpd do not clobber each other's files.

    diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml index e447a79706..bf3e9597f2 100644 --- a/docs/manual/suexec.xml +++ b/docs/manual/suexec.xml @@ -481,7 +481,7 @@ option, there is always the possibility that a system or library call suEXEC uses before this check may be exploitable on your system. To counter - this, and because it is best-practise in general, you should use + this, and because it is best-practice in general, you should use filesystem permissions to ensure that only the group httpd runs as may execute suEXEC.

    diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index d27f943ccf..07d3a9f6a1 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -444,12 +444,12 @@ Require ip 127.0.0.1
  • mod_charset_lite: The DebugLevel - option has been removed in favour of per-module LogLevel configuration.
  • mod_ext_filter: The DebugLevel - option has been removed in favour of per-module LogLevel configuration.
    • @@ -481,7 +481,7 @@ Require ip 127.0.0.1 CustomLog were invoked using /bin/sh -c in 2.2 and earlier. In 2.4 and later, piped logging commands are executed directly. To restore the - old behaviour, see the piped logging + old behavior, see the piped logging documentation. diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml index e481c1768f..2a3bd020ac 100644 --- a/docs/manual/vhosts/mass.xml +++ b/docs/manual/vhosts/mass.xml @@ -257,7 +257,7 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon If this is not the server name you wish to use, a bogus entry (eg. ServerName none.example.com) can be added to get around this - behaviour.

    + behavior.