Skip to content

Commit 7c20947

Browse files
committed
Merge branch '2.2.x' into 2.3.x
Closes gh-24021
2 parents b2a058b + c51c343 commit 7c20947

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6249,7 +6249,7 @@ For setting the timeout of the session you can use the configprop:spring.session
62496249
If that property is not set, the auto-configuration falls back to the value of configprop:server.servlet.session.timeout[].
62506250

62516251
You can take control over Spring Session's configuration using `@Enable*HttpSession` (Servlet) or `@Enable@WebSession` (Reactive).
6252-
This will cause the auto-configuratio to back off.
6252+
This will cause the auto-configuration to back off.
62536253
Spring Session can then be configured using the annotation's attributes rather than the previously described configuration properties.
62546254

62556255

0 commit comments

Comments
 (0)