Merge branch '2.0.x'

7 years ago · beafba4487
parent f2384bd6b2 1d2edc1d37
commit beafba4487
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@ -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