Merge branch '1.2.x'

9 years ago · 3507451c9a
parent 95dac0bbec f88d548de0
commit 3507451c9a
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@ -257,7 +257,7 @@ about YAML.

 [[howto-set-active-spring-profiles]]
 === Set the active Spring profiles
-The Spring `Environment` has an API for this, but normally you would set a System profile
+The Spring `Environment` has an API for this, but normally you would set a System property
 (`spring.profiles.active`) or an OS environment variable (`SPRING_PROFILES_ACTIVE`). E.g.
 launch your application with a `-D` argument (remember to put it before the main class
 or jar archive):