From e16f5d03ab8213ec2354f775b12886e9d25aab3f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 8 Jun 2015 15:16:01 +0200 Subject: [PATCH 1/2] Add reference to Mustache to documentation Closes gh-3121 --- .../main/asciidoc/appendix-application-properties.adoc | 10 ++++++++++ .../src/main/asciidoc/spring-boot-features.adoc | 1 + 2 files changed, 11 insertions(+) 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 1ccaee3140..c02a224ab7 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -200,6 +200,16 @@ content into your application; rather pick only the properties that you need. spring.velocity.toolbox-config-location= # velocity Toolbox config location, for example "/WEB-INF/toolbox.xml" spring.velocity.view-names= # whitelist of view names that can be resolved + # MUSTACHE TEMPLATES ({sc-spring-boot-autoconfigure}/mustache/MustacheAutoConfiguration.{sc-ext}[MustacheAutoConfiguration]) + spring.mustache.cache=true + spring.mustache.charset=UTF-8 + spring.mustache.check-template-location=true + spring.mustache.content-type=UTF-8 + spring.mustache.enabled=true # enable MVC view resolution + spring.mustache.prefix= + spring.mustache.suffix=.html + spring.mustache.view-names= # whitelist of view names that can be resolved + # JERSEY ({sc-spring-boot-autoconfigure}}/jersey/JerseyProperties.{sc-ext}[JerseyProperties]) spring.jersey.type=servlet # servlet or filter spring.jersey.init= # init params diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index db25f3fbfa..39812c246c 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1113,6 +1113,7 @@ Spring Boot includes auto-configuration support for the following templating eng * http://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_the_markuptemplateengine[Groovy] * http://www.thymeleaf.org[Thymeleaf] * http://velocity.apache.org[Velocity] + * http://mustache.github.io/[Mustache] TIP: JSPs should be avoided if possible, there are several <> when using them with embedded From 7fc9c2afdf1978f5fe654c4d5e9f23d1da54077f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 8 Jun 2015 15:17:05 +0200 Subject: [PATCH 2/2] Fix indent --- .../asciidoc/appendix-application-properties.adoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 c02a224ab7..f376a3d320 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -202,13 +202,13 @@ content into your application; rather pick only the properties that you need. # MUSTACHE TEMPLATES ({sc-spring-boot-autoconfigure}/mustache/MustacheAutoConfiguration.{sc-ext}[MustacheAutoConfiguration]) spring.mustache.cache=true - spring.mustache.charset=UTF-8 - spring.mustache.check-template-location=true - spring.mustache.content-type=UTF-8 - spring.mustache.enabled=true # enable MVC view resolution - spring.mustache.prefix= - spring.mustache.suffix=.html - spring.mustache.view-names= # whitelist of view names that can be resolved + spring.mustache.charset=UTF-8 + spring.mustache.check-template-location=true + spring.mustache.content-type=UTF-8 + spring.mustache.enabled=true # enable MVC view resolution + spring.mustache.prefix= + spring.mustache.suffix=.html + spring.mustache.view-names= # whitelist of view names that can be resolved # JERSEY ({sc-spring-boot-autoconfigure}}/jersey/JerseyProperties.{sc-ext}[JerseyProperties]) spring.jersey.type=servlet # servlet or filter