From c43d91598e881512609dbe7d1dd9b3f4e3a88e1c Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 14 Jan 2014 13:25:43 +0000 Subject: [PATCH] Update config location docs --- docs/howto.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/howto.md b/docs/howto.md index b3300c54b02..419a67a8f07 100644 --- a/docs/howto.md +++ b/docs/howto.md @@ -832,12 +832,12 @@ properties, environment variables or the command line. You can also provide System properties (or environment variables) to change the behaviour: -* `config.name` (`CONFIG_NAME`), defaults to `application` as the root - of the file name -* `config.location` (`CONFIG_LOCATION`) is file to load (e.g. a - classpath resource or a URL). A separate `Environment` property - source is set up for this document and it can be overridden by - system properties, environment variables or the command line. +* `spring.config.name` (`SPRING_CONFIG_NAME`), defaults to + `application` as the root of the file name +* `spring.config.location` (`SPRING_CONFIG_LOCATION`) is file to load + (e.g. a classpath resource or a URL). A separate `Environment` + property source is set up for this document and it can be overridden + by system properties, environment variables or the command line. No matter what you set in the environment, Spring Boot will always load `application.properties` as described above. If YAML is used then