Merge branch '2.6.x' into 2.7.x

Author: mhalbritter

spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/rest-client.adoc

@@ -63,11 +63,11 @@ include::code:MyService[]
 [[io.rest-client.webclient.runtime]]
 ==== WebClient Runtime
 Spring Boot will auto-detect which `ClientHttpConnector` to use to drive `WebClient`, depending on the libraries available on the application classpath.
-For now, Reactor Netty and Jetty RS client are supported.
+For now, Reactor Netty, Jetty RS client and Apache HttpClient are supported.
 
 The `spring-boot-starter-webflux` starter depends on `io.projectreactor.netty:reactor-netty` by default, which brings both server and client implementations.
 If you choose to use Jetty as a reactive server instead, you should add a dependency on the Jetty Reactive HTTP client library, `org.eclipse.jetty:jetty-reactive-httpclient`.
-Using the same technology for server and client has it advantages, as it will automatically share HTTP resources between client and server.
+Using the same technology for server and client has its advantages, as it will automatically share HTTP resources between client and server.
 
 Developers can override the resource configuration for Jetty and Reactor Netty by providing a custom `ReactorResourceFactory` or `JettyResourceFactory` bean - this will be applied to both clients and servers.