diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java b/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
index a2d0c2f3a1..d00fbd0a03 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
@@ -62,18 +62,18 @@ public @interface CacheEvict {
* Spring Expression Language (SpEL) expression for computing the key dynamically.
*
Default is {@code ""}, meaning all method parameters are considered as a key,
* unless a custom {@link #keyGenerator} has been set.
- *
The SpEL expression evaluates again a dedicated context that provides the
+ *
The SpEL expression evaluates against a dedicated context that provides the
* following meta-data:
*
* - {@code #result} for a reference to the result of the method invocation, which
* can only be used if {@link #beforeInvocation()} is {@code false}.
- * - {@code #root.method}, {@code #root.target} and {@code #root.caches} for a
- * reference to the {@link java.lang.reflect.Method method}, target object and
+ *
- {@code #root.method}, {@code #root.target}, and {@code #root.caches} for
+ * references to the {@link java.lang.reflect.Method method}, target object, and
* affected cache(s) respectively.
* - Shortcuts for the method name ({@code #root.methodName}) and target class
* ({@code #root.targetClass}) are also available.
*
- Method arguments can be accessed by index. For instance the second argument
- * can be access via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
+ * can be accessed via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
* can also be accessed by name if that information is available.
*
*/
@@ -108,16 +108,16 @@ public @interface CacheEvict {
* Spring Expression Language (SpEL) expression used for making the cache
* eviction operation conditional.
* Default is {@code ""}, meaning the cache eviction is always performed.
- *
The SpEL expression evaluates again a dedicated context that provides the
+ *
The SpEL expression evaluates against a dedicated context that provides the
* following meta-data:
*
- * - {@code #root.method}, {@code #root.target} and {@code #root.caches} for a
- * reference to the {@link java.lang.reflect.Method method}, target object and
+ *
- {@code #root.method}, {@code #root.target}, and {@code #root.caches} for
+ * references to the {@link java.lang.reflect.Method method}, target object, and
* affected cache(s) respectively.
* - Shortcuts for the method name ({@code #root.methodName}) and target class
* ({@code #root.targetClass}) are also available.
*
- Method arguments can be accessed by index. For instance the second argument
- * can be access via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
+ * can be accessed via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
* can also be accessed by name if that information is available.
*
*/
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java
index bcea549453..baf9934a67 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java
@@ -67,17 +67,17 @@ public @interface CachePut {
* Spring Expression Language (SpEL) expression for computing the key dynamically.
* Default is {@code ""}, meaning all method parameters are considered as a key,
* unless a custom {@link #keyGenerator} has been set.
- *
The SpEL expression evaluates again a dedicated context that provides the
+ *
The SpEL expression evaluates against a dedicated context that provides the
* following meta-data:
*
* - {@code #result} for a reference to the result of the method invocation.
- * - {@code #root.method}, {@code #root.target} and {@code #root.caches} for a
- * reference to the {@link java.lang.reflect.Method method}, target object and
+ *
- {@code #root.method}, {@code #root.target}, and {@code #root.caches} for
+ * references to the {@link java.lang.reflect.Method method}, target object, and
* affected cache(s) respectively.
* - Shortcuts for the method name ({@code #root.methodName}) and target class
* ({@code #root.targetClass}) are also available.
*
- Method arguments can be accessed by index. For instance the second argument
- * can be access via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
+ * can be accessed via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
* can also be accessed by name if that information is available.
*
*/
@@ -112,16 +112,16 @@ public @interface CachePut {
* Spring Expression Language (SpEL) expression used for making the cache
* put operation conditional.
* Default is {@code ""}, meaning the method result is always cached.
- *
The SpEL expression evaluates again a dedicated context that provides the
+ *
The SpEL expression evaluates against a dedicated context that provides the
* following meta-data:
*
- * - {@code #root.method}, {@code #root.target} and {@code #root.caches} for a
- * reference to the {@link java.lang.reflect.Method method}, target object and
+ *
- {@code #root.method}, {@code #root.target}, and {@code #root.caches} for
+ * references to the {@link java.lang.reflect.Method method}, target object, and
* affected cache(s) respectively.
* - Shortcuts for the method name ({@code #root.methodName}) and target class
* ({@code #root.targetClass}) are also available.
*
- Method arguments can be accessed by index. For instance the second argument
- * can be access via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
+ * can be accessed via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
* can also be accessed by name if that information is available.
*
*/
@@ -132,17 +132,17 @@ public @interface CachePut {
* Unlike {@link #condition}, this expression is evaluated after the method
* has been called and can therefore refer to the {@code result}.
*
Default is {@code ""}, meaning that caching is never vetoed.
- *
The SpEL expression evaluates again a dedicated context that provides the
+ *
The SpEL expression evaluates against a dedicated context that provides the
* following meta-data:
*
* - {@code #result} for a reference to the result of the method invocation.
- * - {@code #root.method}, {@code #root.target} and {@code #root.caches} for a
- * reference to the {@link java.lang.reflect.Method method}, target object and
+ *
- {@code #root.method}, {@code #root.target}, and {@code #root.caches} for
+ * references to the {@link java.lang.reflect.Method method}, target object, and
* affected cache(s) respectively.
* - Shortcuts for the method name ({@code #root.methodName}) and target class
* ({@code #root.targetClass}) are also available.
*
- Method arguments can be accessed by index. For instance the second argument
- * can be access via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
+ * can be accessed via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
* can also be accessed by name if that information is available.
*
* @since 3.2
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
index a5d336a6d6..055b49dee3 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
@@ -73,16 +73,16 @@ public @interface Cacheable {
* Spring Expression Language (SpEL) expression for computing the key dynamically.
* Default is {@code ""}, meaning all method parameters are considered as a key,
* unless a custom {@link #keyGenerator} has been configured.
- *
The SpEL expression evaluates again a dedicated context that provides the
+ *
The SpEL expression evaluates against a dedicated context that provides the
* following meta-data:
*
- * - {@code #root.method}, {@code #root.target} and {@code #root.caches} for a
- * reference to the {@link java.lang.reflect.Method method}, target object and
+ *
- {@code #root.method}, {@code #root.target}, and {@code #root.caches} for
+ * references to the {@link java.lang.reflect.Method method}, target object, and
* affected cache(s) respectively.
* - Shortcuts for the method name ({@code #root.methodName}) and target class
* ({@code #root.targetClass}) are also available.
*
- Method arguments can be accessed by index. For instance the second argument
- * can be access via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
+ * can be accessed via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
* can also be accessed by name if that information is available.
*
*/
@@ -117,16 +117,16 @@ public @interface Cacheable {
* Spring Expression Language (SpEL) expression used for making the method
* caching conditional.
* Default is {@code ""}, meaning the method result is always cached.
- *
The SpEL expression evaluates again a dedicated context that provides the
+ *
The SpEL expression evaluates against a dedicated context that provides the
* following meta-data:
*
- * - {@code #root.method}, {@code #root.target} and {@code #root.caches} for a
- * reference to the {@link java.lang.reflect.Method method}, target object and
+ *
- {@code #root.method}, {@code #root.target}, and {@code #root.caches} for
+ * references to the {@link java.lang.reflect.Method method}, target object, and
* affected cache(s) respectively.
* - Shortcuts for the method name ({@code #root.methodName}) and target class
* ({@code #root.targetClass}) are also available.
*
- Method arguments can be accessed by index. For instance the second argument
- * can be access via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
+ * can be accessed via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
* can also be accessed by name if that information is available.
*
*/
@@ -137,17 +137,17 @@ public @interface Cacheable {
* Unlike {@link #condition}, this expression is evaluated after the method
* has been called and can therefore refer to the {@code result}.
*
Default is {@code ""}, meaning that caching is never vetoed.
- *
The SpEL expression evaluates again a dedicated context that provides the
+ *
The SpEL expression evaluates against a dedicated context that provides the
* following meta-data:
*
* - {@code #result} for a reference to the result of the method invocation.
- * - {@code #root.method}, {@code #root.target} and {@code #root.caches} for a
- * reference to the {@link java.lang.reflect.Method method}, target object and
+ *
- {@code #root.method}, {@code #root.target}, and {@code #root.caches} for
+ * references to the {@link java.lang.reflect.Method method}, target object, and
* affected cache(s) respectively.
* - Shortcuts for the method name ({@code #root.methodName}) and target class
* ({@code #root.targetClass}) are also available.
*
- Method arguments can be accessed by index. For instance the second argument
- * can be access via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
+ * can be accessed via {@code #root.args[1]}, {@code #p1} or {@code #a1}. Arguments
* can also be accessed by name if that information is available.
*
* @since 3.2