Merge branch 'main' into 4.0.x

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/external-config.adoc

@@ -305,7 +305,7 @@ Imports may be specified as _fixed_ or _import relative_ locations.
 A fixed location always resolves to the same underlying resource, regardless of where the configprop:spring.config.import[] property is declared.
 An import relative location resolves relative to the file that declares the configprop:spring.config.import[] property.
 
-A location starting with a forward slash (`/`) or a URL style prefix (`file:`, `classpath:`, etc) is considered fixed.
+A location starting with a forward slash (`/`) or a URL style prefix (`file:`, `classpath:`, etc.) is considered fixed.
 All other locations are considered import relative.
 
 NOTE: `optional:` prefixes are not considered when determining if a location is fixed or import relative.
@@ -313,7 +313,7 @@ NOTE: `optional:` prefixes are not considered when determining if a location is
 As an example, say we have a `/demo` directory containing our `application.jar` file.
 We might add a `/demo/application.properties` file with the following content:
 
-[,properties]
+[source,properties]
 ----
 spring.config.import=optional:core/core.properties
 ----
@@ -322,7 +322,7 @@ This is an import relative location and so will attempt to load the file `/demo/
 
 If `/demo/core/core.properties` has the following content:
 
-[,properties]
+[source,properties]
 ----
 spring.config.import=optional:extra/extra.properties
 ----

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/task-execution-and-scheduling.adoc

@@ -13,7 +13,7 @@ The auto-configured javadoc:org.springframework.core.task.AsyncTaskExecutor[] is
 - Support for blocking execution in Spring WebFlux.
 - Utilized for inbound and outbound message channels in Spring WebSocket.
 - Bootstrap executor for JPA, based on the bootstrap mode of JPA repositories.
-- Bootstrap Executor for {url-spring-framework-docs}/core/beans/java/composing-configuration-classes.html#beans-java-startup-background[background initialization] of beans in the `ApplicationContext`.
+- Bootstrap executor for {url-spring-framework-docs}/core/beans/java/composing-configuration-classes.html#beans-java-startup-background[background initialization] of beans in the `ApplicationContext`.
 
 While this approach works in most scenarios, Spring Boot allows you to override the auto-configured javadoc:org.springframework.core.task.AsyncTaskExecutor[].
 By default, when a custom javadoc:java.util.concurrent.Executor[] bean is registered, the auto-configured javadoc:org.springframework.core.task.AsyncTaskExecutor[] backs off, and the custom javadoc:java.util.concurrent.Executor[] is used for regular task execution (via javadoc:org.springframework.scheduling.annotation.EnableAsync[format=annotation]).
@@ -83,7 +83,7 @@ These integrations include:
 - Spring WebFlux's blocking execution support.
 - Utilized for inbound and outbound message channels in Spring WebSocket.
 - Bootstrap executor for JPA, based on the bootstrap mode of JPA repositories.
-- Bootstrap Executor for {url-spring-framework-docs}/core/beans/java/composing-configuration-classes.html#beans-java-startup-background[background initialization] of beans in the `ApplicationContext`, unless a bean named `bootstrapExecutor` is defined.
+- Bootstrap executor for {url-spring-framework-docs}/core/beans/java/composing-configuration-classes.html#beans-java-startup-background[background initialization] of beans in the `ApplicationContext`, unless a bean named `bootstrapExecutor` is defined.
 
 [TIP]
 ====

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/introducing-graalvm-native-images.adoc

@@ -55,7 +55,7 @@ When these restrictions are in place, it becomes possible for Spring to perform
 A Spring AOT processed application will typically generate:
 
 * Java source code
-* Bytecode (for dynamic proxies etc)
+* Bytecode (for dynamic proxies, etc.)
 * GraalVM JSON hint files in `+META-INF/native-image/{groupId}/{artifactId}/+`:
  - Resource hints (`resource-config.json`)
  - Reflection hints (`reflect-config.json`)