Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-03-10 09:22:32 +01:00
commit 544c73841d

View File

@ -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
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.