Merge branch '6.0.x'

Closes gh-30435

framework-docs/modules/ROOT/pages/rsocket.adoc

@@ -299,14 +299,14 @@ Java::
 		.rsocketConnector(connector -> connector.acceptor(responder)) // <3>
 		.tcp("localhost", 7000);
 ----
-======
 <1> Use `PathPatternRouteMatcher`, if `spring-web` is present, for efficient
     route matching.
 <2> Create a responder from a class with `@MessageMapping` and/or `@ConnectMapping` methods.
 <3> Register the responder.
 
+Kotlin::
++
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-.Kotlin
 ----
 	val strategies = RSocketStrategies.builder()
 			.routeMatcher(PathPatternRouteMatcher())  // <1>
@@ -323,6 +323,7 @@ Java::
 route matching.
 <2> Create a responder from a class with `@MessageMapping` and/or `@ConnectMapping` methods.
 <3> Register the responder.
+======
 
 Note the above is only a shortcut designed for programmatic registration of client
 responders. For alternative scenarios, where client responders are in Spring configuration,
@@ -428,12 +429,12 @@ Java::
 		return ... // <2>
 	}
 ----
-======
 <1> Start the request asynchronously, independent from handling.
 <2> Perform handling and return completion `Mono<Void>`.
 
+Kotlin::
++
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-.Kotlin
 ----
 	@ConnectMapping
 	suspend fun handle(requester: RSocketRequester) {
@@ -447,6 +448,7 @@ Java::
 ----
 <1> Start the request asynchronously, independent from handling.
 <2> Perform handling in the suspending function.
+======
 
 
 
@@ -469,13 +471,13 @@ Java::
 			.retrieveFlux(AirportLocation.class); // <3>
 
 ----
-======
 <1> Specify a route to include in the metadata of the request message.
 <2> Provide data for the request message.
 <3> Declare the expected response.
 
+Kotlin::
++
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-.Kotlin
 ----
 	val viewBox: ViewBox = ...
 
@@ -486,6 +488,7 @@ Java::
 <1> Specify a route to include in the metadata of the request message.
 <2> Provide data for the request message.
 <3> Declare the expected response.
+======
 
 The interaction type is determined implicitly from the cardinality of the input and
 output. The above example is a `Request-Stream` because one value is sent and a stream