Merge branch '5.7.x' into 5.8.x

Closes gh-13405

docs/modules/ROOT/partials/servlet/architecture/request-cache-continue.adoc

@@ -1,6 +1,8 @@
 .`RequestCache` Only Checks for Saved Requests if `continue` Parameter Present
-====
-.Java
+[tabs]
+======
+Java::
++
 [source,java,role="primary"]
 ----
 @Bean
@@ -16,7 +18,8 @@ DefaultSecurityFilterChain springSecurity(HttpSecurity http) throws Exception {
 }
 ----
 
-.Kotlin
+Kotlin::
++
 [source,kotlin,role="secondary"]
 ----
 @Bean
@@ -32,7 +35,8 @@ open fun springSecurity(http: HttpSecurity): SecurityFilterChain {
 }
 ----
 
-.XML
+XML::
++
 [source,xml,role="secondary"]
 ----
 <http auto-config="true">
@@ -43,4 +47,4 @@ open fun springSecurity(http: HttpSecurity): SecurityFilterChain {
 <b:bean id="requestCache" class="org.springframework.security.web.savedrequest.HttpSessionRequestCache"
 	p:matchingRequestParameterName="continue"/>
 ----
-====
+======

docs/modules/ROOT/partials/servlet/architecture/security-context-explicit.adoc

@@ -1,6 +1,8 @@
 .Explicit Saving of SecurityContext
-====
-.Java
+[tabs]
+======
+Java::
++
 [source,java,role="primary"]
 ----
 public SecurityFilterChain filterChain(HttpSecurity http) {
@@ -13,7 +15,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) {
 }
 ----
 
-.Kotlin
+Kotlin::
++
 [source,kotlin,role="secondary"]
 ----
 @Bean
@@ -27,14 +30,15 @@ open fun springSecurity(http: HttpSecurity): SecurityFilterChain {
 }
 ----
 
-.XML
+XML::
++
 [source,xml,role="secondary"]
 ----
 <http security-context-explicit-save="true">
 	<!-- ... -->
 </http>
 ----
-====
+======
 
 
 Upon using the configuration, it is important that any code that sets the `SecurityContextHolder` with a `SecurityContext` also saves the `SecurityContext` to the `SecurityContextRepository` if it should be persisted between requests.
@@ -42,35 +46,41 @@ Upon using the configuration, it is important that any code that sets the `Secur
 For example, the following code:
 
 .Setting `SecurityContextHolder` with `SecurityContextPersistenceFilter`
-====
-.Java
+[tabs]
+======
+Java::
++
 [source,java,role="primary"]
 ----
 SecurityContextHolder.setContext(securityContext);
 ----
 
-.Kotlin
+Kotlin::
++
 [source,kotlin,role="secondary"]
 ----
 SecurityContextHolder.setContext(securityContext)
 ----
-====
+======
 
 should be replaced with
 
 .Setting `SecurityContextHolder` with `SecurityContextHolderFilter`
-====
-.Java
+[tabs]
+======
+Java::
++
 [source,java,role="primary"]
 ----
 SecurityContextHolder.setContext(securityContext);
 securityContextRepository.saveContext(securityContext, httpServletRequest, httpServletResponse);
 ----
 
-.Kotlin
+Kotlin::
++
 [source,kotlin,role="secondary"]
 ----
 SecurityContextHolder.setContext(securityContext)
 securityContextRepository.saveContext(securityContext, httpServletRequest, httpServletResponse)
 ----
-====
+======