diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
index 6009d6bdcf3..033eb4dbc99 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
@@ -43,7 +43,7 @@ public class JndiLocatorDelegate extends JndiLocatorSupport {
 	 * JNDI lookups such as for a {@code DataSource} or some other environment resource.
 	 * The flag literally just affects code which attempts JNDI searches based on the
 	 * {@code JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable()} check: in particular,
-	 * {@code StandardServletEnvironment} and {@code StandardPortletEnvironment}.
+	 * {@code StandardServletEnvironment}.
 	 * @since 4.3
 	 * @see #isDefaultJndiEnvironmentAvailable()
 	 * @see JndiPropertySource
diff --git a/spring-core/src/main/java/org/springframework/core/io/ContextResource.java b/spring-core/src/main/java/org/springframework/core/io/ContextResource.java
index 90b2c2dc421..9fd5599e017 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ContextResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ContextResource.java
@@ -32,7 +32,7 @@ public interface ContextResource extends Resource {
 	/**
 	 * Return the path within the enclosing 'context'.
 	 * <p>This is typically path relative to a context-specific root directory,
-	 * for example, a ServletContext root or a PortletContext root.
+	 * for example, a ServletContext root.
 	 */
 	String getPathWithinContext();
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
index 9a33cee51f7..69d733bae5a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
@@ -70,9 +70,6 @@ import org.springframework.web.util.WebUtils;
  * actually is, they are much better off setting this flag to true, and submitting
  * paths which are to be considered relative to the web application root.
  *
- * <p><b>NOTE when using this redirect view in a Portlet environment:</b> Make sure
- * that your controller respects the Portlet {@code sendRedirect} constraints.
- *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Colin Sampaleanu
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
index b2fd841e0f9..dcb56f5cc31 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd
@@ -15,7 +15,6 @@
 		<xsd:annotation>
 			<xsd:documentation source="java:org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter"><![CDATA[
 	Configures the annotation-driven Spring MVC Controller programming model.
-	Note that this tag works in Web MVC only, not in Portlet MVC!
 
 	See org.springframework.web.servlet.config.annotation.EnableWebMvc javadoc for details
 	on code-based alternatives to enabling annotation-driven Spring MVC support.