Merge branch '1.1.x'

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -103,6 +103,7 @@ content into your application; rather pick only the properties that you need.
 	spring.jackson.serialization.*= # see Jackson's SerializationFeature
 
 	# THYMELEAF ({sc-spring-boot-autoconfigure}/thymeleaf/ThymeleafAutoConfiguration.{sc-ext}[ThymeleafAutoConfiguration])
+	spring.thymeleaf.check-template-location=true
 	spring.thymeleaf.prefix=classpath:/templates/
 	spring.thymeleaf.suffix=.html
 	spring.thymeleaf.mode=HTML5
@@ -113,7 +114,7 @@ content into your application; rather pick only the properties that you need.
 	# FREEMARKER ({sc-spring-boot-autoconfigure}/freemarker/FreeMarkerAutoConfiguration.{sc-ext}[FreeMarkerAutoConfiguration])
 	spring.freemarker.allowRequestOverride=false
 	spring.freemarker.cache=true
-	spring.freemarker.checkTemplateLocation=true
+	spring.freemarker.check-template-location=true
 	spring.freemarker.charSet=UTF-8
 	spring.freemarker.contentType=text/html
 	spring.freemarker.exposeRequestAttributes=false
@@ -138,7 +139,7 @@ content into your application; rather pick only the properties that you need.
 	# VELOCITY TEMPLATES ({sc-spring-boot-autoconfigure}/velocity/VelocityAutoConfiguration.{sc-ext}[VelocityAutoConfiguration])
 	spring.velocity.allowRequestOverride=false
 	spring.velocity.cache=true
-	spring.velocity.checkTemplateLocation=true
+	spring.velocity.check-template-location=true
 	spring.velocity.charSet=UTF-8
 	spring.velocity.contentType=text/html
 	spring.velocity.dateToolAttribute=