From: Rich Bowen Date: Sat, 2 May 2026 21:37:11 +0000 (+0000) Subject: Fix spelling errors and EN-GB->EN-US in docs (Bug 63923) X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a7cfcbf52d1d07226cfa9e37282edc927d8bc6a;p=thirdparty%2Fapache%2Fhttpd.git Fix spelling errors and EN-GB->EN-US in docs (Bug 63923) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933739 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/STATUS b/docs/STATUS index 35a235e178..3b1f071a3b 100644 --- a/docs/STATUS +++ b/docs/STATUS @@ -124,7 +124,7 @@ https://github.com/valenbg1/auth-example-mod-apache are accurate, and others are way outdated. - I'd like to expand the discussion of conditional logging, and add a - few more useful exmaples. + few more useful examples. That would be a good place to document logging of cache hit/miss: https://issues.apache.org/bugzilla/show_bug.cgi?id=48241#c2 diff --git a/docs/conf/extra/httpd-languages.conf.in b/docs/conf/extra/httpd-languages.conf.in index 7f664614fb..40eabfc3a7 100644 --- a/docs/conf/extra/httpd-languages.conf.in +++ b/docs/conf/extra/httpd-languages.conf.in @@ -36,7 +36,7 @@ # English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) # Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) # Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) -# Norwegian (no) - Polish (pl) - Portugese (pt) +# Norwegian (no) - Polish (pl) - Portuguese (pt) # Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) # Turkish (tr) - Simplified Chinese (zh-CN) - Spanish (es) # Traditional Chinese (zh-TW) diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in index 5f9a2342d1..870053a1ce 100644 --- a/docs/conf/extra/httpd-ssl.conf.in +++ b/docs/conf/extra/httpd-ssl.conf.in @@ -48,7 +48,7 @@ Listen @@SSLPort@@ # https://wiki.mozilla.org/Security/Server_Side_TLS # These policies will be updated over time in new releases to keep # settings compatible and secure with "modern" browser, or if you -# need to support legacy installtions, "intermediate" might be your +# need to support legacy installations, "intermediate" might be your # choice. # If you run the following command on your installation, the exact # contents of the defined SSL policies will be listed: diff --git a/docs/man/rotatelogs.8 b/docs/man/rotatelogs.8 index d5afa86aad..c3d46b7647 100644 --- a/docs/man/rotatelogs.8 +++ b/docs/man/rotatelogs.8 @@ -112,7 +112,7 @@ This creates the files /var/log/logfile\&.yyyy\&.mm\&.dd where yyyy is the year, .fi .PP -This creates the files /var/log/logfile\&.yyyy\&.mm where yyyy is the year and mm is the month\&. Every day at midnight, rotation will occur, including running programs specified with \fB-p\fR\&. Despite rotation ocurring, the filename will only change on the first rotation of the month\&. Rotation on other days will continue to output file and append to it\&. +This creates the files /var/log/logfile\&.yyyy\&.mm where yyyy is the year and mm is the month\&. Every day at midnight, rotation will occur, including running programs specified with \fB-p\fR\&. Despite rotation occurring, the filename will only change on the first rotation of the month\&. Rotation on other days will continue to output file and append to it\&. .nf diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml index 514f2879e2..4a550872fa 100644 --- a/docs/manual/content-negotiation.xml +++ b/docs/manual/content-negotiation.xml @@ -517,7 +517,7 @@ DirectoryIndex index ForceLanguagePriority directive can be used to override one or both of these error - messages and substitute the servers judgement in the form of the + messages and substitute the servers judgment in the form of the LanguagePriority directive.

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index c39f6625d9..f27cdb30b7 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -1440,7 +1440,7 @@ EnableSendfile On Note

This directive is evaluated at configuration processing time, - not at runtime. As a result, this directive cannot be conditonally + not at runtime. As a result, this directive cannot be conditionally evaluated by enclosing it in an If section.

 @@ -4264,7 +4264,7 @@ Protocols h2 http/1.1

This directive allows to configure the size (in bytes) of the memory buffer used to read data from the network or files.

-

A larger buffer can increase peformances with larger data, but consumes +

A larger buffer can increase performances with larger data, but consumes more memory per connection. The minimum configurable size is 1024.

@@ -5012,7 +5012,7 @@ certain events before failing a request
  • When writing data to the client, the length of time to wait - for an acknowledgement of a packet if the send buffer is + for an acknowledgment of a packet if the send buffer is full.
  • In mod_cgi and mod_cgid, @@ -5370,7 +5370,7 @@ recognized methods to modules.

    Note

    This directive is evaluated at configuration processing time, - not at runtime. As a result, this directive cannot be conditonally + not at runtime. As a result, this directive cannot be conditionally evaluated by enclosing it in an If section.

     @@ -5403,7 +5403,7 @@ recognized methods to modules.

    may be inadvertently derived from untrusted inputs.

    Windows systems should be isolated at the network layer from making outbound SMB/NTLM calls to unexpected destinations as a - more comprehensive and pre-emptive measure.

    + more comprehensive and preemptive measure.

    Directive Ordering diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml index 35c6350b18..7c28b0723d 100644 --- a/docs/manual/mod/mod_alias.xml +++ b/docs/manual/mod/mod_alias.xml @@ -70,7 +70,7 @@ href="../urlmapping.html">Mapping URLs to the filesystem

    Aliases and Redirects occurring in different contexts are processed like other directives according to standard merging rules. But when multiple + href="../sections.html#merging">merging rules. But when multiple Aliases or Redirects occur in the same context (for example, in the same VirtualHost section) they are processed in a particular order.

    diff --git a/docs/manual/mod/mod_authn_core.xml b/docs/manual/mod/mod_authn_core.xml index 95543703ed..3891a00b94 100644 --- a/docs/manual/mod/mod_authn_core.xml +++ b/docs/manual/mod/mod_authn_core.xml @@ -183,7 +183,7 @@ authentication

    The authentication type None disables authentication. When authentication is enabled, it is normally inherited by each - subsequent configuration section, + subsequent configuration section, unless a different authentication type is specified. If no authentication is desired for a subsection of an authenticated section, the authentication type None may be used; diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml index 0de645ff3a..f0375ba276 100644 --- a/docs/manual/mod/mod_authnz_ldap.xml +++ b/docs/manual/mod/mod_authnz_ldap.xml @@ -1426,7 +1426,7 @@ You can of course use search parameters on each of these.

    NONE
    -
    Establish an unsecure connection on the default LDAP port. This +
    Establish an insecure connection on the default LDAP port. This is the same as ldap:// on port 389.
    SSL
    Establish a secure connection on the default secure LDAP port. diff --git a/docs/manual/mod/mod_autht_jwt.xml b/docs/manual/mod/mod_autht_jwt.xml index 9b418ae15c..00b187fe78 100644 --- a/docs/manual/mod/mod_autht_jwt.xml +++ b/docs/manual/mod/mod_autht_jwt.xml @@ -105,7 +105,7 @@ JWT token

    If the algorithm type HS256 is used, the algorithm is set to HMAC-SHA256, and the secret is set within the file specified as the third parameter. The contents of the bearer token is still visible, and so - the channel must still be protected from evesdropping through TLS.

    + the channel must still be protected from eavesdropping through TLS.

    If the signature is verified, and if present, the sub claim is assigned to REMOTE_USER.

    @@ -158,7 +158,7 @@ JWT token

    If the algorithm type HS256 is used, the algorithm is set to HMAC-SHA256, and the secret is set within the file specified as the third parameter. The contents of the bearer token is still visible, and so - the channel must still be protected from evesdropping through TLS.

    + the channel must still be protected from eavesdropping through TLS.

    Verification Example diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml index 3b53ef112e..334a997f19 100644 --- a/docs/manual/mod/mod_authz_core.xml +++ b/docs/manual/mod/mod_authz_core.xml @@ -692,7 +692,7 @@ authentication succeeds but authorization fails

    If authentication succeeds but authorization fails, Apache HTTPD will respond with an HTTP response code of '401 UNAUTHORIZED' by default. This - usually causes browsers to display the password dialogue to the user + usually causes browsers to display the password dialog to the user again, which is not wanted in all situations. AuthzSendForbiddenOnFailure allows to change the response code to '403 FORBIDDEN'.

    diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index d0a75fb6bd..02c9c18f13 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -44,7 +44,7 @@ headers

    Order of processing is important and is affected both by the order in the configuration file and by placement in configuration sections. These + href="../sections.html#merging">configuration sections. These two directives have a different effect if reversed:

    diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index 668eb9a444..d796210e1a 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -738,7 +738,7 @@ connection client certificates.

    Since 2.4.10, new measures are in place to avoid the reference time from being inflated by cache hits or slow requests. First, the reference - time is not updated if no backend LDAP conncetions were needed. Second, + time is not updated if no backend LDAP connections were needed. Second, the reference time uses the time the HTTP request was received instead of the time the request is completed.

    diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml index c7f3aae6d8..6b1b53e3e3 100644 --- a/docs/manual/mod/mod_negotiation.xml +++ b/docs/manual/mod/mod_negotiation.xml @@ -226,7 +226,7 @@ cached by proxy servers

    If set, this directive allows content-negotiated documents to be cached by proxy servers. This could mean that clients - behind those proxys could retrieve versions of the documents + behind those proxies could retrieve versions of the documents that are not the best match for their abilities, but it will make caching more efficient.

    diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index c6884701a9..0e24999262 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -1646,7 +1646,7 @@ ProxyPassMatch "^/(.*\.gif)$" "http://backend.example.com/$1" behavior regarding reuse/keepalive of backend connections (which were never reused before for these URLs), the parameter enablereuse (or disablereuse) default to off (resp. on) - in this case. Setting enablereuse=on explicitely allows to + in this case. Setting enablereuse=on explicitly allows to reuse connections unless some backreference(s) belong in the authority part (hostname and/or port) of the url (this condition is enforced since Apache HTTP Server 2.4.55, and produces diff --git a/docs/manual/mod/mod_proxy_ajp.xml b/docs/manual/mod/mod_proxy_ajp.xml index da143b0691..0a35bb1318 100644 --- a/docs/manual/mod/mod_proxy_ajp.xml +++ b/docs/manual/mod/mod_proxy_ajp.xml @@ -506,7 +506,7 @@ attribute_value := (string) ssl_key_size refer to the corresponding pieces of HTTP and HTTPS.

    The jvm_route, is used to support sticky - sessions -- associating a user's sesson with a particular Tomcat instance + sessions -- associating a user's session with a particular Tomcat instance in the presence of multiple, load-balancing servers.

    The secret is sent when the secret=secret_keyword parameter is used in diff --git a/docs/manual/mod/mod_proxy_balancer.xml b/docs/manual/mod/mod_proxy_balancer.xml index f409299fef..8ee4a6a986 100644 --- a/docs/manual/mod/mod_proxy_balancer.xml +++ b/docs/manual/mod/mod_proxy_balancer.xml @@ -79,18 +79,18 @@ configure the Balancer and BalancerMembers.

    -
    - Load balancer stickyness -

    The balancer supports stickyness. When a request is proxied +

    + Load balancer stickiness +

    The balancer supports stickiness. When a request is proxied to some back-end, then all following requests from the same user should be proxied to the same back-end. Many load balancers implement this feature via a table that maps client IP addresses to back-ends. This approach is transparent to clients and back-ends, but suffers from some problems: unequal load distribution if clients are themselves - hidden behind proxies, stickyness errors when a client uses a dynamic - IP address that changes during a session and loss of stickyness, if the + hidden behind proxies, stickiness errors when a client uses a dynamic + IP address that changes during a session and loss of stickiness, if the mapping table overflows.

    -

    The module mod_proxy_balancer implements stickyness +

    The module mod_proxy_balancer implements stickiness on top of two alternative means: cookies and URL encoding. Providing the cookie can be either done by the back-end or by the Apache web server itself. The URL encoding is usually done on the back-end.

    @@ -112,7 +112,7 @@ ProxyPass "/test" "balancer://mycluster" ProxyPassReverse "/test" "balancer://mycluster" -

    Another example of how to provide load balancing with stickyness +

    Another example of how to provide load balancing with stickiness using mod_headers, even if the back-end server does not set a suitable session cookie:

    @@ -213,9 +213,9 @@ ProxyPassReverse "/test" "balancer://mycluster" containers can be dynamically controlled by the Manager.

    -
    - Details on load balancer stickyness -

    When using cookie based stickyness, you need to configure the +

    + Details on load balancer stickiness +

    When using cookie based stickiness, you need to configure the name of the cookie that contains the information about which back-end to use. This is done via the stickysession attribute added to either ProxyPass or @@ -227,11 +227,11 @@ ProxyPassReverse "/test" "balancer://mycluster" ProxySet. The cookie can either be set by the back-end, or as shown in the above example by the Apache web server itself.

    -

    Some back-ends use a slightly different form of stickyness cookie, +

    Some back-ends use a slightly different form of stickiness cookie, for instance Apache Tomcat. Tomcat adds the name of the Tomcat instance to the end of its session id cookie, separated with a dot (.) from the session id. Thus if the Apache web server finds a dot in the value - of the stickyness cookie, it only uses the part behind the dot to search + of the stickiness cookie, it only uses the part behind the dot to search for the route. In order to let Tomcat know about its instance name, you need to set the attribute jvmRoute inside the Tomcat configuration file conf/server.xml to the value of the @@ -239,7 +239,7 @@ ProxyPassReverse "/test" "balancer://mycluster" The name of the session cookie used by Tomcat (and more generally by Java web applications based on servlets) is JSESSIONID (upper case) but can be configured to something else.

    -

    The second way of implementing stickyness is URL encoding. +

    The second way of implementing stickiness is URL encoding. The web server searches for a query parameter in the URL of the request. The name of the parameter is specified again using stickysession. The value of the parameter is used to lookup a member worker with route @@ -271,15 +271,15 @@ ProxyPass "/test" "balancer://mycluster" stickysession=JSESSIONID|jsessionid sco for the same request, the information from the request parameter is used.

    -
    - Troubleshooting load balancer stickyness -

    If you experience stickyness errors, e.g. users lose their +

    + Troubleshooting load balancer stickiness +

    If you experience stickiness errors, e.g. users lose their application sessions and need to login again, you first want to check whether this is because the back-ends are sometimes unavailable or whether your configuration is wrong. To find out about possible stability problems with the back-ends, check your Apache error log for proxy error messages.

    -

    To verify your configuration, first check, whether the stickyness +

    To verify your configuration, first check, whether the stickiness is based on a cookie or on URL encoding. Next step would be logging the appropriate data in the access log by using an enhanced LogFormat. @@ -308,9 +308,9 @@ ProxyPass "/test" "balancer://mycluster" stickysession=JSESSIONID|jsessionid sco

    Common reasons for loss of session are session timeouts, which are usually configurable on the back-end server.

    The balancer also logs detailed information about handling - stickyness to the error log, if the log level is set to + stickiness to the error log, if the log level is set to debug or higher. This is an easy way to - troubleshoot stickyness problems, but the log volume might + troubleshoot stickiness problems, but the log volume might be too high for production servers under high load.

    diff --git a/docs/manual/mod/mod_proxy_html.xml b/docs/manual/mod/mod_proxy_html.xml index ce7bdcfec6..2501db8f49 100644 --- a/docs/manual/mod/mod_proxy_html.xml +++ b/docs/manual/mod/mod_proxy_html.xml @@ -55,7 +55,7 @@ making it accessible from outside.

    mod_xml2enc (see Internationalisation) and is a standard module in HTTPD 2.4 and development versions.

    -
    Customised HTML Parsing +
    Customized HTML Parsing

    Internally, mod_proxy_html uses the HTMLParser module from the third-party libxml2 library. Unlike other libxml2 parsers, HTMLParser deals with HTML without diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index eb76be094f..f1c813ce90 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -1944,7 +1944,7 @@ on such a connection identifies any other non-default virtual host, the compatibility policy is tested.

    The strict policy blocks all HTTP requests which are -identified with a different virtual host to that identifed by SNI. +identified with a different virtual host to that identified by SNI. The insecure policy allows all HTTP requests regardless of virtual host identified; such a configuration may be vulnerable to module="mod_ssl">SSLCipherSuite and SSLProtocol)

    • -
  • client vertification and authentication +
  • client verification and authentication settings: directives which affect TLS client certificate verification or authentication, such as SSLVerifyClient, not been tampered with.
    Signed Certificate Timestamp (SCT)
    -
    This is an acknowledgement from a log that it has accepted a valid +
    This is an acknowledgment from a log that it has accepted a valid certificate. It is signed with the log's public key. One or more SCTs is passed to clients during the handshake, either in the ServerHello (TLS extension), certificate extension, or in a stapled OCSP response.
    diff --git a/docs/manual/platform/netware.xml b/docs/manual/platform/netware.xml index c060653b7e..775d5e7048 100644 --- a/docs/manual/platform/netware.xml +++ b/docs/manual/platform/netware.xml @@ -184,7 +184,7 @@

    During the build process, adding the keyword "install" to the makefile command line will automatically produce a complete distribution package under the subdirectory DIST. Install httpd by simply copying the distribution that was produced - by the makfiles to the root of a NetWare volume (see: Compiling Apache httpd for + by the makefiles to the root of a NetWare volume (see: Compiling Apache httpd for NetWare below).

    diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml index 19fd89d8ac..61a451a55d 100644 --- a/docs/manual/platform/windows.xml +++ b/docs/manual/platform/windows.xml @@ -489,7 +489,7 @@ RewriteRule "(.*)" "${lowercase:$1}" [R,L] or -n, httpd will use the file name compiled into the server, such as conf\httpd.conf. This built-in path is relative to the installation directory. You can verify the compiled - file name from a value labelled as SERVER_CONFIG_FILE when + file name from a value labeled as SERVER_CONFIG_FILE when invoking httpd with the -V switch, like this:

    @@ -512,7 +512,7 @@ RewriteRule "(.*)" "${lowercase:$1}" [R,L]
  • The server root compiled into the server. This is /apache by default, you can verify it by using - httpd.exe -V and looking for a value labelled as + httpd.exe -V and looking for a value labeled as HTTPD_ROOT.
    • diff --git a/docs/manual/programs/rotatelogs.xml b/docs/manual/programs/rotatelogs.xml index 2d55095a04..26aeba870d 100644 --- a/docs/manual/programs/rotatelogs.xml +++ b/docs/manual/programs/rotatelogs.xml @@ -84,7 +84,7 @@ any error code returned on termination.

    same stdin, stdout, and stderr as rotatelogs itself, and also inherits the environment.

    When two parameters are provided, under some conditions the parameters -will have the same value. For example, if rotation is triggerd but the +will have the same value. For example, if rotation is triggered but the portions of the time and date incorporated into the log filename do not change across the rotation.

    @@ -235,7 +235,7 @@ an offset.

    This creates the files /var/log/logfile.yyyy.mm where yyyy is the year and mm is the month. Every day at midnight, rotation will occur, including running programs specified with -p. - Despite rotation ocurring, the filename will only change on the first + Despite rotation occurring, the filename will only change on the first rotation of the month. Rotation on other days will continue to output file and append to it.

    diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml index 7427c89ba9..e50c8fc076 100644 --- a/docs/manual/rewrite/flags.xml +++ b/docs/manual/rewrite/flags.xml @@ -944,7 +944,7 @@ The L flag can be useful in this context to end the
    UnsafeAllow3F

    Setting this flag is required to allow a rewrite to continue If the HTTP request being written has an encoded question mark, '%3f', and the - rewritten result has a '?' in the substiution. This protects from a malicious + rewritten result has a '?' in the substitution. This protects from a malicious URL taking advantage of a capture and re-substitution of the encoded question mark.

    diff --git a/docs/manual/rewrite/remapping.xml b/docs/manual/rewrite/remapping.xml index 098a2a2353..932668d6d0 100644 --- a/docs/manual/rewrite/remapping.xml +++ b/docs/manual/rewrite/remapping.xml @@ -770,7 +770,7 @@ of the URL.
    Solutions:

    Many of the solutions in this section will all use the same condition, -which leaves the matched value in the %2 backreference. %1 is the beginining +which leaves the matched value in the %2 backreference. %1 is the beginning of the query string (up to the key of intererest), and %3 is the remainder. This condition is a bit complex for flexibility and to avoid double '&&' in the substitutions.

    diff --git a/docs/manual/ssl/ssl_howto.xml b/docs/manual/ssl/ssl_howto.xml index c4f541a0bd..2fedfab0a1 100644 --- a/docs/manual/ssl/ssl_howto.xml +++ b/docs/manual/ssl/ssl_howto.xml @@ -400,7 +400,7 @@ SSLVerifyDepth 1

    The mod_auth_basic method is generally required when the certificates are completely arbitrary, or when their DNs have - no common fields (usually the organisation, etc.). In this case, + no common fields (usually the organization, etc.). In this case, you should establish a password database containing all clients allowed, as follows:

    diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml index 93f15e6269..d978dac5e3 100644 --- a/docs/manual/vhosts/name-based.xml +++ b/docs/manual/vhosts/name-based.xml @@ -54,7 +54,7 @@ applicable to a general-purpose web server.

    Name-based virtual hosting builds off of the IP-based virtual host - selection algorithm, meaning that comparisons of ther requested hostname + selection algorithm, meaning that comparisons of the requested hostname to configured hostnames occurs only within the set of virtual hosts that share the most specific IP:PORT based match at the network layer.