Merge branch '1.5.x'

Author: snicoll

spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -175,6 +175,22 @@
       "http://localhost:9200"
     ]
   },
+  {
+    "name": "spring.freemarker.prefix",
+    "defaultValue": ""
+  },
+  {
+    "name": "spring.freemarker.suffix",
+    "defaultValue": ".ftl"
+  },
+  {
+    "name": "spring.groovy.template.prefix",
+    "defaultValue": ""
+  },
+  {
+    "name": "spring.groovy.template.suffix",
+    "defaultValue": ".tpl"
+  },
   {
     "name": "spring.http.encoding.enabled",
     "type": "java.lang.Boolean",
@@ -352,6 +368,14 @@
     "description": "Enable SitePreferenceHandler.",
     "defaultValue": true
   },
+  {
+    "name": "spring.mustache.prefix",
+    "defaultValue": "classpath:/templates/"
+  },
+  {
+    "name": "spring.mustache.suffix",
+    "defaultValue": ".html"
+  },
   {
     "name": "spring.mvc.favicon.enabled",
     "type": "java.lang.Boolean",
@@ -1170,6 +1194,14 @@
       "replacement": "spring.thymeleaf.servlet.content-type",
       "level": "error"
     }
+  },
+  {
+    "name": "spring.thymeleaf.prefix",
+    "defaultValue": "classpath:/templates/"
+  },
+  {
+    "name": "spring.thymeleaf.suffix",
+    "defaultValue": ".html"
   }
 ],"hints": [
   {

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

@@ -271,7 +271,7 @@ content into your application; rather pick only the properties that you need.
 	spring.freemarker.prefix= # Prefix that gets prepended to view names when building a URL.
 	spring.freemarker.request-context-attribute= # Name of the RequestContext attribute for all views.
 	spring.freemarker.settings.*= # Well-known FreeMarker keys which will be passed to FreeMarker's Configuration.
-	spring.freemarker.suffix= # Suffix that gets appended to view names when building a URL.
+	spring.freemarker.suffix=.ftl # Suffix that gets appended to view names when building a URL.
 	spring.freemarker.template-loader-path=classpath:/templates/ # Comma-separated list of template paths.
 	spring.freemarker.view-names= # White list of view names that can be resolved.