From baf367831fa0cc9f70eac0f9bf9f8a3ed09f760c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 19 Aug 2023 15:40:31 +0200
Subject: [PATCH] Add @AliasFor tip to Javadoc for @TestPropertySource

---
 .../org/springframework/test/context/TestPropertySource.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java b/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java
index 394173f0297..2eadd60be16 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java
@@ -74,11 +74,12 @@ import org.springframework.core.io.support.PropertySourceFactory;
  * <li>{@code @TestPropertySource} can be used as a <em>{@linkplain Repeatable
  * repeatable}</em> annotation.</li>
  * <li>This annotation may be used as a <em>meta-annotation</em> to create
- * custom <em>composed annotations</em>; however, caution should be taken if
+ * custom <em>composed annotations</em>, but caution should be taken if
  * this annotation and {@code @ContextConfiguration} are combined on a composed
  * annotation since the {@code locations} and {@code inheritLocations} attributes
  * of both annotations can lead to ambiguity during the attribute resolution
- * process.</li>
+ * process. Note, however, that ambiguity can be avoided via explicit annotation
+ * attribute overrides using {@link AliasFor @AliasFor}.</li>
  * <li>As of Spring Framework 5.3, this annotation will be inherited from an
  * enclosing test class by default. See
  * {@link NestedTestConfiguration @NestedTestConfiguration} for details.</li>