Merge branch '1.2.x'

This commit is contained in:
Stephane Nicoll
2015-08-07 16:03:47 +02:00

View File

@@ -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):