root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2016-10-06 11:37:35 +02:00
parent 2ff41ce9cc f684bcc9e5
commit 89b1ff1fac
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -1427,9 +1427,9 @@ Check out {sc-spring-boot-autoconfigure}/web/WebMvcAutoConfiguration.{sc-ext}[`W
[[howto-use-thymeleaf-3]] [[howto-use-thymeleaf-3]]
=== Use Thymeleaf 3 === Use Thymeleaf 3
By default, `spring-boot-starter-thymeleaf` uses Thymeleaf 2.1. You can use Thymeleaf By default, `spring-boot-starter-thymeleaf` uses Thymeleaf 2.1. If you are using the
3 by overriding the `thymeleaf.version` and `thymeleaf-layout-dialect.version` properties, `spring-boot-starter-parent`, you can use Thymeleaf 3 by overriding the
for example: `thymeleaf.version` and `thymeleaf-layout-dialect.version` properties, for example:
[source,xml,indent=0,subs="verbatim,quotes,attributes"] [source,xml,indent=0,subs="verbatim,quotes,attributes"]
---- ----
@ -1439,6 +1439,9 @@ for example:
</dependency> </dependency>
---- ----
NOTE: if you are managing dependencies yourself, look at `spring-boot-dependencies` for
the list of artifacts that are related to those two versions.
To avoid a warning message about the HTML 5 template mode being deprecated and the HTML To avoid a warning message about the HTML 5 template mode being deprecated and the HTML
template mode being used instead, you may also want to explicitly configure template mode being used instead, you may also want to explicitly configure
`spring.thymeleaf.mode` to be `HTML`, for example: `spring.thymeleaf.mode` to be `HTML`, for example: