diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index 3753f1823e..39978e8800 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -76,18 +76,17 @@ import org.springframework.web.util.WebUtils;
  *
  * <li>It can use any {@link HandlerMapping} implementation - pre-built or provided
  * as part of an application - to control the routing of requests to handler objects.
- * Default is {@link org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping}, as well
- * as a {@link org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping}
- * when running on Java 5+. HandlerMapping objects can be defined as beans in the servlet's
- * application context, implementing the HandlerMapping interface, overriding the default
- * HandlerMapping if present. HandlerMappings can be given any bean name (they are tested by type).
+ * Default is {@link org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping} and
+ * {@link org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping}.
+ * HandlerMapping objects can be defined as beans in the servlet's application context,
+ * implementing the HandlerMapping interface, overriding the default HandlerMapping if present.
+ * HandlerMappings can be given any bean name (they are tested by type).
  *
  * <li>It can use any {@link HandlerAdapter}; this allows for using any handler interface.
  * Default adapters are {@link org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter},
  * {@link org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter},
  * for Spring's {@link org.springframework.web.HttpRequestHandler} and
- * {@link org.springframework.web.servlet.mvc.Controller} interfaces,
- * respectively. When running in a Java 5+ environment, a default
+ * {@link org.springframework.web.servlet.mvc.Controller} interfaces, respectively. A default
  * {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter}
  * will be registered as well. HandlerAdapter objects can be added as beans in the
  * application context, overriding the default HandlerAdapters. Like HandlerMappings,
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/Controller.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/Controller.java
index 6a4eca977f..ab452fb277 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/Controller.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/Controller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2008 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.
@@ -50,14 +50,7 @@ import org.springframework.web.servlet.ModelAndView;
  * {@link org.springframework.web.servlet.ModelAndView ModelAndView}.
  * So actually, this method is the main entrypoint for the
  * {@link org.springframework.web.servlet.DispatcherServlet DispatcherServlet}
- * which delegates requests to controllers. This method - and also this interface -
- * should preferrably not be implemented by custom controllers <i>directly</i>, since
- * abstract controller also provided by this package already provide a lot of
- * functionality for typical use cases in web applications. A few examples of
- * those controllers:
- * {@link AbstractController AbstractController},
- * {@link AbstractCommandController AbstractCommandController},
- * {@link SimpleFormController SimpleFormController}.</p>
+ * which delegates requests to controllers.</p>
  *
  * <p>So basically any <i>direct</i> implementation of the Controller interface
  * just handles HttpServletRequests and should return a ModelAndView, to be further
@@ -100,15 +93,13 @@ import org.springframework.web.servlet.ModelAndView;
  * you all those references through convenient accessors - but requires an
  * ApplicationContext reference on initialization.
  *
- * <p>Controllers can optionally implement the LastModified interface.
+ * <p>Controllers can optionally implement the {@link LastModified} interface.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @see LastModified
  * @see SimpleControllerHandlerAdapter
  * @see AbstractController
- * @see AbstractCommandController
- * @see SimpleFormController
  * @see org.springframework.mock.web.MockHttpServletRequest
  * @see org.springframework.mock.web.MockHttpServletResponse
  * @see org.springframework.context.ApplicationContextAware