Merge branch '2.3.x'

Closes gh-24019

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

@@ -6751,11 +6751,15 @@ When building a Servlet web application, the following stores can be auto-config
 * Hazelcast
 * MongoDB
 
+The Servlet auto-configuration replaces the need to use `@Enable*HttpSession`.
+
 When building a reactive web application, the following stores can be auto-configured:
 
 * Redis
 * MongoDB
 
+The reactive auto-configuration replaces the need to use `@Enable*WebSession`.
+
 If a single Spring Session module is present on the classpath, Spring Boot uses that store implementation automatically.
 If you have more than one implementation, you must choose the {spring-boot-autoconfigure-module-code}/session/StoreType.java[`StoreType`] that you wish to use to store the sessions.
 For instance, to use JDBC as the back-end store, you can configure your application as follows:
@@ -6784,6 +6788,10 @@ For setting the timeout of the session you can use the configprop:spring.session
 If that property is not set with a Servlet web appplication, the auto-configuration falls back to the value of configprop:server.servlet.session.timeout[].
 
 
+You can take control over Spring Session's configuration using `@Enable*HttpSession` (Servlet) or `@Enable@WebSession` (Reactive).
+This will cause the auto-configuratio to back off.
+Spring Session can then be configured using the annotation's attributes rather than the previously described configuration properties.
+
 
 [[boot-features-jmx]]
 == Monitoring and Management over JMX