Merge branch '2.7.x' into 3.0.x

Closes gh-34705

Author: scottfrederick

spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/reactive.adoc

@@ -159,9 +159,10 @@ include::code:MyExceptionHandlingController[]
 
 [[web.reactive.webflux.error-handling.error-pages]]
 ===== Custom Error Pages
-If you want to display a custom HTML error page for a given status code, you can add a file to an `/error` directory.
+If you want to display a custom HTML error page for a given status code, you can add views that resolve from `error/*`, for example by adding files to a `/error` directory.
 Error pages can either be static HTML (that is, added under any of the static resource directories) or built with templates.
-The name of the file should be the exact status code or a series mask.
+The name of the file should be the exact status code, a status code series mask, or `error` for a default if nothing else matches.
+Note that the path to the default error view is `error/error`, whereas with Spring MVC the default error view is `error`.
 
 For example, to map `404` to a static HTML file, your directory structure would be as follows: