Merge branch '3.5.x'

Closes gh-48266

Author: wilkinsona

documentation/spring-boot-docs/src/docs/antora/modules/how-to/pages/batch.adoc

@@ -13,11 +13,6 @@ By default, batch applications require a javadoc:javax.sql.DataSource[] to store
 Spring Batch expects a single javadoc:javax.sql.DataSource[] by default.
 To have it use a javadoc:javax.sql.DataSource[] other than the application’s main javadoc:javax.sql.DataSource[], declare a javadoc:javax.sql.DataSource[] bean, annotating its javadoc:org.springframework.context.annotation.Bean[format=annotation] method with javadoc:org.springframework.boot.batch.jdbc.autoconfigure.BatchDataSource[format=annotation].
 If you do so and want two data sources (for example by retaining the main auto-configured javadoc:javax.sql.DataSource[]), set the `defaultCandidate` attribute of the javadoc:org.springframework.context.annotation.Bean[format=annotation] annotation to `false`.
-To take greater control, add javadoc:org.springframework.batch.core.configuration.annotation.EnableBatchProcessing[format=annotation] to one of your javadoc:org.springframework.context.annotation.Configuration[format=annotation] classes or extend javadoc:org.springframework.batch.core.configuration.support.DefaultBatchConfiguration[].
-See the API documentation of javadoc:org.springframework.batch.core.configuration.annotation.EnableBatchProcessing[format=annotation]
-and javadoc:org.springframework.batch.core.configuration.support.DefaultBatchConfiguration[] for more details.
-
-For more info about Spring Batch, see the {url-spring-batch-site}[Spring Batch project page].
 
 
 

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/spring-batch.adoc

@@ -3,8 +3,6 @@
 
 Spring Boot offers several conveniences for working with {url-spring-batch-site}[Spring Batch], including running a Job on startup.
 
-If Spring Batch is available on your classpath, it is initialized through the javadoc:org.springframework.batch.core.configuration.annotation.EnableBatchProcessing[format=annotation] annotation.
-
 When building a batch application, the following stores can be auto-configured:
 
 * In-memory
@@ -21,10 +19,19 @@ spring:
       table-prefix: "CUSTOM_"
 ----
 
-You can take control over Spring Batch's configuration using javadoc:org.springframework.batch.core.configuration.annotation.EnableBatchProcessing[format=annotation].
-This will cause the auto-configuration to back off.
+To disable Spring Boot's auto-configuration and take complete control of Spring Batch's configuration, add javadoc:org.springframework.batch.core.configuration.annotation.EnableBatchProcessing[format=annotation] to one of your javadoc:org.springframework.context.annotation.Configuration[format=annotation] classes or extend javadoc:org.springframework.batch.core.configuration.support.DefaultBatchConfiguration[].
+This will cause the auto-configuration to back off, including initialization of Spring Batch's database schema if you're using the JDBC-based store.
 Spring Batch can then be configured using the `@Enable*JobRepository` annotation's attributes rather than the previously described configuration properties.
 
+To learn more about manually configuring Spring Batch, see the API documentation of:
+
+* javadoc:org.springframework.batch.core.configuration.support.DefaultBatchConfiguration[]
+* javadoc:org.springframework.batch.core.configuration.annotation.EnableBatchProcessing[format=annotation]
+* javadoc:org.springframework.batch.core.configuration.annotation.EnableJdbcJobRepository[format=annotation]
+* javadoc:org.springframework.batch.core.configuration.annotation.EnableMongoJobRepository[format=annotation]
+
+For more information about Spring Batch, see the {url-spring-batch-site}[Spring Batch project page].
+
 
 
 [[io.spring-batch.running-jobs-on-startup]]
@@ -43,5 +50,4 @@ spring:
       enabled: false
 ----
 
-
 See {code-spring-boot-batch-src}/autoconfigure/BatchAutoConfiguration.java[`BatchAutoConfiguration`] and  {code-spring-boot-batch-jdbc-src}/autoconfigure/BatchJdbcAutoConfiguration.java[`BatchJdbcAutoConfiguration`] for more details.