From 0ed4afd6475947e67a598957c7ea0380b0fb89c7 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 27 May 2014 16:36:05 +0100 Subject: [PATCH] Fix a couple of velocity documentation issues Fixes gh-961 --- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- spring-boot-docs/src/main/asciidoc/howto.adoc | 2 +- 2 files changed, 2 insertions(+), 2 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 e8cfd15803b..c154ec25fd8 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -126,7 +126,7 @@ content into your application; rather pick only the properties that you need. spring.velocity.properties.*= spring.velocity.requestContextAttribute= spring.velocity.resourceLoaderPath=classpath:/templates/ - spring.velocity.suffix=.ftl + spring.velocity.suffix=.vm spring.velocity.templateEncoding=UTF-8 spring.velocity.viewNames= # whitelist of view names that can be resolved diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 31044f7ea6a..c2db7b160a9 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -820,7 +820,7 @@ added. * If you use Velocity you will also have a `VelocityViewResolver` with id ``velocityViewResolver''. It looks for resources in a loader path (externalized to `spring.velocity.resourceLoaderPath`, default ``classpath:/templates/'') by surrounding the view name with a prefix and suffix - (externalized to `spring.velocity.prefix' and `spring.velocity.suffix`, with empty and ``.vm'' + (externalized to `spring.velocity.prefix` and `spring.velocity.suffix`, with empty and ``.vm'' defaults respectively). It can be overridden by providing a bean of the same name. Check out {sc-spring-boot-autoconfigure}/web/WebMvcAutoConfiguration.{sc-ext}[`WebMvcAutoConfiguration`],