diff --git a/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java b/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java
index 504dc6a3434..390021c7fc3 100644
--- a/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java
+++ b/spring-context/src/main/java/org/springframework/context/MessageSourceAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,13 @@ package org.springframework.context;
 import org.springframework.beans.factory.Aware;
 
 /**
- * Interface to be implemented by any object that wishes to be notified
- * of the MessageSource (typically the ApplicationContext) that it runs in.
+ * Interface to be implemented by any object that wishes to be notified of the
+ * {@link MessageSource} (typically the ApplicationContext) that it runs in.
  *
- * <p>Note that the MessageSource can usually also be passed on as bean
- * reference (to arbitrary bean properties or constructor arguments), because
- * it is defined as bean with name "messageSource" in the application context.
+ * <p>Note that the {@code MessageSource} can usually also be passed in as a bean
+ * reference (via arbitrary bean properties or constructor arguments), because
+ * it is defined as a bean with name {@code "messageSource"} in the application
+ * context.
  *
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -34,7 +35,7 @@ import org.springframework.beans.factory.Aware;
 public interface MessageSourceAware extends Aware {
 
 	/**
-	 * Set the MessageSource that this object runs in.
+	 * Set the {@link MessageSource} that this object runs in.
 	 * <p>Invoked after population of normal bean properties but before an init
 	 * callback like InitializingBean's afterPropertiesSet or a custom init-method.
 	 * Invoked before ApplicationContextAware's setApplicationContext.
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityExceptionHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityExceptionHandler.java
index f6bb0b5b3f8..4883fd43448 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityExceptionHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityExceptionHandler.java
@@ -53,8 +53,8 @@ import org.springframework.web.server.UnsupportedMediaTypeStatusException;
  * for global exception handling in an application. Subclasses can override
  * individual methods that handle a specific exception, override
  * {@link #handleExceptionInternal} to override common handling of all exceptions,
- * or {@link #createResponseEntity} to intercept the final step of creating the
- * {@link ResponseEntity} from the selected HTTP status code, headers, and body.
+ * or override {@link #createResponseEntity} to intercept the final step of creating
+ * the {@link ResponseEntity} from the selected HTTP status code, headers, and body.
  *
  * @author Rossen Stoyanchev
  * @since 6.0
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
index 3b310bd68ce..7c5e2e78fa2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
@@ -61,8 +61,8 @@ import org.springframework.web.util.WebUtils;
  * for global exception handling in an application. Subclasses can override
  * individual methods that handle a specific exception, override
  * {@link #handleExceptionInternal} to override common handling of all exceptions,
- * or {@link #createResponseEntity} to intercept the final step of creating the
- * {@link ResponseEntity} from the selected HTTP status code, headers, and body.
+ * or override {@link #createResponseEntity} to intercept the final step of creating
+ * the {@link ResponseEntity} from the selected HTTP status code, headers, and body.
  *
  * @author Rossen Stoyanchev
  * @since 3.2