Merge branch '2.7.x' into 3.0.x

Closes gh-34602

Author: wilkinsona

spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc

@@ -298,7 +298,7 @@ For more advanced queries, a `@Query` annotation is provided.
 
 Spring Boot will auto-configure Spring Data's JDBC repositories when the necessary dependencies are on the classpath.
 They can be added to your project with a single dependency on `spring-boot-starter-data-jdbc`.
-If necessary, you can take control of Spring Data JDBC's configuration by adding the `@EnableJdbcRepositories` annotation or a `JdbcConfiguration` subclass to your application.
+If necessary, you can take control of Spring Data JDBC's configuration by adding the `@EnableJdbcRepositories` annotation or an `AbstractJdbcConfiguration` subclass to your application.
 
 TIP: For complete details of Spring Data JDBC, see the {spring-data-jdbc-docs}[reference documentation].
 

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

@@ -287,7 +287,7 @@ The algorithm used to determine a `WebApplicationType` is the following:
 This means that if you are using Spring MVC and the new `WebClient` from Spring WebFlux in the same application, Spring MVC will be used by default.
 You can override that easily by calling `setWebApplicationType(WebApplicationType)`.
 
-It is also possible to take complete control of the `ApplicationContext` type that is used by calling `setApplicationContextClass(...)`.
+It is also possible to take complete control of the `ApplicationContext` type that is used by calling `setApplicationContextFactory(...)`.
 
 TIP: It is often desirable to call `setWebApplicationType(WebApplicationType.NONE)` when using `SpringApplication` within a JUnit test.