diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 775de358fe..0c6bb7eeb3 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -287,7 +287,7 @@ content into your application; rather pick only the properties that you need.
 	spring.mustache.suffix=.html
 	spring.mustache.view-names= # whitelist of view names that can be resolved
 
-	# JERSEY ({sc-spring-boot-autoconfigure}}/jersey/JerseyProperties.{sc-ext}[JerseyProperties])
+	# JERSEY ({sc-spring-boot-autoconfigure}/jersey/JerseyProperties.{sc-ext}[JerseyProperties])
 	spring.jersey.application-path # path that serves as the base URI for the application
 	spring.jersey.type=servlet # servlet or filter
 	spring.jersey.init= # init params
diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc
index 1ce26c6900..bd946369da 100644
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -188,7 +188,7 @@ extension are also added to the list by default.
 Spring Boot logs the configuration files that are loaded at `DEBUG` level and the
 candidates it has not found at `TRACE` level.
 
-See {sc-spring-boot}/context/config/ConfigFileApplicationListener.{sc-ext}[`ConfigFileApplicationListener`]
+See {sc-spring-boot}/context/config/ConfigFileEnvironmentPostProcessor.{sc-ext}[`ConfigFileEnvironmentPostProcessor`]
 for more detail.
 
 
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 2175a97ace..753e4eff96 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -1570,7 +1570,7 @@ and less powerful approaches like IFRAME or JSONP.
 As of version 4.2, Spring MVC {spring-reference}/#cors[supports CORS] out of the box.
 Using {spring-reference}/#_controller_method_cors_configuration[controller method CORS
 configuration] with
-{spring-javadoc}/org/springframework/web/bind/annotation/CrossOrigin.html[`@CrossOrigin`]
+{spring-javadoc}/web/bind/annotation/CrossOrigin.html[`@CrossOrigin`]
 annotations in your Spring Boot application does not require any specific configuration.
 {spring-reference}/#_global_cors_configuration[Global CORS configuration] can be defined
 by registering a `WebMvcConfigurer` bean with a customized `addCorsMappings(CorsRegistry)`
@@ -3538,8 +3538,8 @@ the distributed transaction. DataSource and JMS auto-configuration will use JTA
 as long as you have a `JtaTransactionManager` bean and appropriate XA wrapper beans
 registered within your `ApplicationContext`.
 
-The {sc-spring-boot}/jta/BitronixXAConnectionFactoryWrapper.{sc-ext}[BitronixXAConnectionFactoryWrapper]
-and {sc-spring-boot}/jta/BitronixXADataSourceWrapper.{sc-ext}[BitronixXADataSourceWrapper]
+The {sc-spring-boot}/jta/bitronix/BitronixXAConnectionFactoryWrapper.{sc-ext}[BitronixXAConnectionFactoryWrapper]
+and {sc-spring-boot}/jta/bitronix/BitronixXADataSourceWrapper.{sc-ext}[BitronixXADataSourceWrapper]
 provide good examples of how to write XA wrappers.
 
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
index 3f18dab042..403edf193a 100644
--- a/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
@@ -99,7 +99,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor
 
 	private static final String VCAP_SERVICES = "VCAP_SERVICES";
 
-	// Before ConfigFileApplicationListener so values there can use these ones
+	// Before ConfigFileEnvironmentPostProcessor so values there can use these ones
 	private int order = ConfigFileEnvironmentPostProcessor.DEFAULT_ORDER - 1;
 
 	private final JsonParser parser = JsonParserFactory.getJsonParser();