diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtils.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtils.java
index 1b77aef165..0bcb3695ee 100644
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtils.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtils.java
@@ -36,14 +36,14 @@ public final class RoleHierarchyUtils {
 
 	/**
 	 * Converts the supplied {@link Map} of role name to implied role name(s) to a string
-	 * representation understood by {@code RoleHierarchyImpl#setHierarchy(String)}. The
-	 * map key is the role name and the map value is a {@link List} of implied role
-	 * name(s).
-	 * @param roleHierarchyMap the mapping(s) of role name to implied role name(s)
+	 * representation understood by the role hierarchy parser.
+	 * The map key is the role name and the map value is a {@link List} of implied role name(s).
+	 * * @param roleHierarchyMap the mapping(s) of role name to implied role name(s)
 	 * @return a string representation of a role hierarchy
-	 * @throws IllegalArgumentException if roleHierarchyMap is null or empty or if a role
-	 * name is null or empty or if an implied role name(s) is null or empty
-	 * @deprecated please see {@code RoleHierarchyImpl#setHierarchy} deprecation notice
+	 * @throws IllegalArgumentException if roleHierarchyMap is null or empty, or if a role
+	 * name/implied role name is null or empty
+	 * @deprecated Use {@link RoleHierarchyImpl#fromHierarchy(String)} or the builder-based
+	 * approach instead of this manual conversion.
 	 */
 	@Deprecated
 	public static String roleHierarchyFromMap(Map<String, List<String>> roleHierarchyMap) {
diff --git a/core/src/main/java/org/springframework/security/access/package-info.java b/core/src/main/java/org/springframework/security/access/package-info.java
index d9b0f81f0d..2a830aa20c 100644
--- a/core/src/main/java/org/springframework/security/access/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/package-info.java
@@ -16,9 +16,8 @@
 
 /**
  * Core access-control related code, including security metadata related classes,
- * interception code, access control annotations, EL support and voter-based
- * implementations of the central
- * {@code AccessDecisionManager}
+ * interception code, access control annotations, EL support, and implementations
+ * of the central {@link org.springframework.security.authorization.AuthorizationManager AuthorizationManager}
  * interface.
  */
 @NullMarked
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
index e16eb59fa3..7a33ba11ab 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
@@ -77,7 +77,7 @@ public interface AuthenticationTrustResolver {
 	 * Checks if the {@link Authentication} is not null, authenticated, and not anonymous.
 	 * @param authentication the {@link Authentication} to check.
 	 * @return true if the {@link Authentication} is not null,
-	 * {@link #isAnonymous(Authentication)} returns false, and
+	 * {@link #isAnonymous(Authentication)} returns false and
 	 * {@link Authentication#isAuthenticated()} is true.
 	 * @since 6.1.7
 	 */