Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

Browse Source 
Closes gh-25502
This commit is contained in:
Madhura Bhave
2021-03-04 14:48:11 -08:00
parent e1904fb72f ae630e03ce
commit 37dcb90876
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@@ -872,6 +872,8 @@ The lines immediately before and after the separator must not be comments.
TIP: Multi-document property files are often used in conjunction with activation properties such as `spring.config.activate.on-profile`.
See the <<boot-features-external-config-file-activation-properties, next section>> for details.
WARNING: Multi-document property files cannot be loaded by using the `@PropertySource` or `@TestPropertySource` annotations.
[[boot-features-external-config-file-activation-properties]]