diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
index b75b885978..07605a3fea 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
@@ -315,8 +315,8 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild
 	/**
 	 * If set to true, a subtree scope search will be performed for group membership. If
 	 * false a single-level search is used.
-	 * @param searchSubtree set to true to enable searching of the entire tree below the
-	 * <tt>groupSearchBase</tt>.
+	 * @param groupSearchSubtree set to true to enable searching of the entire tree below
+	 * the <tt>groupSearchBase</tt>.
 	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
 	 */
 	public LdapAuthenticationProviderConfigurer<B> groupSearchSubtree(boolean groupSearchSubtree) {
diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BearerTokenMetadata.java b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BearerTokenMetadata.java
index 364c4e4209..69768b764f 100644
--- a/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BearerTokenMetadata.java
+++ b/rsocket/src/main/java/org/springframework/security/rsocket/metadata/BearerTokenMetadata.java
@@ -20,7 +20,8 @@ import org.springframework.http.MediaType;
 import org.springframework.util.MimeType;
 
 /**
- * Represents a bearer token that has been encoded into a {@link Payload#metadata()}.
+ * Represents a bearer token that has been encoded into a
+ * {@link io.rsocket.Payload#metadata() Payload#metadata()}.
  *
  * @author Rob Winch
  * @since 5.2
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilter.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilter.java
index f01ce2d430..ccb2f74fdb 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilter.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilter.java
@@ -60,7 +60,7 @@ public final class Saml2MetadataFilter extends OncePerRequestFilter {
 	 * @param relyingPartyRegistrationResolver
 	 * @param saml2MetadataResolver
 	 * @deprecated Use
-	 * {@link Saml2MetadataFilter#Saml2MetadataFilter(RelyingPartyRegistrationResolver)}
+	 * {@link Saml2MetadataFilter#Saml2MetadataFilter(RelyingPartyRegistrationResolver, Saml2MetadataResolver)}
 	 * instead
 	 */
 	@Deprecated
diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java
index 619a0ef889..99e88c9ae8 100644
--- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java
+++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/authentication/logout/Saml2LogoutRequestFilter.java
@@ -62,7 +62,6 @@ import org.springframework.web.util.UriUtils;
  * @author Josh Cummings
  * @since 5.6
  * @see Saml2LogoutRequestValidator
- * @see Saml2AssertingPartyInitiatedLogoutSuccessHandler
  */
 public final class Saml2LogoutRequestFilter extends OncePerRequestFilter {
 
diff --git a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFilter.java
index 1239336bb9..fc42828a1d 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFilter.java
@@ -49,11 +49,12 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * is made. If the result is empty, then the filter does nothing more and the
  * {@link FilterChain} is continued. If it does create an {@link Authentication}...</li>
  * <li>The {@link AuthenticationManager} specified in
- * {@link #GenericAuthenticationFilter(AuthenticationManager)} is used to perform
- * authentication.</li>
+ * {@link #AuthenticationFilter(AuthenticationManager, AuthenticationConverter)} is used
+ * to perform authentication.</li>
  * <li>The {@link AuthenticationManagerResolver} specified in
- * {@link #GenericAuthenticationFilter(AuthenticationManagerResolver)} is used to resolve
- * the appropriate authentication manager from context to perform authentication.</li>
+ * {@link #AuthenticationFilter(AuthenticationManagerResolver, AuthenticationConverter)}
+ * is used to resolve the appropriate authentication manager from context to perform
+ * authentication.</li>
  * <li>If authentication is successful, {@link AuthenticationSuccessHandler} is invoked
  * and the authentication is set on {@link SecurityContextHolder}, else
  * {@link AuthenticationFailureHandler} is invoked</li>