Skip to content

S
spring-boot
Commit 544c7384 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents 6624fe47 633e75dc
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View file @ 544c7384
...@@ -482,7 +482,7 @@ is also a good candidate as the primary `@Configuration`. ...@@ -482,7 +482,7 @@ is also a good candidate as the primary `@Configuration`.
TIP: Many Spring configuration examples have been published on the Internet that use XML TIP: Many Spring configuration examples have been published on the Internet that use XML
configuration. Always try to use the equivalent Java-based configuration if possible. configuration. Always try to use the equivalent Java-based configuration if possible.
Searching for `+enable*+` annotations can be a good starting point. Searching for `+Enable*+` annotations can be a good starting point.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment