Merge branch '2.6.x' into 2.7.x

Author: philwebb

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java

@@ -64,7 +64,7 @@ public void checkTemplateLocationExists() {
 			if (locations.stream().noneMatch(this::locationExists)) {
 				logger.warn("Cannot find template location(s): " + locations + " (please add some templates, "
 						+ "check your FreeMarker configuration, or set "
-						+ "spring.freemarker.checkTemplateLocation=false)");
+						+ "spring.freemarker.check-template-location=false)");
 			}
 		}
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

@@ -100,8 +100,9 @@ private void checkTemplateLocationExists() {
 			if (checkTemplateLocation) {
 				TemplateLocation location = new TemplateLocation(this.properties.getPrefix());
 				if (!location.exists(this.applicationContext)) {
-					logger.warn("Cannot find template location: " + location + " (please add some templates or check "
-							+ "your Thymeleaf configuration)");
+					logger.warn("Cannot find template location: " + location
+							+ " (please add some templates, check your Thymeleaf configuration, or set spring.thymeleaf."
+							+ "check-template-location=false)");
 				}
 			}
 		}