Merge branch '2.1.x'

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

@@ -2216,7 +2216,7 @@ If you need to add or customize converters, you can use Spring Boot's
 
 [source,java,indent=0]
 ----
-	import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
+	import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 	import org.springframework.context.annotation.*;
 	import org.springframework.http.converter.*;
 

spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc

@@ -763,10 +763,13 @@ listings for Maven and Gradle:
 
 NOTE: Developer tools are automatically disabled when running a fully packaged
 application. If your application is launched from `java -jar` or if it is started from a
-special classloader, then it is considered a "`production application`". Flagging the
-dependency as optional in Maven or using a custom`developmentOnly` configuration in
-Gradle  (as shown above) is a best practice that prevents devtools from being transitively
-applied to other modules that use your project.
+special classloader, then it is considered a "`production application`". If that does not
+apply to you (i.e. if you run your application from a container), consider excluding
+devtools or set the `-Dspring.devtools.restart.enabled=false` system property.
+
+TIP: Flagging the dependency as optional in Maven or using a custom`developmentOnly`
+configuration in Gradle  (as shown above) is a best practice that prevents devtools from
+being transitively applied to other modules that use your project.
 
 TIP: Repackaged archives do not contain devtools by default. If you want to use a
 <<using-boot-devtools-remote,certain remote devtools feature>>, you need to disable the