Skip to content

Commit 1916f36

Browse files
committed
Improve document wording
1. there is no annotation `@ComponentScanned` 2. "`main`" is rendered as "main", `main` is better
1 parent 63eb399 commit 1916f36

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docs/modules/ROOT/pages/spring-cloud-commons/application-context-services.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You can disable the bootstrap process completely by setting `spring.cloud.bootst
3838
== Application Context Hierarchies
3939

4040
If you build an application context from `SpringApplication` or `SpringApplicationBuilder`, the Bootstrap context is added as a parent to that context.
41-
It is a feature of Spring that child contexts inherit property sources and profiles from their parent, so the "`main`" application context contains additional property sources, compared to building the same context without Spring Cloud Config.
41+
It is a feature of Spring that child contexts inherit property sources and profiles from their parent, so the `main` application context contains additional property sources, compared to building the same context without Spring Cloud Config.
4242
The additional property sources are:
4343

4444
* "`bootstrap`": If any `PropertySourceLocators` are found in the bootstrap context and if they have non-empty properties, an optional `CompositePropertySource` appears with high priority.
@@ -99,7 +99,7 @@ Any beans that you want to be available to the main application context for auto
9999
There is a special contract for `@Beans` of type `ApplicationContextInitializer`.
100100
If you want to control the startup sequence, you can mark classes with the `@Order` annotation (the default order is `last`).
101101

102-
WARNING: When adding custom `BootstrapConfiguration`, be careful that the classes you add are not `@ComponentScanned` by mistake into your "`main`" application context, where they might not be needed.
102+
WARNING: When adding custom `BootstrapConfiguration`, be careful that the classes you add are not scanned by mistake into your `main` application context, where they might not be needed.
103103
Use a separate package name for boot configuration classes and make sure that name is not already covered by your `@ComponentScan` or `@SpringBootApplication` annotated configuration classes.
104104

105105
The bootstrap process ends by injecting initializers into the main `SpringApplication` instance (which is the normal Spring Boot startup sequence, whether it runs as a standalone application or is deployed in an application server).

0 commit comments

Comments
 (0)