From c13622ea29cbb1610a047880e9cd292bf300ab73 Mon Sep 17 00:00:00 2001 From: Josh Thornhill Date: Mon, 10 Aug 2015 11:10:58 -0400 Subject: [PATCH] Fix typo Closes gh-3721 --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index f39c23e089e..aae8f6e5e06 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -419,7 +419,7 @@ environment variables or system properties. In addition to `application.properties` files, profile-specific properties can also be defined using the naming convention `application-{profile}.properties`. The `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). Profile specific properties are loaded from the same locations as standard