Merge branch '2.5.x' into main

Closes gh-27140
spring-projects · Jul 1, 2021 · 1dc8fa1 · 1dc8fa1
2 parents 1f3b32c + 503d50f
commit 1dc8fa1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/spring-hateoas.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/spring-hateoas.adoc
@@ -7,4 +7,5 @@ The `ObjectMapper` is customized by setting the various `spring.jackson.*` prope
 You can take control of Spring HATEOAS's configuration by using `@EnableHypermediaSupport`.
 Note that doing so disables the `ObjectMapper` customization described earlier.
 
-NOTE: Spring HATEOAS support is not available for Spring Webflux applications yet.
+NOTE: Spring Boot only supports Spring HATEOAS with Spring MVC.
+Adding Spring HATEOAS to a Spring Boot application with Spring WebFlux can cause the application to fail.