Merge branch 'main' into 4.0.x

Author: mhalbritter

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/web/spring-security.adoc

@@ -2,7 +2,8 @@
 = Spring Security
 
 If {url-spring-security-site}[Spring Security] is on the classpath, then web applications are secured by default.
-Spring Boot relies on Spring Security’s content-negotiation strategy to determine whether to use `httpBasic` or `formLogin`.
+This includes securing Spring Boot's `/error` endpoint.
+Spring Boot relies on Spring Security's content-negotiation strategy to determine whether to use `httpBasic` or `formLogin`.
 To add method-level security to a web application, you can also add javadoc:org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity[format=annotation] with your desired settings.
 Additional information can be found in the {url-spring-security-docs}/servlet/authorization/method-security.html[Spring Security Reference Guide].