Merge from 9.4.x

Author: Chris Walker

jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java

@@ -173,7 +173,7 @@ public void testRolesAllowedWithTransportGuarantee() throws Exception
     public void testMethodAnnotation() throws Exception
     {
         //ServletSecurity annotation with HttpConstraint of TransportGuarantee.CONFIDENTIAL, and a list of rolesAllowed, and
-        //a HttpMethodConstraint for GET method that permits all and has TransportGuarantee.NONE (ie is default)
+        //an HttpMethodConstraint for GET method that permits all and has TransportGuarantee.NONE (ie is default)
 
         WebAppContext wac = makeWebAppContext(Method1Servlet.class.getCanonicalName(), "method1Servlet", new String[]{
             "/foo/*", "*.foo"

jetty-client/src/main/java/org/eclipse/jetty/client/HttpClientTransport.java

@@ -28,7 +28,7 @@
  * in order to plug-in a different transport for {@link HttpClient}.
  * <p>
  * While the {@link HttpClient} APIs define the HTTP semantic (request, response, headers, etc.)
- * <em>how</em> a HTTP exchange is carried over the network depends on implementations of this class.
+ * <em>how</em> an HTTP exchange is carried over the network depends on implementations of this class.
  * <p>
  * The default implementation uses the HTTP protocol to carry over the network the HTTP exchange,
  * but the HTTP exchange may also be carried using the FCGI protocol, the HTTP/2 protocol or,

jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java

@@ -32,7 +32,7 @@
 /**
  * {@link HttpContent} is a stateful, linear representation of the request content provided
  * by a {@link ContentProvider} that can be traversed one-way to obtain content buffers to
- * send to a HTTP server.
+ * send to an HTTP server.
  * <p>
  * {@link HttpContent} offers the notion of a one-way cursor to traverse the content.
  * The cursor starts in a virtual "before" position and can be advanced using {@link #advance()}

jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java

@@ -50,7 +50,7 @@
  * <ol>
  * <li>{@link #responseBegin(HttpExchange)}, when the HTTP response data containing the HTTP status code
  * is available</li>
- * <li>{@link #responseHeader(HttpExchange, HttpField)}, when a HTTP field is available</li>
+ * <li>{@link #responseHeader(HttpExchange, HttpField)}, when an HTTP field is available</li>
  * <li>{@link #responseHeaders(HttpExchange)}, when all HTTP headers are available</li>
  * <li>{@link #responseContent(HttpExchange, ByteBuffer, Callback)}, when HTTP content is available</li>
  * <li>{@link #responseSuccess(HttpExchange)}, when the response is successful</li>

jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java

@@ -82,7 +82,7 @@ public HttpRedirector(HttpClient client)
 
     /**
      * @param response the response to check for redirects
-     * @return whether the response code is a HTTP redirect code
+     * @return whether the response code is an HTTP redirect code
      */
     public boolean isRedirect(Response response)
     {

jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java

@@ -876,7 +876,7 @@ private URI newURI(String uri)
         }
         catch (URISyntaxException x)
         {
-            // The "path" of a HTTP request may not be a URI,
+            // The "path" of an HTTP request may not be a URI,
             // for example for CONNECT 127.0.0.1:8080.
             return null;
         }

jetty-client/src/main/java/org/eclipse/jetty/client/api/Request.java

@@ -40,7 +40,7 @@
 import org.eclipse.jetty.util.Fields;
 
 /**
- * <p>{@link Request} represents a HTTP request, and offers a fluent interface to customize
+ * <p>{@link Request} represents an HTTP request, and offers a fluent interface to customize
  * various attributes such as the path, the headers, the content, etc.</p>
  * <p>You can create {@link Request} objects via {@link HttpClient#newRequest(String)} and
  * you can send them using either {@link #send()} for a blocking semantic, or

jetty-client/src/main/java/org/eclipse/jetty/client/api/Response.java

@@ -29,7 +29,7 @@
 import org.eclipse.jetty.util.Callback;
 
 /**
- * <p>{@link Response} represents a HTTP response and offers methods to retrieve status code, HTTP version
+ * <p>{@link Response} represents an HTTP response and offers methods to retrieve status code, HTTP version
  * and headers.</p>
  * <p>{@link Response} objects are passed as parameters to {@link Response.Listener} callbacks, or as
  * future result of {@link Request#send()}.</p>

jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java

@@ -161,7 +161,7 @@ else if (read == 0)
     }
 
     /**
-     * Parses a HTTP response in the receivers buffer.
+     * Parses an HTTP response in the receivers buffer.
      *
      * @return true to indicate that parsing should be interrupted (and will be resumed by another thread).
      */

jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java

@@ -485,7 +485,7 @@ public void testConnectionForHTTP10ResponseIsRemoved(Scenario scenario) throws E
         ContentResponse response = request
             .onResponseBegin(response1 ->
             {
-                // Simulate a HTTP 1.0 response has been received.
+                // Simulate an HTTP 1.0 response has been received.
                 ((HttpResponse)response1).version(HttpVersion.HTTP_1_0);
             })
             .send();