Skip to content

Commit ef6a5d3

Browse files
committed
Merge branch '1.5.x'
2 parents e59d70e + fbb6b88 commit ef6a5d3

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,22 @@
175175
"http://localhost:9200"
176176
]
177177
},
178+
{
179+
"name": "spring.freemarker.prefix",
180+
"defaultValue": ""
181+
},
182+
{
183+
"name": "spring.freemarker.suffix",
184+
"defaultValue": ".ftl"
185+
},
186+
{
187+
"name": "spring.groovy.template.prefix",
188+
"defaultValue": ""
189+
},
190+
{
191+
"name": "spring.groovy.template.suffix",
192+
"defaultValue": ".tpl"
193+
},
178194
{
179195
"name": "spring.http.encoding.enabled",
180196
"type": "java.lang.Boolean",
@@ -352,6 +368,14 @@
352368
"description": "Enable SitePreferenceHandler.",
353369
"defaultValue": true
354370
},
371+
{
372+
"name": "spring.mustache.prefix",
373+
"defaultValue": "classpath:/templates/"
374+
},
375+
{
376+
"name": "spring.mustache.suffix",
377+
"defaultValue": ".html"
378+
},
355379
{
356380
"name": "spring.mvc.favicon.enabled",
357381
"type": "java.lang.Boolean",
@@ -1170,6 +1194,14 @@
11701194
"replacement": "spring.thymeleaf.servlet.content-type",
11711195
"level": "error"
11721196
}
1197+
},
1198+
{
1199+
"name": "spring.thymeleaf.prefix",
1200+
"defaultValue": "classpath:/templates/"
1201+
},
1202+
{
1203+
"name": "spring.thymeleaf.suffix",
1204+
"defaultValue": ".html"
11731205
}
11741206
],"hints": [
11751207
{

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

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

0 commit comments

Comments
 (0)