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

Merge branch '2.5.x' into 2.6.x 

Closes gh-30120
This commit is contained in:
Stephane Nicoll 2022-03-09 08:29:07 +01:00
parent be85f317d3 fb45b2bb62
commit 069c328075
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ For example, to look for `myproject.properties` and `myproject.yaml` files you c
---- ----
You can also refer to an explicit location by using the configprop:spring.config.location[] environment property. You can also refer to an explicit location by using the configprop:spring.config.location[] environment property.
This properties accepts a comma-separated list of one or more locations to check. This property accepts a comma-separated list of one or more locations to check.
The following example shows how to specify two distinct files: The following example shows how to specify two distinct files: