Merge branch '2.3.x' into 2.4.x

Closes gh-26734

Author: snicoll

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

@@ -4739,8 +4739,8 @@ TIP: You can also register an arbitrary number of beans that implement `LettuceC
 If you use Jedis, `JedisClientConfigurationBuilderCustomizer` is also available.
 
 If you add your own `@Bean` of any of the auto-configured types, it replaces the default (except in the case of `RedisTemplate`, when the exclusion is based on the bean name, `redisTemplate`, not its type).
-By default, if `commons-pool2` is on the classpath, you get a pooled connection factory.
 
+A pooled connection factory is auto-configured if `commons-pool2` is on the classpath and at least one `Pool` option of {spring-boot-autoconfigure-module-code}/data/redis/RedisProperties.java[`RedisProperties`] is set.
 
 
 [[boot-features-mongodb]]