Skip to content

S
spring-boot
Commit 37dcb908 authored by Madhura Bhave's avatar Madhura Bhave
Browse files
Options

Merge branch '2.4.x' 

Closes gh-25502
parents e1904fb7 ae630e03
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View file @ 37dcb908
...@@ -872,6 +872,8 @@ The lines immediately before and after the separator must not be comments. ...@@ -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`. 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. 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]] [[boot-features-external-config-file-activation-properties]]
......
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