Merge branch '1.3.x'

spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -236,13 +236,13 @@ HTTP (if there is an server available). An HTTP endpoints can be customized furt
 creating a bean of type `MvcEndpoint`. Your `MvcEndpoint` is not a `@Controller` but it
 can use `@RequestMapping` (and `@Managed*`) to expose resources.
 
-TIP: If you are doing this as a library feature consider adding a configuration class to
+TIP: If you are doing this as a library feature consider adding a configuration class
-`/META-INF/spring.factories` under the key
+annoated with `@ManagementContextConfiguration` to `/META-INF/spring.factories` under the
-`org.springframework.boot.actuate.autoconfigure.EndpointWebMvcConfiguration`. If you do
+key `org.springframework.boot.actuate.autoconfigure.ManagementContextConfiguration`. If
-that then the endpoint will move to a child context with all the other MVC endpoints if
+you do that then the endpoint will move to a child context with all the other MVC
-your users ask for a separate management port or address. A configuration declared this
+endpoints if your users ask for a separate management port or address. A configuration
-way can be a `WebConfigurerAdapter` if it wants to add static resources (for instance) to
+declared this way can be a `WebConfigurerAdapter` if it wants to add static resources (for
-the management endpoints.
+instance) to the management endpoints.