Merge branch '2.7.x'

3 years ago · 3afda66be2
parent 92e5e91623 2631b0ce01
commit 3afda66be2
2 changed files with 3 additions and 1 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging.adoc
@ -19,6 +19,8 @@ include::messaging/rsocket.adoc[]

 include::messaging/spring-integration.adoc[]

+include::messaging/websockets.adoc[]
+
 include::messaging/whats-next.adoc[]


--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/websockets.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/websockets.adoc
@ -1,4 +1,4 @@
-[[features.websockets]]
+[[messaging.websockets]]
 == WebSockets
 Spring Boot provides WebSockets auto-configuration for embedded Tomcat, Jetty, and Undertow.
 If you deploy a war file to a standalone container, Spring Boot assumes that the container is responsible for the configuration of its WebSocket support.