Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-05-17 09:35:29 +02:00
parent f2384bd6b2 1d2edc1d37
commit beafba4487
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,7 +261,7 @@ by implementing `ApplicationContextAware` or, if the listener is a bean, by usin
[[boot-features-web-environment]]
=== Web Environment
A `SpringApplication` attempts to create the right type of `ApplicationContext` on your
behalf. The algorithm used to determine a `WebEnvironmentType` is fairly simple:
behalf. The algorithm used to determine a `WebApplicationType` is fairly simple:
* If Spring MVC is present, an `AnnotationConfigServletWebServerApplicationContext` is
used