Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-04-13 16:40:27 +02:00
commit 1583d342cc
1 changed files with 1 additions and 1 deletions

View File

@ -566,7 +566,7 @@ server.
[[howto-use-another-web-server]]
[[howto-disable-web-server]]
=== Disabling the Web Server
If your classpath contains the necessary bits to start a web server, Spring Boot will
automatically start it. To disable this behaviour configure the `WebApplicationType` in