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

Merge branch '2.4.x' 

Closes gh-25432
This commit is contained in:
Stephane Nicoll 2021-02-25 15:58:51 +01:00
parent 84984fb148 2fde67dc10
commit 9e3cfc5d7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -573,9 +573,9 @@ For example, if `spring.config.location` is configured with the value `optional:
. `optional:classpath:custom-config/`
. `optional:file:./custom-config/`
If you prefer to add addition locations, rather than replacing them, you can use `spring.config.additional-location`.
If you prefer to add additional locations, rather than replacing them, you can use `spring.config.additional-location`.
Properties loaded from additional locations can override those in the default locations.
For example, if `spring.config.additional-location` is configured with the value `optional:classpath:/custom-config/,optional:file:./custom-config/`, the complete the complete set of locations considered is:
For example, if `spring.config.additional-location` is configured with the value `optional:classpath:/custom-config/,optional:file:./custom-config/`, the complete set of locations considered is:
. `optional:classpath:/`
. `optional:classpath:/config/`