Merge branch '6.2.x' into 6.3.x

Closes gh-15380
2024-07-08 20:52:46 -06:00
parent fc6acab133 f4cbaaa2dd
commit 290cee238d
3 changed files with 7 additions and 7 deletions
--- a/docs/modules/ROOT/pages/servlet/authorization/method-security.adoc
+++ b/docs/modules/ROOT/pages/servlet/authorization/method-security.adoc
@@ -240,7 +240,7 @@ static RoleHierarchy roleHierarchy() {

 Kotlin::
 +
-[source,java,role="secondary"]
+[source,kotlin,role="secondary"]
 ----
 companion object {
    @Bean