diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc
index 902f8e6fc93..c57e0125683 100644
--- a/src/docs/asciidoc/web/webflux.adoc
+++ b/src/docs/asciidoc/web/webflux.adoc
@@ -1967,6 +1967,14 @@ generally supported for all return values.
 | `HttpHeaders`
 | For returning a response with headers and no body.
 
+| `ErrorResponse`
+| To render an RFC 7807 error response with details in the body,
+  see <<webflux-ann-rest-exceptions>>
+
+| `ProblemDetail`
+| To render an RFC 7807 error response with details in the body,
+  see <<webflux-ann-rest-exceptions>>
+
 | `String`
 | A view name to be resolved with `ViewResolver` instances and used together with the implicit
   model -- determined through command objects and `@ModelAttribute` methods. The handler
@@ -3350,7 +3358,7 @@ include::web-data-binding-model-design.adoc[]
 
 
 [[webflux-ann-controller-exceptions]]
-=== Managing Exceptions
+=== Exceptions
 [.small]#<<web.adoc#mvc-ann-exceptionhandler, Web MVC>>#
 
 `@Controller` and <<webflux-ann-controller-advice, @ControllerAdvice>> classes can have
@@ -3411,6 +3419,23 @@ for more detail.
 
 
 
+[[webflux-ann-exceptionhandler-args]]
+==== Method Arguments
+[.small]#<<web.adoc#mvc-ann-exceptionhandler-args, Web MVC>>#
+
+`@ExceptionHandler` methods support the same <<webflux-ann-arguments,method arguments>>
+as `@RequestMapping` methods, except the request body might have been consumed already.
+
+
+
+[[webflux-ann-exceptionhandler-return-values]]
+==== Return Values
+[.small]#<<web.adoc#mvc-ann-exceptionhandler-return-values, Web MVC>>#
+
+`@ExceptionHandler` methods support the same <<webflux-ann-return-types,return values>>
+as `@RequestMapping` methods.
+
+
 
 [[webflux-ann-controller-advice]]
 === Controller Advice
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 304133d5e27..db505328b25 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -2215,6 +2215,14 @@ supported for all return values.
 | `HttpHeaders`
 | For returning a response with headers and no body.
 
+| `ErrorResponse`
+| To render an RFC 7807 error response with details in the body,
+  see <<mvc-ann-rest-exceptions>>
+
+| `ProblemDetail`
+| To render an RFC 7807 error response with details in the body,
+  see <<mvc-ann-rest-exceptions>>
+
 | `String`
 | A view name to be resolved with `ViewResolver` implementations and used together with the implicit
   model -- determined through command objects and `@ModelAttribute` methods. The handler
@@ -3898,6 +3906,7 @@ level, <<mvc-exceptionhandlers, HandlerExceptionResolver>> mechanism.
 
 [[mvc-ann-exceptionhandler-args]]
 ==== Method Arguments
+[.small]#<<webflux.adoc#webflux-ann-exceptionhandler-args, WebFlux>>#
 
 `@ExceptionHandler` methods support the following arguments:
 
@@ -3962,6 +3971,7 @@ level, <<mvc-exceptionhandlers, HandlerExceptionResolver>> mechanism.
 
 [[mvc-ann-exceptionhandler-return-values]]
 ==== Return Values
+[.small]#<<webflux.adoc#webflux-ann-exceptionhandler-return-values, WebFlux>>#
 
 `@ExceptionHandler` methods support the following return values:
 
@@ -3978,6 +3988,14 @@ level, <<mvc-exceptionhandlers, HandlerExceptionResolver>> mechanism.
   be converted through `HttpMessageConverter` instances and written to the response.
   See <<mvc-ann-responseentity>>.
 
+| `ErrorResponse`
+| To render an RFC 7807 error response with details in the body,
+see <<mvc-ann-rest-exceptions>>
+
+| `ProblemDetail`
+| To render an RFC 7807 error response with details in the body,
+see <<mvc-ann-rest-exceptions>>
+
 | `String`
 | A view name to be resolved with `ViewResolver` implementations and used together with the
   implicit model -- determined through command objects and `@ModelAttribute` methods.