Merge branch '1.3.x'

spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -1959,17 +1959,19 @@ requests). To switch that on in a Spring Boot application you just need to set
 
 [[howto-reload-static-content]]
 === Reload static content
-There are several options for hot reloading. Running in an IDE (especially with debugging
-on) is a good way to do development (all modern IDEs allow reloading of static resources
-and usually also hot-swapping of Java class changes).
+There are several options for hot reloading. The recommended approach is to use
+<<using-spring-boot.adoc#using-boot-devtools,`spring-boot-devtools`>> as it provides
+additional development-time features such as support for fast application restarts
+and LiveReload as well as sensible development-time configuration (e.g. template caching).
 
-The <<using-spring-boot.adoc#using-boot-devtools,`spring-boot-devtools`>> module is also
-available with support for fast application restarts and LiveReload.
+Alternatively, running in an IDE (especially with debugging on) is a good way to do
+development (all modern IDEs allow reloading of static resources and usually also
+hot-swapping of Java class changes).
 
 Finally, the <<build-tool-plugins.adoc#build-tool-plugins, Maven and Gradle plugins>> can
-be configured to support running from the command line with reloading of static files. You
-can use that with an external css/js compiler process if you are writing that code with
-higher level tools.
+be configured (see the `addResources` property) to support running from the command line
+with reloading of static files. You can use that with an external css/js compiler process
+if you are writing that code with higher level tools.
 
 
 

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

@@ -941,7 +941,9 @@ TIP: For a complete list of the properties that are applied see
 Applications that use `spring-boot-devtools` will automatically restart whenever files
 on the classpath change. This can be a useful feature when working in an IDE as it gives
 a very fast feedback loop for code changes. By default, any entry on the classpath that
-points to a folder will be monitored for changes.
+points to a folder will be monitored for changes. Note that certain resources such as
+static assets and view templates <<using-boot-devtools-restart-exclude, do not need to
+restart the application>>.
 
 .Triggering a restart
 ****