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 pull request #3721 from joshthornhill/patch-3 

* pr/3721:
  Fix typo
This commit is contained in:
Stephane Nicoll 2015-08-15 17:56:19 +02:00
parent d1f7da9797 c13622ea29
commit 3b3a569bc0
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-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -419,7 +419,7 @@ environment variables or system properties.
In addition to `application.properties` files, profile-specific properties can also be In addition to `application.properties` files, profile-specific properties can also be
defined using the naming convention `application-{profile}.properties`. The defined using the naming convention `application-{profile}.properties`. The
`Environment` has a set of default profiles (by default `[default]`) which are `Environment` has a set of default profiles (by default `[default]`) which are
used if no active profiels are set (i.e. if no profiles are explicitly activated used if no active profiles are set (i.e. if no profiles are explicitly activated
then properties from `application-default.properties` are loaded). then properties from `application-default.properties` are loaded).
Profile specific properties are loaded from the same locations as standard Profile specific properties are loaded from the same locations as standard