diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
index aa2b859c5a..7142e43010 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
@@ -41,23 +41,23 @@ import org.springframework.util.StringUtils;
 public class SecurityProperties {
 
 	/**
-	 * Order applied to the SecurityFilterChain that is used to configure basic
-	 * authentication for application endpoints. If you want to add your own
-	 * authentication for all or some of those endpoints the best thing to do is to add
-	 * your own WebSecurityConfigurerAdapter with lower order.
+	 * Order applied to the {@code SecurityFilterChain} that is used to configure basic
+	 * authentication for application endpoints. Create your own
+	 * {@code SecurityFilterChain} if you want to add your own authentication for all or
+	 * some of those endpoints.
 	 */
 	public static final int BASIC_AUTH_ORDER = Ordered.LOWEST_PRECEDENCE - 5;
 
 	/**
-	 * Order applied to the WebSecurityCustomizer that ignores standard static resource
-	 * paths.
+	 * Order applied to the {@code WebSecurityCustomizer} that ignores standard static
+	 * resource paths.
 	 */
 	public static final int IGNORED_ORDER = Ordered.HIGHEST_PRECEDENCE;
 
 	/**
 	 * Default order of Spring Security's Filter in the servlet container (i.e. amongst
 	 * other filters registered with the container). There is no connection between this
-	 * and the {@code @Order} on a WebSecurityConfigurer.
+	 * and the {@code @Order} on a {@code SecurityFilterChain}.
 	 */
 	public static final int DEFAULT_FILTER_ORDER = OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER - 100;
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java
index e83addd521..2b8e7960d5 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java
@@ -46,10 +46,9 @@ class SpringBootWebSecurityConfiguration {
 	/**
 	 * The default configuration for web security. It relies on Spring Security's
 	 * content-negotiation strategy to determine what sort of authentication to use. If
-	 * the user specifies their own {@code WebSecurityConfigurerAdapter} or
-	 * {@link SecurityFilterChain} bean, this will back-off completely and the users
-	 * should specify all the bits that they want to configure as part of the custom
-	 * security configuration.
+	 * the user specifies their own {@link SecurityFilterChain} bean, this will back-off
+	 * completely and the users should specify all the bits that they want to configure as
+	 * part of the custom security configuration.
 	 */
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnDefaultWebSecurity