From b309495c2ef30b2d11a93cab70a5ae18a3e73e14 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 15 Sep 2017 12:36:11 +0200
Subject: [PATCH 1/2] Polish

---
 .../additional-spring-configuration-metadata.json      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 7a544ac03a..dbe302982d 100644
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -226,7 +226,9 @@
   },
   {
     "name": "spring.elasticsearch.jest.uris",
-    "defaultValue": ["http://localhost:9200"]
+    "defaultValue": [
+      "http://localhost:9200"
+    ]
   },
   {
     "name": "spring.http.encoding.enabled",
@@ -235,9 +237,9 @@
     "defaultValue": true
   },
   {
-  	"name": "spring.http.converters.preferred-json-mapper",
-  	"type": "java.lang.String",
-  	"description": "Preferred JSON mapper to use for HTTP message conversion. Set to \"gson\" to force the use of Gson when both it and Jackson are on the classpath."
+    "name": "spring.http.converters.preferred-json-mapper",
+    "type": "java.lang.String",
+    "description": "Preferred JSON mapper to use for HTTP message conversion. Set to \"gson\" to force the use of Gson when both it and Jackson are on the classpath."
   },
   {
     "name": "spring.jersey.type",

From fbb6b881551b097659608450564b7e476f202ec5 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 15 Sep 2017 12:47:46 +0200
Subject: [PATCH 2/2] Document default prefix/suffix values

Closes gh-10290
---
 ...itional-spring-configuration-metadata.json | 32 +++++++++++++++++++
 .../appendix-application-properties.adoc      |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index dbe302982d..3f6a1743ae 100644
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -230,6 +230,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",
@@ -399,6 +415,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",
@@ -504,6 +528,14 @@
     "type": "java.lang.Boolean",
     "description": "Enable the connection status view for supported providers.",
     "defaultValue": false
+  },
+  {
+    "name": "spring.thymeleaf.prefix",
+    "defaultValue": "classpath:/templates/"
+  },
+  {
+    "name": "spring.thymeleaf.suffix",
+    "defaultValue": ".html"
   }
 ],"hints": [
   {
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 6ee3ccc8e7..455cc33831 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -250,7 +250,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.