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

Merge branch '2.6.x' into 2.7.x 

Closes gh-32291
This commit is contained in:
Stephane Nicoll 2022-09-10 09:13:40 +02:00
parent fd808ba16e 42db66cc92
commit 04a668fd07
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/features/external-config.adoc
View File

@ -105,8 +105,8 @@ Spring Boot will automatically find and load `application.properties` and `appli
.. The classpath `/config` package .. The classpath `/config` package
. From the current directory . From the current directory
.. The current directory .. The current directory
.. The `/config` subdirectory in the current directory .. The `config/` subdirectory in the current directory
.. Immediate child directories of the `/config` subdirectory .. Immediate child directories of the `config/` subdirectory
The list is ordered by precedence (with values from lower items overriding earlier ones). The list is ordered by precedence (with values from lower items overriding earlier ones).
Documents from the loaded files are added as `PropertySources` to the Spring `Environment`. Documents from the loaded files are added as `PropertySources` to the Spring `Environment`.