Merge branch '2.2.x' into 2.3.x

Closes gh-24403

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/integration/IntegrationMetricsAutoConfigurationTests.java

@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.autoconfigure.integration.IntegrationGraphEndpointAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.metrics.amqp.RabbitMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
@@ -30,7 +29,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RabbitMetricsAutoConfiguration}.
+ * Tests for {@link IntegrationMetricsAutoConfiguration}.
  *
  * @author Artem Bilan
  */

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java

@@ -1108,7 +1108,7 @@ static class CustomExceptionHandlerExceptionResolver {
 		private int exceptionResolvers = 0;
 
 		@Bean
-		WebMvcRegistrations webMvcRegistrationsHandlerAdapter() {
+		WebMvcRegistrations webMvcRegistrationsExceptionResolver() {
 			return new WebMvcRegistrations() {
 
 				@Override

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

@@ -6247,7 +6247,7 @@ For instance, it is possible to customize the name of the table for the JDBC sto
 For setting the timeout of the session you can use the configprop:spring.session.timeout[] property.
 If that property is not set, the auto-configuration falls back to the value of configprop:server.servlet.session.timeout[].
 
-You can take control over Spring Session's configuration using `@Enable*HttpSession` (Servlet) or `@Enable@WebSession` (Reactive).
+You can take control over Spring Session's configuration using `@Enable*HttpSession` (Servlet) or `@Enable*WebSession` (Reactive).
 This will cause the auto-configuration to back off.
 Spring Session can then be configured using the annotation's attributes rather than the previously described configuration properties.
 

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileWrapperTests.java

@@ -152,7 +152,7 @@ void wrapperMustNotImplementClose() {
 	}
 
 	@Test
-	void streamDelegatestoParent() {
+	void streamDelegatesToParent() {
 		this.wrapper.stream();
 		this.parent.verify(Call.STREAM);
 	}