diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index 67ee5c5ae5..6344262524 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc @@ -522,6 +522,8 @@ Config data files are considered in the following order: . <> outside of your packaged jar (`application.properties` and YAML variants). . <> outside of your packaged jar (`application-\{profile}.properties` and YAML variants). +NOTE: If you have both `application.yml` and `application.properties` on the same level, the `application.properties` will take precedence. + To provide a concrete example, suppose you develop a `@Component` that uses a `name` property, as shown in the following example: [source,java,indent=0]