Skip to content

Commit 9752cd4

Browse files
committed
Merge branch '2.2.x'
Closes gh-20909
2 parents d571fb3 + 856543c commit 9752cd4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ You could also specify it on the command line by using the following switch: `--
15461546
The configprop:spring.profiles.active[] property follows the same ordering rules as other properties: The highest `PropertySource` wins.
15471547
This means that you can specify active profiles in `application.properties` and then *replace* them by using the command line switch.
15481548

1549-
Sometimes, it is useful to have profil-specific properties that *add* to the active profiles rather than replace them.
1549+
Sometimes, it is useful to have profile-specific properties that *add* to the active profiles rather than replace them.
15501550
The configprop:spring.profiles.include[] property can be used to unconditionally add active profiles.
15511551
The `SpringApplication` entry point also has a Java API for setting additional profiles (that is, on top of those activated by the configprop:spring.profiles.active[] property).
15521552
See the `setAdditionalProfiles()` method in {spring-boot-module-api}/SpringApplication.html[SpringApplication].

0 commit comments

Comments
 (0)