diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle
index 23fe149d7d1..76ef7f2870f 100644
--- a/core/spring-security-core.gradle
+++ b/core/spring-security-core.gradle
@@ -1,6 +1,7 @@
 import java.util.concurrent.Callable
 
 plugins {
+	id 'javadoc-warnings-error'
 	id 'security-nullability'
 }
 
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 5db6efb0282..375b1993cec 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 @@ private RoleHierarchyUtils() {
 
 	/**
 	 * Converts the supplied {@link Map} of role name to implied role name(s) to a string
-	 * representation understood by {@link 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 {@link 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 01ac014fe71..83a3f7f0f03 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,10 +16,9 @@
 
 /**
  * Core access-control related code, including security metadata related classes,
- * interception code, access control annotations, EL support and voter-based
- * implementations of the central
- * {@link org.springframework.security.access.AccessDecisionManager AccessDecisionManager}
- * interface.
+ * interception code, access control annotations, EL support, and implementations of the
+ * central {@link org.springframework.security.authorization.AuthorizationManager
+ * AuthorizationManager} interface.
  */
 @NullMarked
 package org.springframework.security.access;
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 fba8f77cb22..7a33ba11ab4 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 @@ default boolean isFullyAuthenticated(@Nullable Authentication authentication) {
 	 * 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, &
+	 * {@link #isAnonymous(Authentication)} returns false and
 	 * {@link Authentication#isAuthenticated()} is true.
 	 * @since 6.1.7
 	 */
diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
index 726db080f35..5e2405aeafb 100644
--- a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
+++ b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
@@ -41,8 +41,8 @@ public final class SpringSecurityCoreVersion {
 
 	/**
 	 * Global Serialization value for Spring Security classes.
-	 * @deprecated Please have each class use its own serialization version
-	 * @see SpringSecurityCoreVersionSerializableTests
+	 * @deprecated Please have each class use its own serialization version For more
+	 * details, refer to the {@code SpringSecurityCoreVersionSerializableTests} class.
 	 */
 	@Deprecated(forRemoval = true)
 	public static final long SERIAL_VERSION_UID = 620L;
diff --git a/core/src/main/java/org/springframework/security/core/annotation/SecurityAnnotationScanner.java b/core/src/main/java/org/springframework/security/core/annotation/SecurityAnnotationScanner.java
index 441c9c4a01f..311204314ca 100644
--- a/core/src/main/java/org/springframework/security/core/annotation/SecurityAnnotationScanner.java
+++ b/core/src/main/java/org/springframework/security/core/annotation/SecurityAnnotationScanner.java
@@ -72,9 +72,9 @@ public interface SecurityAnnotationScanner<A extends Annotation> {
 	 * attributable to the parameter.
 	 *
 	 * <p>
-	 * Implementations should describe their strategy for searching the element and any
+	 * Implementations should describe their strategy for searching the parameter and any
 	 * surrounding class, interfaces, or super-class.
-	 * @param element the element to search
+	 * @param parameter the parameter to search
 	 * @return the synthesized annotation or {@code null} if not found
 	 */
 	@Nullable A scan(Parameter parameter);