Merge branch '6.3.x'

Author: jzheaux

docs/modules/ROOT/pages/servlet/authorization/method-security.adoc

@@ -1053,7 +1053,7 @@ Kotlin::
 @Target(ElementType.METHOD, ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @PreAuthorize("hasRole('{value}')")
-annotation class IsAdmin(val value: String)
+annotation class HasRole(val value: String)
 ----
 ======