Merge branch '2.5.x'

Closes gh-26957
pull/26961/head
Stephane Nicoll 3 years ago
commit 63fe89f641

@ -135,9 +135,9 @@ Given the examples above, if we have the following configuration:
The actual application will show the banner (as overridden by configuration) and uses three sources for the `ApplicationContext`. The actual application will show the banner (as overridden by configuration) and uses three sources for the `ApplicationContext`.
The application sources are: The application sources are:
.`MyApplication` (from the code) . `MyApplication` (from the code)
.`MyDatabaseConfig` (from the external config) . `MyDatabaseConfig` (from the external config)
.`MyJmsConfig`(from the external config) . `MyJmsConfig`(from the external config)

Loading…
Cancel
Save