diff --git a/module/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionFactoryCustomizer.java b/module/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionFactoryCustomizer.java
index fdcfbecb6aa..7b26fa600d2 100644
--- a/module/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionFactoryCustomizer.java
+++ b/module/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQConnectionFactoryCustomizer.java
@@ -20,7 +20,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ActiveMQConnectionFactory} whilst retaining default auto-configuration.
+ * {@link ActiveMQConnectionFactory} to fine-tune its auto-configuration.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java
index 6e49974738c..15f2e14dfff 100644
--- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java
+++ b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java
@@ -19,8 +19,8 @@ package org.springframework.boot.amqp.autoconfigure;
 import com.rabbitmq.client.ConnectionFactory;
 
 /**
- * Callback interface that can be implemented by beans wishing to customize the
- * auto-configured RabbitMQ {@link ConnectionFactory}.
+ * Callback interface that can be implemented by beans wishing to customize the RabbitMQ
+ * {@link ConnectionFactory} to fine-tune its auto-configuration.
  *
  * @author Andy Wilkinson
  * @since 4.0.0
diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java
index 74cccaca41c..8d5f2373cd8 100644
--- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java
+++ b/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java
@@ -21,7 +21,8 @@ import com.rabbitmq.stream.EnvironmentBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * auto-configured {@link Environment} that is created by an {@link EnvironmentBuilder}.
+ * {@link EnvironmentBuilder} to fine-tune its auto-configuration before it creates an
+ * {@link Environment}.
  *
  * @author Andy Wilkinson
  * @since 4.0.0
diff --git a/module/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConfigurationCustomizer.java b/module/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConfigurationCustomizer.java
index 952bd3a5568..f98c8a36edf 100644
--- a/module/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConfigurationCustomizer.java
+++ b/module/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisConfigurationCustomizer.java
@@ -21,8 +21,8 @@ import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the Artemis
- * JMS server {@link Configuration} before it is used by an auto-configured
- * {@link EmbeddedActiveMQ} instance.
+ * JMS server {@link Configuration} to fine-tune its auto-configuration before it is used
+ * by the auto-configured {@link EmbeddedActiveMQ} instance.
  *
  * @author Eddú Meléndez
  * @author Phillip Webb
diff --git a/module/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchConversionServiceCustomizer.java b/module/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchConversionServiceCustomizer.java
index 4065257a6e7..10184092518 100644
--- a/module/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchConversionServiceCustomizer.java
+++ b/module/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchConversionServiceCustomizer.java
@@ -20,8 +20,8 @@ import org.springframework.core.convert.support.ConfigurableConversionService;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ConfigurableConversionService} that is used by the batch infrastructure while
- * retaining its default auto-configuration.
+ * {@link ConfigurableConversionService} to fine-tune its auto-configuration. The
+ * conversion service is used by the Spring Batch infrastructure.
  *
  * @author Claudio Nave
  * @since 4.0.0
diff --git a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CouchbaseCacheManagerBuilderCustomizer.java b/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CouchbaseCacheManagerBuilderCustomizer.java
index 061e2e0f50d..5cca773b9a8 100644
--- a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CouchbaseCacheManagerBuilderCustomizer.java
+++ b/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CouchbaseCacheManagerBuilderCustomizer.java
@@ -21,8 +21,8 @@ import org.springframework.data.couchbase.cache.CouchbaseCacheManager.CouchbaseC
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link CouchbaseCacheManagerBuilder} before it is used to build the auto-configured
- * {@link CouchbaseCacheManager}.
+ * {@link CouchbaseCacheManagerBuilder} to fine-tune its auto-configuration before it is
+ * used to build the auto-configured {@link CouchbaseCacheManager}.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CqlSessionBuilderCustomizer.java b/module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CqlSessionBuilderCustomizer.java
index 6f14a175033..59c6014ef61 100644
--- a/module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CqlSessionBuilderCustomizer.java
+++ b/module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CqlSessionBuilderCustomizer.java
@@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.CqlSessionBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link CqlSession} through a {@link CqlSessionBuilder} whilst retaining default
- * auto-configuration.
+ * {@link CqlSessionBuilder} to fine-tune its auto-configuration before it creates a
+ * {@link CqlSession}.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/DriverConfigLoaderBuilderCustomizer.java b/module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/DriverConfigLoaderBuilderCustomizer.java
index 2c774a3c83f..60fb4f5928f 100644
--- a/module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/DriverConfigLoaderBuilderCustomizer.java
+++ b/module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/DriverConfigLoaderBuilderCustomizer.java
@@ -21,8 +21,8 @@ import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBui
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link DriverConfigLoader} through a {@link DriverConfigLoaderBuilderCustomizer} whilst
- * retaining default auto-configuration.
+ * {@link DriverConfigLoaderBuilderCustomizer} to fine-tune its auto-configuration before
+ * it creates a {@link DriverConfigLoader}.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/autoconfigure/ClusterEnvironmentBuilderCustomizer.java b/module/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/autoconfigure/ClusterEnvironmentBuilderCustomizer.java
index d0f70c36ce9..e1bb0c167ff 100644
--- a/module/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/autoconfigure/ClusterEnvironmentBuilderCustomizer.java
+++ b/module/spring-boot-couchbase/src/main/java/org/springframework/boot/couchbase/autoconfigure/ClusterEnvironmentBuilderCustomizer.java
@@ -21,8 +21,8 @@ import com.couchbase.client.java.env.ClusterEnvironment.Builder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ClusterEnvironment} through a {@link Builder ClusterEnvironment.Builder} whilst
- * retaining default auto-configuration.
+ * {@link Builder ClusterEnvironment.Builder} to fine-tune its auto-configuration before
+ * it creates the {@link ClusterEnvironment}.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/ClientResourcesBuilderCustomizer.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/ClientResourcesBuilderCustomizer.java
index f7188618350..25cb6de3df0 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/ClientResourcesBuilderCustomizer.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/ClientResourcesBuilderCustomizer.java
@@ -21,8 +21,8 @@ import io.lettuce.core.resource.ClientResources.Builder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ClientResources} through a {@link Builder} whilst retaining default
- * auto-configuration.
+ * {@link Builder} to fine-tune its auto-configuration before it creates the
+ * {@link ClientResources}.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisClientConfigurationBuilderCustomizer.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisClientConfigurationBuilderCustomizer.java
index f52ed5ceb25..328b076d949 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisClientConfigurationBuilderCustomizer.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisClientConfigurationBuilderCustomizer.java
@@ -21,9 +21,8 @@ import org.springframework.data.redis.connection.jedis.JedisClientConfiguration.
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link JedisClientConfiguration} through a {@link JedisClientConfigurationBuilder
- * JedisClientConfiguration.JedisClientConfigurationBuilder} whilst retaining default
- * auto-configuration.
+ * {@link JedisClientConfigurationBuilder} to fine-tune its auto-configuration before it
+ * creates the {@link JedisClientConfiguration}.
  *
  * @author Mark Paluch
  * @since 4.0.0
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceClientConfigurationBuilderCustomizer.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceClientConfigurationBuilderCustomizer.java
index 70037e9d412..f8b0c3aaf85 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceClientConfigurationBuilderCustomizer.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceClientConfigurationBuilderCustomizer.java
@@ -21,9 +21,8 @@ import org.springframework.data.redis.connection.lettuce.LettuceClientConfigurat
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link LettuceClientConfiguration} through a {@link LettuceClientConfigurationBuilder
- * LettuceClientConfiguration.LettuceClientConfigurationBuilder} whilst retaining default
- * auto-configuration. To customize only the
+ * {@link LettuceClientConfigurationBuilder} to fine-tune its auto-configuration before it
+ * creates the {@link LettuceClientConfiguration}. To customize only the
  * {@link LettuceClientConfiguration#getClientOptions() client options} of the
  * configuration, use {@link LettuceClientOptionsBuilderCustomizer} instead.
  *
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceClientOptionsBuilderCustomizer.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceClientOptionsBuilderCustomizer.java
index 7bac09b9b22..0dff14d46a7 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceClientOptionsBuilderCustomizer.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceClientOptionsBuilderCustomizer.java
@@ -23,9 +23,9 @@ import org.springframework.data.redis.connection.lettuce.LettuceClientConfigurat
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ClientOptions} of the {@link LettuceClientConfiguration} through a
- * {@link Builder} whilst retaining default auto-configuration. To customize the entire
- * configuration, use {@link LettuceClientConfigurationBuilderCustomizer} instead.
+ * {@link Builder} to fine-tune its auto-configuration before it creates the
+ * {@link ClientOptions} of the {@link LettuceClientConfiguration}. To customize the
+ * entire configuration, use {@link LettuceClientConfigurationBuilderCustomizer} instead.
  *
  * @author Soohyun Lim
  * @since 4.0.0
diff --git a/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/Rest5ClientBuilderCustomizer.java b/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/Rest5ClientBuilderCustomizer.java
index 57f5d1de248..0d34fae5795 100644
--- a/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/Rest5ClientBuilderCustomizer.java
+++ b/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/Rest5ClientBuilderCustomizer.java
@@ -26,9 +26,9 @@ import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
 
 /**
- * Callback interface that can be implemented by beans wishing to further customize the
- * {@link Rest5Client} through a {@link Rest5ClientBuilder} whilst retaining default
- * auto-configuration.
+ * Callback interface that can be implemented by beans wishing to customize the
+ * {@link Rest5ClientBuilder} to fine-tune its auto-configuration before it creates a
+ * {@link Rest5Client}.
  *
  * @author Brian Clozel
  * @author Vedran Pavic
diff --git a/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerVariablesCustomizer.java b/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerVariablesCustomizer.java
index 15661d010f5..d8f7973f4b8 100644
--- a/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerVariablesCustomizer.java
+++ b/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerVariablesCustomizer.java
@@ -24,8 +24,9 @@ import org.springframework.ui.freemarker.FreeMarkerConfigurationFactory;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the FreeMarker
- * variables used as {@link Configuration#getSharedVariableNames() shared variables}
- * before it is used by an auto-configured {@link FreeMarkerConfigurationFactory}.
+ * {@link Configuration#getSharedVariableNames() shared variables} to fine-tune their
+ * auto-configuration before they are used by an auto-configured
+ * {@link FreeMarkerConfigurationFactory}.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/GraphQlSourceBuilderCustomizer.java b/module/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/GraphQlSourceBuilderCustomizer.java
index d713316feab..d04fb793e2f 100644
--- a/module/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/GraphQlSourceBuilderCustomizer.java
+++ b/module/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/GraphQlSourceBuilderCustomizer.java
@@ -21,7 +21,7 @@ import org.springframework.graphql.execution.GraphQlSource;
 /**
  * Callback interface that can be implemented by beans wishing to customize properties of
  * {@link org.springframework.graphql.execution.GraphQlSource.SchemaResourceBuilder
- * Builder} whilst retaining default auto-configuration.
+ * Builder} to fine-tune its auto-configuration.
  *
  * @author Rossen Stoyanchev
  * @since 4.0.0
diff --git a/module/spring-boot-gson/src/main/java/org/springframework/boot/gson/autoconfigure/GsonBuilderCustomizer.java b/module/spring-boot-gson/src/main/java/org/springframework/boot/gson/autoconfigure/GsonBuilderCustomizer.java
index 8d141f7158c..a6a05b577e1 100644
--- a/module/spring-boot-gson/src/main/java/org/springframework/boot/gson/autoconfigure/GsonBuilderCustomizer.java
+++ b/module/spring-boot-gson/src/main/java/org/springframework/boot/gson/autoconfigure/GsonBuilderCustomizer.java
@@ -20,8 +20,9 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 /**
- * Callback interface that can be implemented by beans wishing to further customize the
- * {@link Gson} through {@link GsonBuilder} retaining its default auto-configuration.
+ * Callback interface that can be implemented by beans wishing to customize the
+ * {@link GsonBuilder} to fine-tune its auto-configuration before it creates a
+ * {@link Gson} instance.
  *
  * @author Ivan Golovko
  * @since 4.0.0
diff --git a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/HibernatePropertiesCustomizer.java b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/HibernatePropertiesCustomizer.java
index 7e9736a52d2..c83173c987a 100644
--- a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/HibernatePropertiesCustomizer.java
+++ b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/HibernatePropertiesCustomizer.java
@@ -20,7 +20,8 @@ import java.util.Map;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the Hibernate
- * properties before it is used by an auto-configured {@code EntityManagerFactory}.
+ * properties to customize their auto-configuration prior to use by the auto-configured
+ * {@code EntityManagerFactory}.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/PollerMetadataCustomizer.java b/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/PollerMetadataCustomizer.java
index 5a9e05f3c08..87e59be7570 100644
--- a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/PollerMetadataCustomizer.java
+++ b/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/PollerMetadataCustomizer.java
@@ -20,7 +20,7 @@ import org.springframework.integration.scheduling.PollerMetadata;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link PollerMetadata} whilst retaining default auto-configuration.
+ * {@link PollerMetadata} to fine-tune its auto-configuration.
  *
  * @author Yanming Zhou
  * @since 4.0.0
diff --git a/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/autoconfigure/Jackson2ObjectMapperBuilderCustomizer.java b/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/autoconfigure/Jackson2ObjectMapperBuilderCustomizer.java
index 02267227440..6a354e3eea6 100644
--- a/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/autoconfigure/Jackson2ObjectMapperBuilderCustomizer.java
+++ b/module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/autoconfigure/Jackson2ObjectMapperBuilderCustomizer.java
@@ -22,7 +22,7 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to further customize the
- * {@link ObjectMapper} through {@link Jackson2ObjectMapperBuilder} retaining its default
+ * {@link ObjectMapper} through {@link Jackson2ObjectMapperBuilder} to fine-tune its
  * auto-configuration.
  *
  * @author Grzegorz Poznachowski
diff --git a/module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/DefaultConfigurationCustomizer.java b/module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/DefaultConfigurationCustomizer.java
index 251c02abb10..3baa9387ae5 100644
--- a/module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/DefaultConfigurationCustomizer.java
+++ b/module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/DefaultConfigurationCustomizer.java
@@ -20,7 +20,7 @@ import org.jooq.impl.DefaultConfiguration;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link DefaultConfiguration} whilst retaining default auto-configuration.
+ * {@link DefaultConfiguration} to fine-tune its auto-configuration.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/EntityManagerFactoryBuilderCustomizer.java b/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/EntityManagerFactoryBuilderCustomizer.java
index 2508c2dfb08..e95088a7d85 100644
--- a/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/EntityManagerFactoryBuilderCustomizer.java
+++ b/module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/autoconfigure/EntityManagerFactoryBuilderCustomizer.java
@@ -19,8 +19,8 @@ package org.springframework.boot.jpa.autoconfigure;
 import org.springframework.boot.jpa.EntityManagerFactoryBuilder;
 
 /**
- * Callback interface that can be used to customize the auto-configured
- * {@link EntityManagerFactoryBuilder}.
+ * Callback interface that can be used to customize the
+ * {@link EntityManagerFactoryBuilder} to fine-tune its auto-configuration.
  *
  * @author Andy Wilkinson
  * @since 4.0.0
diff --git a/module/spring-boot-micrometer-tracing/src/main/java/org/springframework/boot/micrometer/tracing/autoconfigure/otlp/OtlpGrpcSpanExporterBuilderCustomizer.java b/module/spring-boot-micrometer-tracing/src/main/java/org/springframework/boot/micrometer/tracing/autoconfigure/otlp/OtlpGrpcSpanExporterBuilderCustomizer.java
index 7ef82e5edfa..84e0323dd24 100644
--- a/module/spring-boot-micrometer-tracing/src/main/java/org/springframework/boot/micrometer/tracing/autoconfigure/otlp/OtlpGrpcSpanExporterBuilderCustomizer.java
+++ b/module/spring-boot-micrometer-tracing/src/main/java/org/springframework/boot/micrometer/tracing/autoconfigure/otlp/OtlpGrpcSpanExporterBuilderCustomizer.java
@@ -20,7 +20,7 @@ import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link OtlpGrpcSpanExporterBuilder} whilst retaining default auto-configuration.
+ * {@link OtlpGrpcSpanExporterBuilder} to fine-tune its auto-configuration.
  *
  * @author Dmytro Nosan
  * @since 4.0.0
diff --git a/module/spring-boot-micrometer-tracing/src/main/java/org/springframework/boot/micrometer/tracing/autoconfigure/otlp/OtlpHttpSpanExporterBuilderCustomizer.java b/module/spring-boot-micrometer-tracing/src/main/java/org/springframework/boot/micrometer/tracing/autoconfigure/otlp/OtlpHttpSpanExporterBuilderCustomizer.java
index 03497c45955..52e435990cc 100644
--- a/module/spring-boot-micrometer-tracing/src/main/java/org/springframework/boot/micrometer/tracing/autoconfigure/otlp/OtlpHttpSpanExporterBuilderCustomizer.java
+++ b/module/spring-boot-micrometer-tracing/src/main/java/org/springframework/boot/micrometer/tracing/autoconfigure/otlp/OtlpHttpSpanExporterBuilderCustomizer.java
@@ -20,7 +20,7 @@ import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link OtlpHttpSpanExporterBuilder} whilst retaining default auto-configuration.
+ * {@link OtlpHttpSpanExporterBuilder} to fine-tune its auto-configuration.
  *
  * @author Dmytro Nosan
  * @since 4.0.0
diff --git a/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoClientSettingsBuilderCustomizer.java b/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoClientSettingsBuilderCustomizer.java
index 46dc0634d6b..d531254d3eb 100644
--- a/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoClientSettingsBuilderCustomizer.java
+++ b/module/spring-boot-mongodb/src/main/java/org/springframework/boot/mongodb/autoconfigure/MongoClientSettingsBuilderCustomizer.java
@@ -20,8 +20,8 @@ import com.mongodb.MongoClientSettings.Builder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link com.mongodb.MongoClientSettings} through a {@link Builder
- * MongoClientSettings.Builder} whilst retaining default auto-configuration.
+ * {@link Builder MongoClientSettings.Builder} to fine-tune its auto-configuration. before
+ * it creates a {@link com.mongodb.MongoClientSettings}.
  *
  * @author Mark Paluch
  * @since 4.0.0
diff --git a/module/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/ConfigBuilderCustomizer.java b/module/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/ConfigBuilderCustomizer.java
index 7fb4178bb47..a4e9ce31930 100644
--- a/module/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/ConfigBuilderCustomizer.java
+++ b/module/spring-boot-neo4j/src/main/java/org/springframework/boot/neo4j/autoconfigure/ConfigBuilderCustomizer.java
@@ -20,9 +20,9 @@ import org.neo4j.driver.Config;
 import org.neo4j.driver.Config.ConfigBuilder;
 
 /**
- * Callback interface that can be implemented by beans wishing to customize the
- * {@link Config} through a {@link ConfigBuilder} whilst retaining default
- * auto-configuration.
+ * Callback interface that can be implemented by beans wishing to customize the a
+ * {@link ConfigBuilder} to fine-tune its auto-configuration before it creates a
+ * {@link Config} instance.
  *
  * @author Stephane Nicoll
  * @since 4.0.0
diff --git a/module/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/autoconfigure/PulsarContainerFactoryCustomizer.java b/module/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/autoconfigure/PulsarContainerFactoryCustomizer.java
index 17e13f10772..cb6a68b57b4 100644
--- a/module/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/autoconfigure/PulsarContainerFactoryCustomizer.java
+++ b/module/spring-boot-pulsar/src/main/java/org/springframework/boot/pulsar/autoconfigure/PulsarContainerFactoryCustomizer.java
@@ -20,8 +20,7 @@ import org.springframework.pulsar.config.PulsarContainerFactory;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize a
- * {@link PulsarContainerFactory} before it is fully initialized, in particular to tune
- * its configuration.
+ * {@link PulsarContainerFactory} to fine-tune its auto-configuration.
  *
  * @param <T> the type of the {@link PulsarContainerFactory}
  * @author Chris Bono
diff --git a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/SchedulerFactoryBeanCustomizer.java b/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/SchedulerFactoryBeanCustomizer.java
index d6375d0739a..5df25744bed 100644
--- a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/SchedulerFactoryBeanCustomizer.java
+++ b/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/SchedulerFactoryBeanCustomizer.java
@@ -22,8 +22,7 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the Quartz
- * {@link SchedulerFactoryBean} before it is fully initialized, in particular to tune its
- * configuration.
+ * {@link SchedulerFactoryBean} to fine-tune its auto-configuration.
  * <p>
  * For customization of the {@link DataSource} used by Quartz, use of
  * {@link QuartzDataSource @QuartzDataSource} is preferred. It will ensure consistent
diff --git a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/ConnectionFactoryOptionsBuilderCustomizer.java b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/ConnectionFactoryOptionsBuilderCustomizer.java
index e569ff19091..6454de9ed3e 100644
--- a/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/ConnectionFactoryOptionsBuilderCustomizer.java
+++ b/module/spring-boot-r2dbc/src/main/java/org/springframework/boot/r2dbc/autoconfigure/ConnectionFactoryOptionsBuilderCustomizer.java
@@ -21,8 +21,8 @@ import io.r2dbc.spi.ConnectionFactoryOptions.Builder;
 
 /**
  * Callback interface that can be implemented by beans wishing to customize the
- * {@link ConnectionFactoryOptions} through a {@link Builder} whilst retaining default
- * auto-configuration.
+ * {@link Builder} to fine-tune its auto-configuration before it creates a
+ * {@link ConnectionFactoryOptions}.
  *
  * @author Mark Paluch
  * @since 4.0.0
diff --git a/module/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizer.java b/module/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizer.java
index e163e7d50f9..57efc494169 100644
--- a/module/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizer.java
+++ b/module/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizer.java
@@ -19,9 +19,8 @@ package org.springframework.boot.transaction.autoconfigure;
 import org.springframework.transaction.TransactionManager;
 
 /**
- * Callback interface that can be implemented by beans wishing to customize
- * {@link TransactionManager TransactionManagers} while retaining default
- * auto-configuration.
+ * Callback interface that can be implemented by beans wishing to customize a
+ * {@link TransactionManager} to fine-tune its auto-configuration.
  *
  * @param <T> the transaction manager type
  * @author Andy Wilkinson
diff --git a/module/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/reactive/WebTestClientBuilderCustomizer.java b/module/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/reactive/WebTestClientBuilderCustomizer.java
index 2a00de60a7a..a3f911a3bb2 100644
--- a/module/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/reactive/WebTestClientBuilderCustomizer.java
+++ b/module/spring-boot-web-server-test/src/main/java/org/springframework/boot/web/server/test/client/reactive/WebTestClientBuilderCustomizer.java
@@ -16,12 +16,12 @@
 
 package org.springframework.boot.web.server.test.client.reactive;
 
+import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.test.web.reactive.server.WebTestClient.Builder;
 
 /**
- * A customizer for a {@link Builder}. Any {@code WebTestClientBuilderCustomizer} beans
- * found in the application context will be {@link #customize called} to customize the
- * auto-configured {@link Builder}.
+ * A customizer that can be implemented by beans wishing to customize the {@link Builder}
+ * to fine-tine its auto-configuration before a {@link WebTestClient} is created.
  *
  * @author Andy Wilkinson
  * @since 4.0.0