root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x 

Closes gh-30275
This commit is contained in:
Stephane Nicoll 2022-03-17 16:39:20 +01:00
parent f92541881a be34ad36b5
commit 2631b0ce01
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging.adoc
View File

@ -19,6 +19,8 @@ include::messaging/rsocket.adoc[]
include::messaging/spring-integration.adoc[] include::messaging/spring-integration.adoc[]
include::messaging/websockets.adoc[]
include::messaging/whats-next.adoc[] include::messaging/whats-next.adoc[]

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/websockets.adoc
View File

@ -1,4 +1,4 @@
[[features.websockets]] [[messaging.websockets]]
== WebSockets == WebSockets
Spring Boot provides WebSockets auto-configuration for embedded Tomcat, Jetty, and Undertow. 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. 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.