Merge branch '4.0.x'

Closes gh-49388

module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JettyHttpClientBuilder.java

@@ -75,10 +75,10 @@ public final class JettyHttpClientBuilder {
 	}
 
 	/**
-	 * Return a new {@link JettyClientHttpRequestFactoryBuilder} that applies additional
-	 * customization to the underlying {@link HttpClient}.
+	 * Return a new {@link JettyHttpClientBuilder} that applies additional customization
+	 * to the underlying {@link HttpClient}.
 	 * @param customizer the customizer to apply
-	 * @return a new {@link JettyClientHttpRequestFactoryBuilder} instance
+	 * @return a new {@link JettyHttpClientBuilder} instance
 	 */
 	public JettyHttpClientBuilder withCustomizer(Consumer<HttpClient> customizer) {
 		Assert.notNull(customizer, "'customizer' must not be null");
@@ -87,10 +87,10 @@ public final class JettyHttpClientBuilder {
 	}
 
 	/**
-	 * Return a new {@link JettyClientHttpRequestFactoryBuilder} that uses the given
-	 * factory to create the {@link HttpClientTransport}.
+	 * Return a new {@link JettyHttpClientBuilder} that uses the given factory to create
+	 * the {@link HttpClientTransport}.
 	 * @param httpClientTransportFactory the {@link HttpClientTransport} factory to use
-	 * @return a new {@link JettyClientHttpRequestFactoryBuilder} instance
+	 * @return a new {@link JettyHttpClientBuilder} instance
 	 * @since 4.0.0
 	 */
 	public JettyHttpClientBuilder withHttpClientTransportFactory(
@@ -101,10 +101,10 @@ public final class JettyHttpClientBuilder {
 	}
 
 	/**
-	 * Return a new {@link JettyClientHttpRequestFactoryBuilder} that applies additional
-	 * customization to the underlying {@link HttpClientTransport}.
+	 * Return a new {@link JettyHttpClientBuilder} that applies additional customization
+	 * to the underlying {@link HttpClientTransport}.
 	 * @param httpClientTransportCustomizer the customizer to apply
-	 * @return a new {@link JettyClientHttpRequestFactoryBuilder} instance
+	 * @return a new {@link JettyHttpClientBuilder} instance
 	 */
 	public JettyHttpClientBuilder withHttpClientTransportCustomizer(
 			Consumer<HttpClientTransport> httpClientTransportCustomizer) {
@@ -115,10 +115,10 @@ public final class JettyHttpClientBuilder {
 	}
 
 	/**
-	 * Return a new {@link JettyClientHttpRequestFactoryBuilder} that applies additional
-	 * customization to the underlying {@link ClientConnector}.
+	 * Return a new {@link JettyHttpClientBuilder} that applies additional customization
+	 * to the underlying {@link ClientConnector}.
 	 * @param clientConnectorCustomizerCustomizer the customizer to apply
-	 * @return a new {@link JettyClientHttpRequestFactoryBuilder} instance
+	 * @return a new {@link JettyHttpClientBuilder} instance
 	 */
 	public JettyHttpClientBuilder withClientConnectorCustomizerCustomizer(
 			Consumer<ClientConnector> clientConnectorCustomizerCustomizer) {

module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/ReactorHttpClientBuilder.java

@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.function.ThrowingConsumer;
 
 /**
- * Builder that can be used to create a Rector Netty {@link HttpClient}.
+ * Builder that can be used to create a Reactor Netty {@link HttpClient}.
  *
  * @author Phillip Webb
  * @author Andy Wilkinson