Merge branch '4.0.x'

Closes gh-48805

documentation/spring-boot-docs/src/docs/antora/modules/how-to/pages/application.adoc

@@ -70,12 +70,12 @@ There is more than one way to register additional customizations:
 The javadoc:org.springframework.boot.SpringApplication[] sends some special javadoc:org.springframework.test.context.event.ApplicationEvents[] to the listeners (some even before the context is created) and then registers the listeners for events published by the javadoc:org.springframework.context.ApplicationContext[] as well.
 See xref:reference:features/spring-application.adoc#features.spring-application.application-events-and-listeners[] in the "`Spring Boot Features`" section for a complete list.
 
-It is also possible to customize the javadoc:org.springframework.core.env.Environment[] before the application context is refreshed by using javadoc:org.springframework.boot.env.EnvironmentPostProcessor[].
+It is also possible to customize the javadoc:org.springframework.core.env.Environment[] before the application context is refreshed by using javadoc:org.springframework.boot.EnvironmentPostProcessor[].
 Each implementation should be registered in `META-INF/spring.factories`, as shown in the following example:
 
 [source]
 ----
-org.springframework.boot.env.EnvironmentPostProcessor=com.example.YourEnvironmentPostProcessor
+org.springframework.boot.EnvironmentPostProcessor=com.example.YourEnvironmentPostProcessor
 ----
 
 The implementation can load arbitrary files and add them to the javadoc:org.springframework.core.env.Environment[].

documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/external-config.adoc

@@ -642,7 +642,7 @@ myotherprop: "sometimes-set"
 == Encrypting Properties
 
 Spring Boot does not provide any built-in support for encrypting property values, however, it does provide the hook points necessary to modify values contained in the Spring javadoc:org.springframework.core.env.Environment[].
-The javadoc:org.springframework.boot.env.EnvironmentPostProcessor[] interface allows you to manipulate the javadoc:org.springframework.core.env.Environment[] before the application starts.
+The javadoc:org.springframework.boot.EnvironmentPostProcessor[] interface allows you to manipulate the javadoc:org.springframework.core.env.Environment[] before the application starts.
 See xref:how-to:application.adoc#howto.application.customize-the-environment-or-application-context[] for details.
 
 If you need a secure way to store credentials and passwords, the https://cloud.spring.io/spring-cloud-vault/[Spring Cloud Vault] project provides support for storing externalized configuration in https://www.vaultproject.io/[HashiCorp Vault].