Browse Source

Merge branch '2.6.x' into 2.7.x

Closes gh-32291
pull/32861/head
Stephane Nicoll 3 years ago
parent
commit
04a668fd07
  1. 4
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc

4
spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc

@ -105,8 +105,8 @@ Spring Boot will automatically find and load `application.properties` and `appli @@ -105,8 +105,8 @@ Spring Boot will automatically find and load `application.properties` and `appli
.. The classpath `/config` package
. From the current directory
.. The current directory
.. The `/config` subdirectory in the current directory
.. Immediate child directories of the `/config` subdirectory
.. The `config/` subdirectory in the current directory
.. Immediate child directories of the `config/` subdirectory
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`.

Loading…
Cancel
Save