diff --git a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management.adoc b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management.adoc
index ee120bee179..77866f66dd2 100644
--- a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management.adoc
+++ b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management.adoc
@@ -108,7 +108,7 @@ or context initializers. Alternatively, you can implement and configure your own
 `SmartContextLoader` for advanced use cases.
 
 * xref:testing/testcontext-framework/ctx-management/javaconfig.adoc[Context Configuration with Component Classes]
-* xref:testing/testcontext-framework/ctx-management/xml.adoc[Context Configuration with XML resources]
+* xref:testing/testcontext-framework/ctx-management/xml.adoc[Context Configuration with XML Resources]
 * xref:testing/testcontext-framework/ctx-management/groovy.adoc[Context Configuration with Groovy Scripts]
 * xref:testing/testcontext-framework/ctx-management/mixed-config.adoc[Mixing Component Classes, XML, and Groovy Scripts]
 * xref:testing/testcontext-framework/ctx-management/context-customizers.adoc[Context Configuration with Context Customizers]
diff --git a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/xml.adoc b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/xml.adoc
index 71e0b27f334..46742aa8e2c 100644
--- a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/xml.adoc
+++ b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/xml.adoc
@@ -1,5 +1,5 @@
 [[testcontext-ctx-management-xml]]
-= Context Configuration with XML resources
+= Context Configuration with XML Resources
 
 To load an `ApplicationContext` for your tests by using XML configuration files, annotate
 your test class with `@ContextConfiguration` and configure the `locations` attribute with
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
index 71784c56af1..029bfbb4f20 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
@@ -66,10 +66,10 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	 * Process <em>component classes</em> in the supplied {@link ContextConfigurationAttributes}.
 	 * <p>If the <em>component classes</em> are {@code null} or empty and
 	 * {@link #isGenerateDefaultLocations()} returns {@code true}, this
-	 * {@code SmartContextLoader} will attempt to {@link
+	 * {@code SmartContextLoader} will attempt to {@linkplain
 	 * #detectDefaultConfigurationClasses detect default configuration classes}.
 	 * If defaults are detected they will be
-	 * {@link ContextConfigurationAttributes#setClasses(Class[]) set} in the
+	 * {@linkplain ContextConfigurationAttributes#setClasses(Class[]) set} in the
 	 * supplied configuration attributes. Otherwise, properties in the supplied
 	 * configuration attributes will not be modified.
 	 * @param configAttributes the context configuration attributes to process