From 6c818bfd506cf28d4c4e81aaabef2600c641b2a2 Mon Sep 17 00:00:00 2001
From: Stevo Slavic <sslavic@gmail.com>
Date: Sun, 12 Feb 2012 20:59:58 +0100
Subject: [PATCH] Fix javadoc warnings

Before this fix there were numerous javadoc warnings being reported
while building Spring framework API.

This fix resolves most of the javadoc warnings.

Issue: SPR-9113
---
 .../AsyncExecutionInterceptor.java            |  2 +-
 .../AbstractPrototypeBasedTargetSource.java   |  5 +--
 .../aspectj/AspectJAsyncConfiguration.java    |  2 +-
 .../beans/factory/annotation/Autowired.java   |  5 +--
 .../beans/factory/annotation/Value.java       |  5 +--
 .../config/PlaceholderConfigurerSupport.java  |  6 ++--
 .../xml/BeanDefinitionParserDelegate.java     |  2 +-
 .../support/ResourceEditorRegistrar.java      |  3 +-
 .../quartz/CronTriggerFactoryBean.java        |  4 +--
 .../quartz/SimpleTriggerFactoryBean.java      |  4 +--
 .../annotation/CacheAnnotationParser.java     |  2 +-
 .../CachingConfigurationSelector.java         |  2 +-
 .../cache/annotation/EnableCaching.java       |  2 +-
 .../cache/concurrent/ConcurrentMapCache.java  |  2 +-
 .../cache/ehcache/EhCacheCacheManager.java    |  4 +--
 ...eanFactoryCacheOperationSourceAdvisor.java |  1 -
 .../interceptor/CacheProxyFactoryBean.java    |  4 +--
 .../NameMatchCacheOperationSource.java        |  1 -
 .../context/annotation/Configuration.java     | 33 ++++++++++---------
 .../annotation/EnableLoadTimeWeaving.java     |  4 +--
 .../context/annotation/FilterType.java        |  4 +--
 .../context/annotation/Import.java            | 16 ++++-----
 .../annotation/LoadTimeWeavingConfigurer.java | 10 +++---
 .../support/AbstractApplicationContext.java   |  2 +-
 .../PropertySourcesPlaceholderConfigurer.java |  2 +-
 .../joda/JodaTimeFormatterRegistrar.java      |  2 +-
 .../glassfish/GlassFishLoadTimeWeaver.java    |  6 ++--
 .../jmx/access/MBeanClientInterceptor.java    |  2 +-
 .../assembler/AbstractMBeanInfoAssembler.java |  2 +-
 .../annotation/AsyncAnnotationAdvisor.java    |  6 ++--
 .../MethodValidationInterceptor.java          |  2 +-
 .../convert/ConverterNotFoundException.java   |  1 -
 .../core/convert/TypeDescriptor.java          |  2 +-
 .../core/env/AbstractEnvironment.java         |  6 ++--
 .../core/env/PropertyResolver.java            |  6 ++--
 .../support/SerializingConverter.java         |  2 +-
 .../task/support/ExecutorServiceAdapter.java  |  2 +-
 .../expression/spel/SpelNode.java             |  2 +-
 .../jdbc/core/JdbcOperations.java             |  4 +--
 .../ParameterizedPreparedStatementSetter.java |  2 +-
 .../embedded/EmbeddedDatabaseConfigurer.java  |  2 +-
 .../MappingJacksonMessageConverter.java       |  1 -
 .../jms/support/converter/MessageType.java    |  2 +-
 .../hibernate4/LocalSessionFactoryBean.java   |  2 +-
 .../orm/ibatis/SqlMapClientFactoryBean.java   |  1 -
 .../orm/jdo/JdoOperations.java                |  1 -
 .../orm/jpa/vendor/EclipseLinkJpaDialect.java |  2 +-
 .../orm/jpa/vendor/TopLinkJpaDialect.java     |  2 +-
 .../oxm/GenericMarshaller.java                |  2 +-
 .../oxm/GenericUnmarshaller.java              |  2 +-
 .../oxm/castor/CastorMarshaller.java          |  4 +--
 .../web/struts/ActionSupport.java             |  1 -
 .../web/struts/ContextLoaderPlugIn.java       |  1 -
 .../web/struts/DispatchActionSupport.java     |  1 -
 .../struts/LookupDispatchActionSupport.java   |  1 -
 .../struts/MappingDispatchActionSupport.java  |  1 -
 .../ContextConfigurationAttributes.java       |  4 +--
 .../test/context/SmartContextLoader.java      |  3 +-
 .../RunAfterTestMethodCallbacks.java          |  4 +--
 .../support/AbstractContextLoader.java        | 22 +++++++------
 .../support/AbstractGenericContextLoader.java | 22 ++++++-------
 .../AnnotationConfigContextLoader.java        | 10 +++---
 .../jca/work/jboss/JBossWorkManagerUtils.java |  2 +-
 .../EnableTransactionManagement.java          |  2 +-
 .../TransactionProxyFactoryBean.java          |  1 -
 .../DelegatingTransactionDefinition.java      |  2 +-
 .../client/ClientHttpRequestInterceptor.java  |  2 +-
 .../HttpMessageNotWritableException.java      |  3 +-
 .../web/bind/annotation/CookieValue.java      |  3 +-
 .../web/bind/annotation/PathVariable.java     |  3 +-
 .../web/bind/annotation/RequestBody.java      |  3 +-
 .../web/bind/annotation/RequestHeader.java    |  2 +-
 .../web/bind/annotation/RequestMapping.java   |  5 ++-
 .../web/bind/annotation/RequestParam.java     |  3 +-
 .../ConfigurableWebBindingInitializer.java    |  2 +-
 .../web/context/ContextLoader.java            |  7 ++--
 .../web/context/ContextLoaderListener.java    | 21 ++++++------
 ...AnnotationConfigWebApplicationContext.java |  8 ++---
 .../web/portlet/DispatcherPortlet.java        |  1 -
 ...tRefreshablePortletApplicationContext.java |  2 +-
 .../portlet/context/PortletContextScope.java  |  2 +-
 .../StaticPortletApplicationContext.java      |  2 +-
 ...letRequestMethodNotSupportedException.java |  1 -
 .../web/servlet/FrameworkServlet.java         |  9 ++---
 .../handler/DispatcherServletWebRequest.java  |  2 +-
 .../AnnotationMethodHandlerAdapter.java       |  2 +-
 .../mvc/condition/RequestCondition.java       |  2 +-
 .../RequestMappingInfoHandlerMapping.java     |  2 +-
 .../RequestMappingHandlerMapping.java         |  2 +-
 .../ServletModelAttributeMethodProcessor.java |  2 +-
 .../DefaultServletHttpRequestHandler.java     |  3 +-
 .../web/servlet/support/RequestContext.java   |  4 +--
 92 files changed, 184 insertions(+), 186 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
index 6039ce304cda..1cc6f8e0221a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
@@ -32,7 +32,7 @@
 /**
  * AOP Alliance <code>MethodInterceptor</code> that processes method invocations
  * asynchronously, using a given {@link org.springframework.core.task.AsyncTaskExecutor}.
- * Typically used with the {@link org.springframework.context.task.Async} annotation.
+ * Typically used with the {@link org.springframework.scheduling.annotation.Async} annotation.
  *
  * <p>In terms of target method signatures, any parameter types are supported.
  * However, the return type is constrained to either <code>void</code> or
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
index 83c8083e5b74..0a2b660a8465 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
@@ -28,8 +28,9 @@
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 
 /**
- * Base class for dynamic {@link TargetSource} implementations that create new prototype
- * bean instances to support a pooling or new-instance-per-invocation strategy.
+ * Base class for dynamic {@link org.springframework.aop.TargetSource} implementations
+ * that create new prototype bean instances to support a pooling or
+ * new-instance-per-invocation strategy.
  *
  * <p>Such TargetSources must run in a {@link BeanFactory}, as it needs to
  * call the <code>getBean</code> method to create a new prototype instance.
diff --git a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
index d9d677a57093..6c421307e398 100644
--- a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
+++ b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
@@ -31,7 +31,7 @@
  * @author Chris Beams
  * @since 3.1
  * @see EnableAsync
- * @see AsyncConfigurationSelector
+ * @see org.springframework.scheduling.annotation.AsyncConfigurationSelector
  */
 @Configuration
 public class AspectJAsyncConfiguration extends AbstractAsyncConfiguration {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
index 2c815be98869..d1799eff728b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
@@ -52,8 +52,9 @@
  * BeanPostProcessor} which in turn means that you <em>cannot</em>
  * use {@code @Autowired} to inject references into
  * {@link org.springframework.beans.factory.config.BeanPostProcessor
- * BeanPostProcessor} or {@link BeanFactoryPostProcessor} types. Please
- * consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor}
+ * BeanPostProcessor} or
+ * {@link org.springframework.beans.factory.config.BeanFactoryPostProcessor BeanFactoryPostProcessor}
+ * types. Please consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor}
  * class (which, by default, checks for the presence of this annotation).
  *
  * @author Juergen Hoeller
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Value.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Value.java
index 2136666cfbd2..5a919aa3120b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Value.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Value.java
@@ -37,8 +37,9 @@
  * BeanPostProcessor} which in turn means that you <em>cannot</em> use
  * {@code @Value} within
  * {@link org.springframework.beans.factory.config.BeanPostProcessor
- * BeanPostProcessor} or {@link BeanFactoryPostProcessor} types. Please
- * consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor}
+ * BeanPostProcessor} or
+ * {@link org.springframework.beans.factory.config.BeanFactoryPostProcessor BeanFactoryPostProcessor}
+ * types. Please consult the javadoc for the {@link AutowiredAnnotationBeanPostProcessor}
  * class (which, by default, checks for the presence of this annotation).
  *
  * @author Juergen Hoeller
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
index ddf060283c4c..e0d22eff6fcf 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
@@ -36,8 +36,8 @@
  *
  *<pre class="code">{@code
  *<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"/>
- *    <property name="driverClassName" value="}${driver}{@code"/>
- *    <property name="url" value="jdbc:}${dbname}{@code"/>
+ *    <property name="driverClassName" value="}${driver}{@code "/>
+ *    <property name="url" value="jdbc:}${dbname}{@code "/>
  *</bean>
  *}</pre>
  *
@@ -76,7 +76,7 @@
  * <p>Example XML property with default value:
  *
  *<pre class="code">{@code
- *  <property name="url" value="jdbc:}${dbname:defaultdb}{@code"/>
+ *  <property name="url" value="jdbc:}${dbname:defaultdb}{@code "/>
  *}</pre>
  *
  * @author Chris Beams
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
index b63652e79ff0..c998362edc08 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
@@ -353,7 +353,7 @@ public void initDefaults(Element root) {
 	 * <literal>parentDefaults</literal> in case the defaults are not explicitly set
 	 * locally.
 	 * @param defaults the defaults to populate
-	 * @param defaults the parent BeanDefinitionParserDelegate (if any) defaults to fall back to
+	 * @param parentDefaults the parent BeanDefinitionParserDelegate (if any) defaults to fall back to
 	 * @param root the root element of the current bean definition document (or nested beans element)
 	 */
 	protected void populateDefaults(DocumentDefaultsDefinition defaults, DocumentDefaultsDefinition parentDefaults, Element root) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
index b1c537ed3920..893fba60bde1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
@@ -34,7 +34,6 @@
 import org.springframework.beans.propertyeditors.InputStreamEditor;
 import org.springframework.beans.propertyeditors.URIEditor;
 import org.springframework.beans.propertyeditors.URLEditor;
-import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertyResolver;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ContextResource;
@@ -71,7 +70,7 @@ public class ResourceEditorRegistrar implements PropertyEditorRegistrar {
 	 * @see org.springframework.core.io.support.ResourcePatternResolver
 	 * @see org.springframework.context.ApplicationContext
 	 * @deprecated as of Spring 3.1 in favor of
-	 * {@link #ResourceEditorRegistrar(ResourceLoader, Environment)}
+	 * {@link #ResourceEditorRegistrar(ResourceLoader, PropertyResolver)}
 	 */
 	@Deprecated
 	public ResourceEditorRegistrar(ResourceLoader resourceLoader) {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
index a8294f05d41e..9772c734e1e6 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
@@ -56,9 +56,7 @@
  * @since 3.1
  * @see #setName
  * @see #setGroup
- * @see #setStartTime
- * @see #setJobName
- * @see #setJobGroup
+ * @see #setStartDelay
  * @see #setJobDetail
  * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers
  * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
index c26b0d004245..8288e4d2640c 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
@@ -56,9 +56,7 @@
  * @since 3.1
  * @see #setName
  * @see #setGroup
- * @see #setStartTime
- * @see #setJobName
- * @see #setJobGroup
+ * @see #setStartDelay
  * @see #setJobDetail
  * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers
  * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java b/spring-context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java
index f6757adb5ae7..b879039e8565 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java
@@ -41,7 +41,7 @@ public interface CacheAnnotationParser {
 	 * @param ae the annotated method or class
 	 * @return CacheOperation the configured caching operation,
 	 * or {@code null} if none was found
-	 * @see AnnotationCacheOperationSource#determineCacheOperation
+	 * @see AnnotationCacheOperationSource#determineCacheOperations(AnnotatedElement)
 	 */
 	Collection<CacheOperation> parseCacheAnnotations(AnnotatedElement ae);
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
index df8be605cc1f..7ad429de250e 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
@@ -30,7 +30,7 @@
  * @since 3.1
  * @see EnableCaching
  * @see ProxyCachingConfiguration
- * @see AnnotationConfigUtils.CACHE_ASPECT_CONFIGURATION_CLASS_NAME
+ * @see AnnotationConfigUtils#CACHE_ASPECT_CONFIGURATION_CLASS_NAME
  */
 public class CachingConfigurationSelector extends AdviceModeImportSelector<EnableCaching> {
 
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
index a054afa6f7bb..cec6f8184611 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
@@ -163,7 +163,7 @@
 
 	/**
 	 * Indicate how caching advice should be applied. The default is
-	 * {@link AdviceMode.PROXY}.
+	 * {@link AdviceMode#PROXY}.
 	 * @see AdviceMode
 	 */
 	AdviceMode mode() default AdviceMode.PROXY;
diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
index 71e8561bec4e..0e7b33b976c3 100644
--- a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
+++ b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
@@ -115,7 +115,7 @@ public void clear() {
 	/**
 	 * Convert the given value from the internal store to a user value
 	 * returned from the get method (adapting <code>null</code>).
-	 * @param userValue the store value
+	 * @param storeValue the store value
 	 * @return the value to return to the user
 	 */
 	protected Object fromStoreValue(Object storeValue) {
diff --git a/spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java b/spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
index 2fb21c7e637e..521e1ec2d112 100644
--- a/spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
+++ b/spring-context/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
@@ -39,8 +39,8 @@ public class EhCacheCacheManager extends AbstractCacheManager {
 
 
 	/**
-	 * Returns the backing Ehcache {@link net.sf.ehcache.CacheManager}.
-	 * @return
+	 * Returns the backing EhCache {@link net.sf.ehcache.CacheManager}.
+	 * @return the backing EhCache {@link net.sf.ehcache.CacheManager}.
 	 */
 	public net.sf.ehcache.CacheManager getCacheManager() {
 		return cacheManager;
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java b/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
index 97cb34d624b9..3b0b03bce9d7 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
@@ -44,7 +44,6 @@ protected CacheOperationSource getCacheOperationSource() {
 	 * Set the cache operation attribute source which is used to find cache
 	 * attributes. This should usually be identical to the source reference
 	 * set on the cache interceptor itself.
-	 * @see CacheInterceptor#setCacheAttributeSource
 	 */
 	public void setCacheOperationSource(CacheOperationSource cacheOperationSource) {
 		this.cacheOperationSource = cacheOperationSource;
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
index d156a701cdaf..93427ff3912f 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java
@@ -24,7 +24,7 @@
  * Proxy factory bean for simplified declarative caching handling.
  * This is a convenient alternative to a standard AOP
  * {@link org.springframework.aop.framework.ProxyFactoryBean}
- * with a separate {@link CachingInterceptor} definition.
+ * with a separate {@link CacheInterceptor} definition.
  *
  * <p>This class is designed to facilitate declarative cache demarcation: namely, wrapping
  * a singleton target object with a caching proxy, proxying all the interfaces that the
@@ -36,7 +36,7 @@
  *
  * @author Costin Leau
  * @see org.springframework.aop.framework.ProxyFactoryBean
- * @see CachingInterceptor
+ * @see CacheInterceptor
  */
 @SuppressWarnings("serial")
 public class CacheProxyFactoryBean extends AbstractSingletonProxyFactoryBean {
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
index 55d6f2a6c37a..69f22ec49fae 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
@@ -50,7 +50,6 @@ public class NameMatchCacheOperationSource implements CacheOperationSource, Seri
 	 * (e.g. "myMethod") and CacheOperation instances
 	 * (or Strings to be converted to CacheOperation instances).
 	 * @see CacheOperation
-	 * @see CacheOperationEditor
 	 */
 	public void setNameMap(Map<String, Collection<CacheOperation>> nameMap) {
 		for (Map.Entry<String, Collection<CacheOperation>> entry : nameMap.entrySet()) {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
index 5d39ac635c8a..7e18b9571377 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Configuration.java
@@ -28,7 +28,7 @@
 import org.springframework.stereotype.Component;
 
 /**
- * Indicates that a class declares one or more @{@link Bean} methods and may be processed
+ * Indicates that a class declares one or more {@link Bean @Bean} methods and may be processed
  * by the Spring container to generate bean definitions and service requests for those
  * beans at runtime, for example:
  * <pre class="code">
@@ -76,14 +76,14 @@
  * post processors that facilitate handling {@code @Configuration} classes.
  *
  * <h3>Via component scanning</h3>
- * <p>{@code @Configuration} is meta-annotated with @{@link Component}, therefore
+ * <p>{@code @Configuration} is meta-annotated with {@link Component @Component}, therefore
  * {@code @Configuration} classes are candidates for component scanning (typically using
  * Spring XML's {@code <context:component-scan/>} element) and therefore may also take
- * advantage of @{@link Autowired}/@{@link Inject} at the field and method level (but not
- * at the constructor level).
+ * advantage of {@link Autowired @Autowired}/{@link javax.inject.Inject @Inject}
+ * at the field and method level (but not at the constructor level).
  * <p>{@code @Configuration} classes may not only be bootstrapped using
  * component scanning, but may also themselves <em>configure</em> component scanning using
- * the @{@link ComponentScan} annotation:
+ * the {@link ComponentScan @ComponentScan} annotation:
  * <pre class="code">
  * &#064;Configuration
  * &#064;ComponentScan("com.acme.app.services")
@@ -91,7 +91,7 @@
  *     // various &#064;Bean definitions ...
  * }</pre>
  *
- * See @{@link ComponentScan} Javadoc for details.
+ * See {@link ComponentScan @ComponentScan} Javadoc for details.
  * 
  *
  * <h2>Working with externalized values</h2>
@@ -115,7 +115,8 @@
  *
  * Properties resolved through the {@code Environment} reside in one or more "property
  * source" objects, and {@code @Configuration} classes may contribute property sources to
- * the {@code Environment} object using the @{@link PropertySources} annotation:
+ * the {@code Environment} object using
+ * the {@link org.springframework.core.env.PropertySources @PropertySources} annotation:
  * <pre class="code">
  * &#064;Configuration
  * &#064;PropertySource("classpath:/com/acme/app.properties")
@@ -129,11 +130,11 @@
  * }</pre>
  *
  * See {@link org.springframework.core.env.Environment Environment}
- * and @{@link PropertySource} Javadoc for further details.
+ * and {@link PropertySource @PropertySource} Javadoc for further details.
  * 
  * <h3>Using the {@code @Value} annotation</h3>
  * Externalized values may be 'wired into' {@code @Configuration} classes using
- * the @{@link Value} annotation:
+ * the {@link Value @Value} annotation:
  * <pre class="code">
  * &#064;Configuration
  * &#064;PropertySource("classpath:/com/acme/app.properties")
@@ -151,13 +152,13 @@
  * PropertySourcesPlaceholderConfigurer}, usually enabled via XML with
  * {@code <context:property-placeholder/>}.  See the section below on composing
  * {@code @Configuration} classes with Spring XML using {@code @ImportResource},
- * see @{@link Value} Javadoc, and see @{@link Bean} Javadoc for details on working with
+ * see {@link Value @Value} Javadoc, and see {@link Bean @Bean} Javadoc for details on working with
  * {@code BeanFactoryPostProcessor} types such as
  * {@code PropertySourcesPlaceholderConfigurer}.
  *
  * <h2>Composing {@code @Configuration} classes</h2>
  * <h3>With the {@code @Import} annotation</h3>
- * <p>{@code @Configuration} classes may be composed using the @{@link Import} annotation,
+ * <p>{@code @Configuration} classes may be composed using the {@link Import @Import} annotation,
  * not unlike the way that {@code <import>} works in Spring XML. Because
  * {@code @Configuration} objects are managed as Spring beans within the container,
  * imported configurations may be injected using {@code @Autowired} or {@code @Inject}:
@@ -189,7 +190,7 @@
  * new AnnotationConfigApplicationContext(AppConfig.class);</pre>
  *
  * <h3>With the {@code @Profile} annotation</h3>
- * {@code @Configuration} classes may be marked with the @{@link Profile} annotation to 
+ * {@code @Configuration} classes may be marked with the {@link Profile @Profile} annotation to 
  * indicate they should be processed only if a given profile or profiles are
  * <em>active</em>:
  * <pre class="code">
@@ -211,14 +212,14 @@
  *     }
  * }</pre>
  *
- * See @{@link Profile} and {@link org.springframework.core.env.Environment Environment}
+ * See {@link Profile @Profile} and {@link org.springframework.core.env.Environment Environment}
  * Javadoc for further details.
  *
  * <h3>With Spring XML using the {@code @ImportResource} annotation</h3>
  * As mentioned above, {@code @Configuration} classes may be declared as regular Spring
  * {@code <bean>} definitions within Spring XML files. It is also possible to
  * import Spring XML configuration files into {@code @Configuration} classes using
- * the @{@link ImportResource} annotation. Bean definitions imported from XML can be
+ * the {@link ImportResource @ImportResource} annotation. Bean definitions imported from XML can be
  * injected using {@code @Autowired} or {@code @Import}:
  * <pre class="code">
  * &#064;Configuration
@@ -267,7 +268,7 @@
  * <h2>Configuring lazy initialization</h2>
  * <p>By default, {@code @Bean} methods will be <em>eagerly instantiated</em> at container
  * bootstrap time.  To avoid this, {@code @Configuration} may be used in conjunction with
- * the @{@link Lazy} annotation to indicate that all {@code @Bean} methods declared within
+ * the {@link Lazy @Lazy} annotation to indicate that all {@code @Bean} methods declared within
  * the class are by default lazily initialized. Note that {@code @Lazy} may be used on
  * individual {@code @Bean} methods as well.
  *
@@ -309,7 +310,7 @@
  *    <li>&#064;Configuration classes must be non-final
  *    <li>&#064;Configuration classes must be non-local (may not be declared within a method)
  *    <li>&#064;Configuration classes must have a default/no-arg constructor and may not
- *        use @{@link Autowired} constructor parameters. Any nested configuration classes
+ *        use {@link Autowired @Autowired} constructor parameters. Any nested configuration classes
  *        must be {@code static}
  * </ul>
  *
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java b/spring-context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java
index bed3cec76acd..349370dd8e34 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/EnableLoadTimeWeaving.java
@@ -64,13 +64,13 @@
  * TomcatInstrumentableClassLoader}).
  *
  * <p>To customize the weaver used, the {@code @Configuration} class annotated with
- * {@code @EnableLoadTimeWeaving} may also implement the {@link LoadTimeWeaverConfigurer}
+ * {@code @EnableLoadTimeWeaving} may also implement the {@link LoadTimeWeavingConfigurer}
  * interface and return a custom {@code LoadTimeWeaver} instance through the
  * {@code #getLoadTimeWeaver} method:
  * <pre class="code">
  * &#064;Configuration
  * &#064;EnableLoadTimeWeaving
- * public class AppConfig implements LoadTimeWeaverConfigurer {
+ * public class AppConfig implements LoadTimeWeavingConfigurer {
  *     &#064;Override
  *     public LoadTimeWeaver getLoadTimeWeaver() {
  *         MyLoadTimeWeaver ltw = new MyLoadTimeWeaver();
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java b/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java
index 9ed1b8994348..26bd302d8e8f 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java
@@ -28,8 +28,8 @@
  * @author Chris Beams
  * @since 2.5
  * @see ComponentScan
- * @see ComponentScan.IncludeFilter
- * @see ComponentScan.ExcludeFilter
+ * @see ComponentScan#includeFilters()
+ * @see ComponentScan#excludeFilters()
  * @see org.springframework.core.type.filter.TypeFilter
  */
 public enum FilterType {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Import.java b/spring-context/src/main/java/org/springframework/context/annotation/Import.java
index 4a2fe947ca87..5dd54cc5aa44 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Import.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Import.java
@@ -23,23 +23,23 @@
 import java.lang.annotation.Target;
 
 /**
- * Indicates one or more @{@link Configuration} classes to import.
+ * Indicates one or more {@link Configuration @Configuration} classes to import.
  *
  * <p>Provides functionality equivalent to the {@code <import/>} element in Spring XML.
  * Only supported for classes annotated with {@code @Configuration} or declaring at least
- * one {@link @Bean} method, as well as {@link ImportSelector} and
+ * one {@link Bean @Bean} method, as well as {@link ImportSelector} and
  * {@link ImportBeanDefinitionRegistrar} implementations.
  *
- * <p>@{@code Bean} definitions declared in imported {@code @Configuration} classes
- * should be accessed by using @{@link Autowired} injection.  Either the bean itself can
- * be autowired, or the configuration class instance declaring the bean can be autowired.
- * The latter approach allows for explicit, IDE-friendly navigation between
- * {@code @Configuration} class methods.
+ * <p>{@code @Bean} definitions declared in imported {@code @Configuration} classes
+ * should be accessed by using {@link org.springframework.beans.factory.annotation.Autowired @Autowired}
+ * injection. Either the bean itself can be autowired, or the configuration class instance
+ * declaring the bean can be autowired. The latter approach allows for explicit,
+ * IDE-friendly navigation between {@code @Configuration} class methods.
  *
  * <p>May be declared at the class level or as a meta-annotation.
  *
  * <p>If XML or other non-{@code @Configuration} bean definition resources need to be
- * imported, use @{@link ImportResource}
+ * imported, use {@link ImportResource @ImportResource}
  *
  * @author Chris Beams
  * @since 3.0
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfigurer.java b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfigurer.java
index 63322f629665..bf9cbbc04aae 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfigurer.java
@@ -19,12 +19,14 @@
 import org.springframework.instrument.classloading.LoadTimeWeaver;
 
 /**
- * Interface to be implemented by @{@link org.springframework.context.annotation.Configuration
- * Configuration} classes annotated with @{@link EnableLoadTimeWeaving} that wish to
+ * Interface to be implemented by
+ * {@link org.springframework.context.annotation.Configuration @Configuration}
+ * classes annotated with {@link EnableLoadTimeWeaving @EnableLoadTimeWeaving} that wish to
  * customize the {@link LoadTimeWeaver} instance to be used.
  *
- * <p>See @{@link EnableAsync} for usage examples and information on how a default
- * {@code LoadTimeWeaver} is selected when this interface is not used.
+ * <p>See {@link org.springframework.scheduling.annotation.EnableAsync @EnableAsync}
+ * for usage examples and information on how a default {@code LoadTimeWeaver}
+ * is selected when this interface is not used.
  *
  * @author Chris Beams
  * @since 3.1
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
index 84831884b7be..23b157f1d8ab 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
@@ -506,7 +506,7 @@ protected void prepareRefresh() {
 	/**
 	 * <p>Replace any stub property sources with actual instances.
 	 * @see org.springframework.core.env.PropertySource.StubPropertySource
-	 * @see org.springframework.web.context.support.WebApplicationContextUtils#initSerlvetPropertySources
+	 * @see org.springframework.web.context.support.WebApplicationContextUtils#initServletPropertySources
 	 */
 	protected void initPropertySources() {
 		// For subclasses: do nothing by default.
diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
index aa8d9e799249..723d012928f5 100644
--- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
@@ -108,7 +108,7 @@ public void setEnvironment(Environment environment) {
 	 * <p>Processing occurs by replacing ${...} placeholders in bean definitions by resolving each
 	 * against this configurer's set of {@link PropertySources}, which includes:
 	 * <ul>
-	 * <li>all {@linkplain Environment#getPropertySources environment property sources}, if an
+	 * <li>all {@linkplain org.springframework.core.env.ConfigurableEnvironment#getPropertySources environment property sources}, if an
 	 * {@code Environment} {@linkplain #setEnvironment is present}
 	 * <li>{@linkplain #mergeProperties merged local properties}, if {@linkplain #setLocation any}
 	 * {@linkplain #setLocations have} {@linkplain #setProperties been}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
index 3fab08ef8d58..6c447e019f0e 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
@@ -41,7 +41,7 @@
  * @see #setTimeStyle
  * @see #setDateTimeStyle
  * @see #setUseIsoFormat
- * @see #installJodaTimeFormatting
+ * @see FormatterRegistrar#registerFormatters
  */
 public class JodaTimeFormatterRegistrar implements FormatterRegistrar {
 
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
index a1ac90346688..f0636ba3fe95 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
@@ -23,7 +23,8 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * {@link LoadTimeWeaver} implementation for GlassFish's {@link InstrumentableClassLoader}.
+ * {@link LoadTimeWeaver} implementation for GlassFish's
+ * {@link org.glassfish.api.deployment.InstrumentableClassLoader InstrumentableClassLoader}.
  * 
  * <p>As of Spring 3.0, GlassFish V3 is supported as well.
  *
@@ -49,7 +50,8 @@ public GlassFishLoadTimeWeaver() {
 	 * Creates a new instance of the <code>GlassFishLoadTimeWeaver</code> class.
 	 * @param classLoader the specific {@link ClassLoader} to use; must not be <code>null</code>
 	 * @throws IllegalArgumentException if the supplied <code>classLoader</code> is <code>null</code>;
-	 * or if the supplied <code>classLoader</code> is not an {@link InstrumentableClassLoader}
+	 * or if the supplied <code>classLoader</code> is not an
+	 * {@link org.glassfish.api.deployment.InstrumentableClassLoader InstrumentableClassLoader}
 	 */
 	public GlassFishLoadTimeWeaver(ClassLoader classLoader) {
 		Assert.notNull(classLoader, "ClassLoader must not be null");
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
index 716ec0c6882a..0396c0dfb811 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
@@ -526,7 +526,7 @@ private Object invokeOperation(Method method, Object[] args) throws JMException,
 	 * Convert the given result object (from attribute access or operation invocation)
 	 * to the specified target class for returning from the proxy method.
 	 * @param result the result object as returned by the <code>MBeanServer</code>
-	 * @param targetClass the result type of the proxy method that's been invoked
+	 * @param parameter the method parameter of the proxy method that's been invoked
 	 * @return the converted result object, or the passed-in object if no conversion
 	 * is necessary
 	 */
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
index f81f0c2815fd..9a7cb3855e6c 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
@@ -88,7 +88,7 @@ protected void checkManagedBean(Object managedBean) throws IllegalArgumentExcept
 	 * and the plain bean class else.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @return the bean class to expose
-	 * @see org.springframework.aop.framework.AopProxyUtils#getTargetClass
+	 * @see org.springframework.aop.support.AopUtils#getTargetClass(Object)
 	 */
 	protected Class getTargetClass(Object managedBean) {
 		return AopUtils.getTargetClass(managedBean);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
index b1578438aa5c..245ff645b9ca 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
@@ -45,7 +45,7 @@
  *
  * @author Juergen Hoeller
  * @since 3.0
- * @see PersistenceExceptionTranslationAdvisor
+ * @see org.springframework.dao.annotation.PersistenceExceptionTranslationAdvisor
  * @see org.springframework.stereotype.Repository
  * @see org.springframework.dao.DataAccessException
  * @see org.springframework.dao.support.PersistenceExceptionTranslator
@@ -126,8 +126,8 @@ protected Advice buildAdvice(Executor executor) {
 	}
 
 	/**
-	 * Calculate a pointcut for the given target class, if any.
-	 * @param targetClass the class to introspect
+	 * Calculate a pointcut for the given async annotation types, if any.
+	 * @param asyncAnnotationTypes the async annotation types to introspect
 	 * @return the applicable Pointcut object, or <code>null</code> if none
 	 */
 	protected Pointcut buildPointcut(Set<Class<? extends Annotation>> asyncAnnotationTypes) {
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
index b3e087c83b60..64302f8571f9 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
@@ -76,7 +76,7 @@ public MethodValidationInterceptor(ValidatorFactory validatorFactory) {
 
 	/**
 	 * Create a new MethodValidationInterceptor using the given JSR-303 Validator.
-	 * @param validatorFactory the JSR-303 Validator to use
+	 * @param validator the JSR-303 Validator to use
 	 */
 	public MethodValidationInterceptor(Validator validator) {
 		this.validator = validator.unwrap(MethodValidator.class);
diff --git a/spring-core/src/main/java/org/springframework/core/convert/ConverterNotFoundException.java b/spring-core/src/main/java/org/springframework/core/convert/ConverterNotFoundException.java
index fcfc6f574abd..9e66c5b1097f 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/ConverterNotFoundException.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/ConverterNotFoundException.java
@@ -34,7 +34,6 @@ public final class ConverterNotFoundException extends ConversionException {
 	 * Creates a new conversion executor not found exception.
 	 * @param sourceType the source type requested to convert from
 	 * @param targetType the target type requested to convert to
-	 * @param message a descriptive message
 	 */
 	public ConverterNotFoundException(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		super("No converter found capable of converting from type " + sourceType + " to type " + targetType);
diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
index ff277afa30dd..62976c115861 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -200,7 +200,7 @@ public static TypeDescriptor nested(Property property, int nestingLevel) {
 	 * Create a new type descriptor for an object.
 	 * Use this factory method to introspect a source object before asking the conversion system to convert it to some another type.
 	 * If the provided object is null, returns null, else calls {@link #valueOf(Class)} to build a TypeDescriptor from the object's class.
-	 * @param object the source object
+	 * @param source the source object
 	 * @return the type descriptor
 	 */
 	public static TypeDescriptor forObject(Object source) {
diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
index fcc067619dcc..bd9efd160d0a 100644
--- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -40,9 +40,9 @@
  *
  * <p>Concrete subclasses differ primarily on which {@link PropertySource} objects they
  * add by default. {@code AbstractEnvironment} adds none. Subclasses should contribute
- * property sources through the protected {@link #customizePropertySources()} hook, while
- * clients should customize using {@link ConfigurableEnvironment#getPropertySources()} and
- * working against the {@link MutablePropertySources} API. See
+ * property sources through the protected {@link #customizePropertySources(MutablePropertySources)}
+ * hook, while clients should customize using {@link ConfigurableEnvironment#getPropertySources()}
+ * and working against the {@link MutablePropertySources} API. See
  * {@link ConfigurableEnvironment} Javadoc for usage examples.
  *
  * @author Chris Beams
diff --git a/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java
index 60b8da43ff0a..340b48e279c9 100644
--- a/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java
@@ -56,7 +56,7 @@ public interface PropertyResolver {
 	 * Return the property value associated with the given key, or {@code null}
 	 * if the key cannot be resolved.
 	 * @param key the property name to resolve
-	 * @param T the expected type of the property value
+	 * @param targetType the expected type of the property value
 	 * @see #getRequiredProperty(String, Class)
 	 */
 	<T> T getProperty(String key, Class<T> targetType);
@@ -65,11 +65,11 @@ public interface PropertyResolver {
 	 * Return the property value associated with the given key, or
 	 * {@code defaultValue} if the key cannot be resolved.
 	 * @param key the property name to resolve
-	 * @param T the expected type of the property value
+	 * @param targetType the expected type of the property value
 	 * @param defaultValue the default value to return if no value is found
 	 * @see #getRequiredProperty(String, Class)
 	 */
-	<T> T getProperty(String string, Class<T> targetType, T defaultValue);
+	<T> T getProperty(String key, Class<T> targetType, T defaultValue);
 
 	/**
 	 * Convert the property value associated with the given key to a {@code Class}
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
index fd6fa48c8982..3ae7ca3b1284 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
@@ -24,7 +24,7 @@
 import org.springframework.util.Assert;
 
 /**
- * A {@Link Converter} that delegates to a {@link org.springframework.core.serializer.Serializer}
+ * A {@link Converter} that delegates to a {@link org.springframework.core.serializer.Serializer}
  * to convert an object to a byte array.
  *
  * @author Gary Russell
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
index 91d5122d848c..c9c998f2aede 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
@@ -49,7 +49,7 @@ public class ExecutorServiceAdapter extends AbstractExecutorService {
 
 	/**
 	 * Create a new ExecutorServiceAdapter, using the given target executor.
-	 * @param concurrentExecutor the target executor to delegate to
+	 * @param taskExecutor the target executor to delegate to
 	 */
 	public ExecutorServiceAdapter(TaskExecutor taskExecutor) {
 		Assert.notNull(taskExecutor, "TaskExecutor must not be null");
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelNode.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelNode.java
index 392807ae16e2..31eeed24c7df 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelNode.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelNode.java
@@ -77,7 +77,7 @@ public interface SpelNode {
 
 	/**
 	 * Determine the class of the object passed in, unless it is already a class object.
-	 * @param o the object that the caller wants the class of
+	 * @param obj the object that the caller wants the class of
 	 * @return the class of the object if it is not already a class object, or null if the object is null
 	 */
 	Class<?> getObjectClass(Object obj);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
index fc984fe1040a..6a310c7820a9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
@@ -1012,8 +1012,8 @@ <T>List<T> queryForList(String sql, Object[] args, int[] argTypes, Class<T> elem
 	 * Each batch should be of size indicated in 'batchSize'.
 	 * @param sql the SQL statement to execute.
 	 * @param batchArgs the List of Object arrays containing the batch of arguments for the query
-	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * @param batchSize batch size
+	 * @param pss ParameterizedPreparedStatementSetter to use
 	 * @return an array containing for each batch another array containing the numbers of rows affected 
 	 * by each update in the batch
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
index 63d8b5e3f8aa..59e9508db544 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
@@ -34,7 +34,7 @@
  * @author Nicolas Fabre
  * @author Thomas Risberg
  * @since 3.1
- * @see JdbcTemplate#batchUpdate(String sql, Collection<T> objs, int batchSize, ParameterizedPreparedStatementSetter<T> pss)
+ * @see JdbcTemplate#batchUpdate(String, java.util.Collection, int, ParameterizedPreparedStatementSetter)
  */
 public interface ParameterizedPreparedStatementSetter<T> {
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
index f82e0be500f2..210439042cb5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
@@ -29,7 +29,7 @@ public interface EmbeddedDatabaseConfigurer {
 	
 	/**
 	 * Configure the properties required to create and connect to the embedded database instance.
-	 * @param dataSource the data source to configure
+	 * @param properties connection properties to configure
 	 * @param databaseName the name of the test database
 	 */
 	void configureConnectionProperties(ConnectionProperties properties, String databaseName);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
index 72e6aa7240c0..4bbbc70a7027 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
@@ -346,7 +346,6 @@ protected Object convertFromMessage(Message message, JavaType targetJavaType)
 	 * <p>The default implementation parses the configured type id property name
 	 * and consults the configured type id mapping. This can be overridden with
 	 * a different strategy, e.g. doing some heuristics based on message origin.
-	 * @param object the payload object to set a type id for
 	 * @param message the JMS Message to set the type id on
 	 * @throws JMSException if thrown by JMS methods
 	 * @see #setTypeIdOnMessage(Object, javax.jms.Message)
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
index 8c633d61bb3e..67a7b0c0eb92 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
@@ -19,7 +19,7 @@
 /**
  * Constants that indicate a target message type to convert to: a
  * {@link javax.jms.TextMessage}, a {@link javax.jms.BytesMessage},
- * a {@link javax.jms.MapMessage} or an {@link ObjectMessage}.
+ * a {@link javax.jms.MapMessage} or an {@link javax.jms.ObjectMessage}.
  *
  * @author Juergen Hoeller
  * @since 3.0
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
index 7c2ecf1e8b75..075a5f6cee49 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
@@ -226,7 +226,7 @@ public Properties getHibernateProperties() {
 
 	/**
 	 * Specify annotated entity classes to register with this Hibernate SessionFactory.
-	 * @see org.hibernate.cfg.Configuration#addAnnotatedClass(String)
+	 * @see org.hibernate.cfg.Configuration#addAnnotatedClass(Class)
 	 */
 	public void setAnnotatedClasses(Class<?>[] annotatedClasses) {
 		this.annotatedClasses = annotatedClasses;
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
index cb3174086619..d250d0ac90bc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
@@ -170,7 +170,6 @@ public void setSqlMapClientProperties(Properties sqlMapClientProperties) {
 	 * @see #setTransactionConfigProperties
 	 * @see com.ibatis.sqlmap.client.SqlMapClient#getDataSource
 	 * @see SqlMapClientTemplate#setDataSource
-	 * @see SqlMapClientTemplate#queryForPaginatedList
 	 */
 	public void setDataSource(DataSource dataSource) {
 		this.dataSource = dataSource;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
index 16b73839d9ac..055cc634372f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
@@ -228,7 +228,6 @@ public interface JdoOperations {
 	 * to rely on auto-flushing at transaction completion.
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
 	 * @see javax.jdo.PersistenceManager#flush()
-	 * @see JdoDialect#flush(javax.jdo.PersistenceManager)
 	 */
 	void flush() throws DataAccessException;
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
index 7962f6a715f5..31ba98e8e265 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
@@ -70,7 +70,7 @@ public class EclipseLinkJpaDialect extends DefaultJpaDialect {
 	 * <p>It is only recommended to switch this flag to "true" when no JDBC access
 	 * code is involved in any of the transactions, and when it is acceptable to
 	 * perform read operations outside of the transactional JDBC Connection.
-	 * @see oracle.toplink.sessions.UnitOfWork#beginEarlyTransaction()
+	 * @see org.eclipse.persistence.sessions.UnitOfWork#beginEarlyTransaction()
 	 */
 	public void setLazyDatabaseTransaction(boolean lazyDatabaseTransaction) {
 		this.lazyDatabaseTransaction = lazyDatabaseTransaction;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
index 3cf55ffed0e6..89362056682c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
@@ -68,7 +68,7 @@ public class TopLinkJpaDialect extends DefaultJpaDialect {
 	 * <p>It is only recommended to switch this flag to "true" when no JDBC access
 	 * code is involved in any of the transactions, and when it is acceptable to
 	 * perform read operations outside of the transactional JDBC Connection.
-	 * @see oracle.toplink.sessions.UnitOfWork#beginEarlyTransaction()
+	 * @see oracle.toplink.essentials.sessions.UnitOfWork#beginEarlyTransaction()
 	 */
 	public void setLazyDatabaseTransaction(boolean lazyDatabaseTransaction) {
 		this.lazyDatabaseTransaction = lazyDatabaseTransaction;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
index 315682cc812a..540b9795d14d 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
@@ -22,7 +22,7 @@
  * Subinterface of {@link Marshaller} that has support for Java 5 generics.
  *
  * @author Arjen Poutsma
- * @sicne 3.0.1
+ * @since 3.0.1
  */
 public interface GenericMarshaller extends Marshaller {
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
index b0a595dbe537..5b90d1f5a5ca 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
@@ -22,7 +22,7 @@
  * Subinterface of {@link Unmarshaller} that has support for Java 5 generics.
  *
  * @author Arjen Poutsma
- * @sicne 3.0.1
+ * @since 3.0.1
  */
 public interface GenericUnmarshaller extends Unmarshaller {
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
index 6c2faa38e069..3fd4b5d9024c 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
@@ -362,7 +362,7 @@ public void setObject(Object root) {
 
 	/**
 	 * Sets whether this unmarshaller should re-use objects. This will be only used when unmarshalling to existing
-	 * object. </p> The default is {@link false}, which means that the objects won't be re-used.
+	 * object. </p> The default is {@code false}, which means that the objects won't be re-used.
 	 *
 	 * @see org.exolab.castor.xml.Unmarshaller#setReuseObjects(boolean)
 	 */
@@ -371,7 +371,7 @@ public void setReuseObjects(boolean reuseObjects) {
 	}
 
 	/**
-	 * Sets whether this unmarshaller should clear collections upon the first use. </p> The default is {@link false},
+	 * Sets whether this unmarshaller should clear collections upon the first use. </p> The default is {@code false},
 	 * which means that marshaller won't clear collections.
 	 *
 	 * @see org.exolab.castor.xml.Unmarshaller#setClearCollections(boolean)
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
index 1630b30c77ab..c12b895766ef 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
@@ -52,7 +52,6 @@
  * @see ContextLoaderPlugIn#SERVLET_CONTEXT_PREFIX
  * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
  * @see org.springframework.web.context.ContextLoaderListener
- * @see org.springframework.web.context.ContextLoaderServlet
  * @see DispatchActionSupport
  * @see LookupDispatchActionSupport
  * @see MappingDispatchActionSupport
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
index 24317165dbcb..ba316fd3bc21 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
@@ -97,7 +97,6 @@
  * @see DelegatingRequestProcessor
  * @see DelegatingTilesRequestProcessor
  * @see org.springframework.web.context.ContextLoaderListener
- * @see org.springframework.web.context.ContextLoaderServlet
  * @see org.springframework.web.servlet.FrameworkServlet
  * @deprecated as of Spring 3.0
  */
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
index bb74fafa1c9d..ff18cff838a1 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
@@ -52,7 +52,6 @@
  * @see ContextLoaderPlugIn#SERVLET_CONTEXT_PREFIX
  * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
  * @see org.springframework.web.context.ContextLoaderListener
- * @see org.springframework.web.context.ContextLoaderServlet
  * @see ActionSupport
  * @see LookupDispatchActionSupport
  * @see MappingDispatchActionSupport
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
index 9c606b91b34b..1533d81a1020 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
@@ -51,7 +51,6 @@
  * @see ContextLoaderPlugIn#SERVLET_CONTEXT_PREFIX
  * @see WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
  * @see org.springframework.web.context.ContextLoaderListener
- * @see org.springframework.web.context.ContextLoaderServlet
  * @see ActionSupport
  * @see DispatchActionSupport
  * @see MappingDispatchActionSupport
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
index ec08c10771c2..b67b34f481d3 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
@@ -51,7 +51,6 @@
  * @see ContextLoaderPlugIn#SERVLET_CONTEXT_PREFIX
  * @see WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
  * @see org.springframework.web.context.ContextLoaderListener
- * @see org.springframework.web.context.ContextLoaderServlet
  * @see ActionSupport
  * @see DispatchActionSupport
  * @see LookupDispatchActionSupport
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
index bdcd5135c1a0..fb66b53a9828 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
@@ -143,7 +143,7 @@ public Class<?> getDeclaringClass() {
 	 * @return the resource locations; potentially <code>null</code> or <em>empty</em>
 	 * @see ContextConfiguration#value
 	 * @see ContextConfiguration#locations
-	 * @see #setLocations()
+	 * @see #setLocations(String[])
 	 */
 	public String[] getLocations() {
 		return locations;
@@ -166,7 +166,7 @@ public void setLocations(String[] locations) {
 	 * declared via {@link ContextConfiguration @ContextConfiguration}.
 	 * @return the configuration classes; potentially <code>null</code> or <em>empty</em>
 	 * @see ContextConfiguration#classes
-	 * @see #setClasses()
+	 * @see #setClasses(Class[])
 	 */
 	public Class<?>[] getClasses() {
 		return classes;
diff --git a/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
index fbf6cd31da27..91767ded4933 100644
--- a/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
@@ -110,7 +110,8 @@ public interface SmartContextLoader extends ContextLoader {
 	 * @return a new application context
 	 * @throws Exception if context loading failed
 	 * @see #processContextConfiguration(ContextConfigurationAttributes)
-	 * @see org.springframework.context.annotation.AnnotationConfigUtils#registerAnnotationConfigProcessors()
+	 * @see org.springframework.context.annotation.AnnotationConfigUtils
+	 * #registerAnnotationConfigProcessors(org.springframework.beans.factory.support.BeanDefinitionRegistry)
 	 * @see org.springframework.test.context.MergedContextConfiguration#getActiveProfiles()
 	 * @see org.springframework.context.ConfigurableApplicationContext#getEnvironment()
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
index 76ba939bce46..d6a93128d985 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
@@ -28,7 +28,7 @@
  * <code>RunAfterTestMethodCallbacks</code> is a custom JUnit 4.5+
  * {@link Statement} which allows the <em>Spring TestContext Framework</em> to
  * be plugged into the JUnit execution chain by calling
- * {@link TestContextManager#afterTestMethod(Object, Method) afterTestMethod()}
+ * {@link TestContextManager#afterTestMethod(Object, Method, Throwable) afterTestMethod()}
  * on the supplied {@link TestContextManager}.
  * 
  * @see #evaluate()
@@ -70,7 +70,7 @@ public RunAfterTestMethodCallbacks(Statement next, Object testInstance, Method t
 	 * Invokes the next {@link Statement} in the execution chain (typically an
 	 * instance of {@link org.junit.internal.runners.statements.RunAfters
 	 * RunAfters}), catching any exceptions thrown, and then calls
-	 * {@link TestContextManager#afterTestMethod(Object, Method)} with the first
+	 * {@link TestContextManager#afterTestMethod(Object, Method, Throwable)} with the first
 	 * caught exception (if any). If the call to <code>afterTestMethod()</code>
 	 * throws an exception, it will also be tracked. Multiple exceptions will be
 	 * combined into a {@link MultipleFailureException}.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
index 44e18cf1ecb0..43d9bcd4a54c 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
@@ -39,7 +39,8 @@
  * <p>As of Spring 3.1, <code>AbstractContextLoader</code> also provides a basis
  * for all concrete implementations of the {@link SmartContextLoader} SPI. For
  * backwards compatibility with the {@code ContextLoader} SPI, 
- * {@link #processContextConfiguration()} delegates to {@link #processLocations()}. 
+ * {@link #processContextConfiguration(ContextConfigurationAttributes)} delegates
+ * to {@link #processLocations(Class, String...)}. 
  *
  * @author Sam Brannen
  * @author Juergen Hoeller
@@ -59,7 +60,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 
 	/**
 	 * For backwards compatibility with the {@link ContextLoader} SPI, the
-	 * default implementation simply delegates to {@link #processLocations()},
+	 * default implementation simply delegates to {@link #processLocations(Class, String...)},
 	 * passing it the {@link ContextConfigurationAttributes#getDeclaringClass()
 	 * declaring class} and {@link ContextConfigurationAttributes#getLocations()
 	 * resource locations} retrieved from the supplied
@@ -70,7 +71,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 * <p>Can be overridden in subclasses &mdash; for example, to process
 	 * configuration classes instead of resource locations.
 	 * @since 3.1
-	 * @see #processLocations()
+	 * @see #processLocations(Class, String...)
 	 */
 	public void processContextConfiguration(ContextConfigurationAttributes configAttributes) {
 		String[] processedLocations = processLocations(configAttributes.getDeclaringClass(),
@@ -96,10 +97,10 @@ public void processContextConfiguration(ContextConfigurationAttributes configAtt
 	 * @return a processed array of application context resource locations
 	 * @since 2.5
 	 * @see #isGenerateDefaultLocations()
-	 * @see #generateDefaultLocations()
-	 * @see #modifyLocations()
-	 * @see org.springframework.test.context.ContextLoader#processLocations()
-	 * @see #processContextConfiguration()
+	 * @see #generateDefaultLocations(Class)
+	 * @see #modifyLocations(Class, String...)
+	 * @see org.springframework.test.context.ContextLoader#processLocations(Class, String...)
+	 * @see #processContextConfiguration(ContextConfigurationAttributes)
 	 */
 	public final String[] processLocations(Class<?> clazz, String... locations) {
 		return (ObjectUtils.isEmpty(locations) && isGenerateDefaultLocations()) ? generateDefaultLocations(clazz)
@@ -189,14 +190,15 @@ else if (!ResourcePatternUtils.isUrl(path)) {
 	/**
 	 * Determine whether or not <em>default</em> resource locations should be
 	 * generated if the <code>locations</code> provided to
-	 * {@link #processLocations()} are <code>null</code> or empty.
+	 * {@link #processLocations(Class, String...)} are <code>null</code> or empty.
 	 * <p>As of Spring 3.1, the semantics of this method have been overloaded
 	 * to include detection of either default resource locations or default
 	 * configuration classes. Consequently, this method can also be used to 
 	 * determine whether or not <em>default</em> configuration classes should be
 	 * detected if the <code>classes</code> present in the
 	 * {@link ContextConfigurationAttributes configuration attributes} supplied
-	 * to {@link #processContextConfiguration()} are <code>null</code> or empty.
+	 * to {@link #processContextConfiguration(ContextConfigurationAttributes)}
+	 * are <code>null</code> or empty.
 	 * <p>Can be overridden by subclasses to change the default behavior.
 	 * @return always <code>true</code> by default
 	 * @since 2.5
@@ -211,7 +213,7 @@ protected boolean isGenerateDefaultLocations() {
 	 * <p>Must be implemented by subclasses.
 	 * @return the resource suffix; should not be <code>null</code> or empty
 	 * @since 2.5
-	 * @see #generateDefaultLocations()
+	 * @see #generateDefaultLocations(Class)
 	 */
 	protected abstract String getResourceSuffix();
 
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
index 243e10da4d8e..ba55f221c032 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
@@ -68,17 +68,17 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * <li>Sets the <em>active bean definition profiles</em> from the supplied
 	 * <code>MergedContextConfiguration</code> in the
 	 * {@link org.springframework.core.env.Environment Environment} of the context.</li>
-	 * <li>Calls {@link #prepareContext()} to allow for customizing the context
+	 * <li>Calls {@link #prepareContext(GenericApplicationContext)} to allow for customizing the context
 	 * before bean definitions are loaded.</li>
-	 * <li>Calls {@link #customizeBeanFactory()} to allow for customizing the
+	 * <li>Calls {@link #customizeBeanFactory(DefaultListableBeanFactory)} to allow for customizing the
 	 * context's <code>DefaultListableBeanFactory</code>.</li>
-	 * <li>Delegates to {@link #loadBeanDefinitions()} to populate the context
-	 * from the configuration locations or classes in the supplied
+	 * <li>Delegates to {@link #loadBeanDefinitions(GenericApplicationContext, MergedContextConfiguration)}
+	 * to populate the context from the configuration locations or classes in the supplied
 	 * <code>MergedContextConfiguration</code>.</li>
 	 * <li>Delegates to {@link AnnotationConfigUtils} for
 	 * {@link AnnotationConfigUtils#registerAnnotationConfigProcessors registering}
 	 * annotation configuration processors.</li>
-	 * <li>Calls {@link #customizeContext()} to allow for customizing the context
+	 * <li>Calls {@link #customizeContext(GenericApplicationContext)} to allow for customizing the context
 	 * before it is refreshed.</li>
 	 * <li>{@link ConfigurableApplicationContext#refresh Refreshes} the
 	 * context and registers a JVM shutdown hook for it.</li>
@@ -110,17 +110,17 @@ public final ConfigurableApplicationContext loadContext(MergedContextConfigurati
 	 * <p>Implementation details:
 	 * <ul>
 	 * <li>Creates a {@link GenericApplicationContext} instance.</li>
-	 * <li>Calls {@link #prepareContext()} to allow for customizing the context
+	 * <li>Calls {@link #prepareContext(GenericApplicationContext)} to allow for customizing the context
 	 * before bean definitions are loaded.</li>
-	 * <li>Calls {@link #customizeBeanFactory()} to allow for customizing the
+	 * <li>Calls {@link #customizeBeanFactory(DefaultListableBeanFactory)} to allow for customizing the
 	 * context's <code>DefaultListableBeanFactory</code>.</li>
-	 * <li>Delegates to {@link #createBeanDefinitionReader()} to create a 
+	 * <li>Delegates to {@link #createBeanDefinitionReader(GenericApplicationContext)} to create a 
 	 * {@link BeanDefinitionReader} which is then used to populate the context
 	 * from the specified config locations.</li>
 	 * <li>Delegates to {@link AnnotationConfigUtils} for
 	 * {@link AnnotationConfigUtils#registerAnnotationConfigProcessors registering}
 	 * annotation configuration processors.</li>
-	 * <li>Calls {@link #customizeContext()} to allow for customizing the context
+	 * <li>Calls {@link #customizeContext(GenericApplicationContext)} to allow for customizing the context
 	 * before it is refreshed.</li>
 	 * <li>{@link ConfigurableApplicationContext#refresh Refreshes} the
 	 * context and registers a JVM shutdown hook for it.</li>
@@ -188,11 +188,11 @@ protected void customizeBeanFactory(DefaultListableBeanFactory beanFactory) {
 	 * from the configuration locations or classes in the supplied
 	 * <code>MergedContextConfiguration</code>.</li>
 	 * <p>The default implementation delegates to the {@link BeanDefinitionReader}
-	 * returned by {@link #createBeanDefinitionReader()} to 
+	 * returned by {@link #createBeanDefinitionReader(GenericApplicationContext)} to 
 	 * {@link BeanDefinitionReader#loadBeanDefinitions(String) load} the
 	 * bean definitions.
 	 * <p>Subclasses must provide an appropriate implementation of
-	 * {@link #createBeanDefinitionReader()}. Alternatively subclasses may
+	 * {@link #createBeanDefinitionReader(GenericApplicationContext)}. Alternatively subclasses may
 	 * provide a <em>no-op</em> implementation of {@code createBeanDefinitionReader()}
 	 * and override this method to provide a custom strategy for loading or
 	 * registering bean definitions.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
index 9839adc03c94..540aa24939fa 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
@@ -50,9 +50,9 @@
  * 
  * @author Sam Brannen
  * @since 3.1
- * @see #processContextConfiguration()
- * @see #detectDefaultConfigurationClasses()
- * @see #loadBeanDefinitions()
+ * @see #processContextConfiguration(ContextConfigurationAttributes)
+ * @see #detectDefaultConfigurationClasses(Class)
+ * @see #loadBeanDefinitions(GenericApplicationContext, MergedContextConfiguration)
  */
 public class AnnotationConfigContextLoader extends AbstractGenericContextLoader {
 
@@ -72,9 +72,9 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	 * supplied configuration attributes. Otherwise, properties in the supplied
 	 * configuration attributes will not be modified.
 	 * @param configAttributes the context configuration attributes to process
-	 * @see org.springframework.test.context.SmartContextLoader#processContextConfiguration()
+	 * @see org.springframework.test.context.SmartContextLoader#processContextConfiguration(ContextConfigurationAttributes)
 	 * @see #isGenerateDefaultLocations()
-	 * @see #detectDefaultConfigurationClasses()
+	 * @see #detectDefaultConfigurationClasses(Class)
 	 */
 	public void processContextConfiguration(ContextConfigurationAttributes configAttributes) {
 		if (ObjectUtils.isEmpty(configAttributes.getClasses()) && isGenerateDefaultLocations()) {
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java b/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
index f25330148d2a..7c2757b600ce 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
@@ -53,7 +53,7 @@ public static WorkManager getWorkManager() {
 	/**
 	 * Obtain the default JBoss JCA WorkManager through a JMX lookup
 	 * for the JBossWorkManagerMBean.
-	 * @param workManagerObjectName the JMX object name to use
+	 * @param mbeanName the JMX object name to use
 	 * @see org.jboss.resource.work.JBossWorkManagerMBean
 	 */
 	public static WorkManager getWorkManager(String mbeanName) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
index da6ea6494295..a73887578cd2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
@@ -157,7 +157,7 @@
 
 	/**
 	 * Indicate how transactional advice should be applied. The default is
-	 * {@link AdviceMode.PROXY}.
+	 * {@link AdviceMode#PROXY}.
 	 * @see AdviceMode
 	 */
 	AdviceMode mode() default AdviceMode.PROXY;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
index fe7ab37bbea6..d8bf85361f27 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
@@ -156,7 +156,6 @@ public void setTransactionAttributes(Properties transactionAttributes) {
 	 * @see TransactionAttributeSourceEditor
 	 * @see MethodMapTransactionAttributeSource
 	 * @see NameMatchTransactionAttributeSource
-	 * @see AttributesTransactionAttributeSource
 	 * @see org.springframework.transaction.annotation.AnnotationTransactionAttributeSource
 	 */
 	public void setTransactionAttributeSource(TransactionAttributeSource transactionAttributeSource) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
index 8e15758e2244..d3e111f5bdbb 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
@@ -37,7 +37,7 @@ public abstract class DelegatingTransactionDefinition implements TransactionDefi
 
 	/**
 	 * Create a DelegatingTransactionAttribute for the given target attribute.
-	 * @param targetAttribute the target TransactionAttribute to delegate to
+	 * @param targetDefinition the target TransactionAttribute to delegate to
 	 */
 	public DelegatingTransactionDefinition(TransactionDefinition targetDefinition) {
 		Assert.notNull(targetDefinition, "Target definition must not be null");
diff --git a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
index f6b9f1a83669..0f76ff70dd1f 100644
--- a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequestInterceptor.java
@@ -22,7 +22,7 @@
 
 /**
  * Intercepts client-side HTTP requests. Implementations of this interface can be {@linkplain
- * org.springframework.web.client.RestTemplate#setInterceptors(ClientHttpRequestInterceptor[]) registered} with the
+ * org.springframework.web.client.RestTemplate#setInterceptors(java.util.List) registered} with the
  * {@link org.springframework.web.client.RestTemplate RestTemplate}, as to modify the outgoing {@link ClientHttpRequest}
  * and/or the incoming {@link ClientHttpResponse}.
  *
diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
index 5e6580b392a1..29f8dc4fe9ab 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
@@ -18,7 +18,8 @@
 
 /**
  * Thrown by {@link org.springframework.http.converter.HttpMessageConverter} implementations when the
- * {@link org.springframework.http.converter.HttpMessageConverter#write(Object, org.springframework.http.HttpOutputMessage) write} method fails.
+ * {@link org.springframework.http.converter.HttpMessageConverter#write(Object, org.springframework.http.MediaType,
+ * org.springframework.http.HttpOutputMessage) write} method fails.
  *
  * @author Arjen Poutsma
  * @since 3.0
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
index aab76733f166..1bc57b7f90e5 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
@@ -35,7 +35,8 @@
  * @see RequestParam
  * @see RequestHeader
  * @see org.springframework.web.bind.annotation.RequestMapping
- * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMethodAdapter
+ * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
+ * @see org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
  * @see org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter
  */
 @Target(ElementType.PARAMETER)
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/PathVariable.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/PathVariable.java
index 40b157534e8b..f446104f27bd 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/PathVariable.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/PathVariable.java
@@ -29,7 +29,8 @@
  *
  * @author Arjen Poutsma
  * @see RequestMapping
- * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMethodAdapter
+ * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
+ * @see org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
  * @since 3.0
  */
 @Target(ElementType.PARAMETER)
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
index 6ea18e308441..eb3c36532e1a 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
@@ -35,7 +35,8 @@
  * @author Arjen Poutsma
  * @see RequestHeader
  * @see ResponseBody
- * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMethodAdapter
+ * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
+ * @see org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
  * @since 3.0
  */
 @Target(ElementType.PARAMETER)
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
index ef962da7aa03..2841462e4cd2 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
@@ -31,7 +31,7 @@
  * @see RequestMapping
  * @see RequestParam
  * @see CookieValue
- * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMethodAdapter
+ * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
  * @see org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter
  */
 @Target(ElementType.PARAMETER)
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
index 7a4ff06b2e57..e9b5c033d2bd 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
@@ -55,7 +55,7 @@
  * As a consequence, such an argument will never be <code>null</code>.
  * <i>Note that session access may not be thread-safe, in particular in a
  * Servlet environment: Consider switching the
- * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMethodAdapter#setSynchronizeOnSession "synchronizeOnSession"}
+ * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter#setSynchronizeOnSession "synchronizeOnSession"}
  * flag to "true" if multiple requests are allowed to access a session concurrently.</i>
  * <li>{@link org.springframework.web.context.request.WebRequest} or
  * {@link org.springframework.web.context.request.NativeWebRequest}.
@@ -212,8 +212,7 @@
  * @see SessionAttributes
  * @see InitBinder
  * @see org.springframework.web.context.request.WebRequest
- * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMethodMapping
- * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMethodAdapter
+ * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
  * @see org.springframework.web.portlet.mvc.annotation.DefaultAnnotationHandlerMapping
  * @see org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter
  */
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
index 591f4ad5f8b3..d671b91193b4 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
@@ -33,7 +33,8 @@
  * @see RequestMapping
  * @see RequestHeader
  * @see CookieValue
- * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMethodAdapter
+ * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
+ * @see org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
  * @see org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter
  */
 @Target(ElementType.PARAMETER)
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java b/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
index 2d5cd6b5acbb..559bbdeb2591 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
@@ -62,7 +62,7 @@ public class ConfigurableWebBindingInitializer implements WebBindingInitializer
 	 * when accessing an out-of-bounds index.
 	 * <p>Default is "true" on a standard DataBinder. Note that this feature is only supported
 	 * for bean property access (DataBinder's default mode), not for field access.
-	 * @see #initBeanPropertyAccess()
+	 * @see org.springframework.validation.DataBinder#initBeanPropertyAccess()
 	 * @see org.springframework.validation.DataBinder#setAutoGrowNestedPaths
 	 */
 	public void setAutoGrowNestedPaths(boolean autoGrowNestedPaths) {
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
index 1f32562deb9d..be18ff044f3a 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
@@ -201,7 +201,7 @@ public class ContextLoader {
 	 * ContextLoaderListener} subclass as a {@code <listener>} within {@code web.xml}, as
 	 * a no-arg constructor is required.
 	 * <p>The created application context will be registered into the ServletContext under
-	 * the attribute name {@link WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE}
+	 * the attribute name {@link WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE}
 	 * and subclasses are free to call the {@link #closeWebApplicationContext} method on
 	 * container shutdown to close the application context.
 	 * @see #ContextLoader(WebApplicationContext)
@@ -237,7 +237,7 @@ public ContextLoader() {
 	 * <p>See {@link org.springframework.web.WebApplicationInitializer} for usage examples.
 	 * <p>In any case, the given application context will be registered into the
 	 * ServletContext under the attribute name {@link
-	 * WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE} and subclasses are
+	 * WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE} and subclasses are
 	 * free to call the {@link #closeWebApplicationContext} method on container shutdown
 	 * to close the application context.
 	 * @param context the application context to manage
@@ -324,7 +324,6 @@ else if (ccl != null) {
 	 * <p>In addition, {@link #customizeContext} gets called prior to refreshing the
 	 * context, allowing subclasses to perform custom modifications to the context.
 	 * @param sc current servlet context
-	 * @param parent the parent ApplicationContext to use, or <code>null</code> if none
 	 * @return the root WebApplicationContext
 	 * @see ConfigurableWebApplicationContext
 	 */
@@ -342,7 +341,7 @@ protected WebApplicationContext createWebApplicationContext(ServletContext sc) {
 	/**
 	 * @deprecated as of Spring 3.1 in favor of
 	 * {@link #createWebApplicationContext(ServletContext)} and
-	 * {@link #configureAndRefreshWebApplicationContext(WebApplicationContext, ServletContext)}
+	 * {@link #configureAndRefreshWebApplicationContext(ConfigurableWebApplicationContext, ServletContext)}
 	 */
 	@Deprecated
 	protected WebApplicationContext createWebApplicationContext(ServletContext sc, ApplicationContext parent) {
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
index 28de0fa40ec4..5bbf6d2039b9 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
@@ -52,7 +52,7 @@ public class ContextLoaderListener extends ContextLoader implements ServletConte
 	 * as a {@code <listener>} within {@code web.xml}, where a no-arg constructor is
 	 * required.
 	 * <p>The created application context will be registered into the ServletContext under
-	 * the attribute name {@link WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE}
+	 * the attribute name {@link WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE}
 	 * and the Spring application context will be closed when the {@link #contextDestroyed}
 	 * lifecycle method is invoked on this listener.
 	 * @see ContextLoader
@@ -66,21 +66,22 @@ public ContextLoaderListener() {
 	/**
 	 * Create a new {@code ContextLoaderListener} with the given application context. This
 	 * constructor is useful in Servlet 3.0+ environments where instance-based
-	 * registration of listeners is possible through the {@link ServletContext#addListener}
+	 * registration of listeners is possible through the {@link javax.servlet.ServletContext#addListener}
 	 * API.
 	 * <p>The context may or may not yet be {@linkplain
-	 * ConfigurableApplicationContext#refresh() refreshed}. If it (a) is an implementation
-	 * of {@link ConfigurableWebApplicationContext} and (b) has <strong>not</strong>
-	 * already been refreshed (the recommended approach), then the following will occur:
+	 * org.springframework.context.ConfigurableApplicationContext#refresh() refreshed}. If it
+	 * (a) is an implementation of {@link ConfigurableWebApplicationContext} and
+	 * (b) has <strong>not</strong> already been refreshed (the recommended approach),
+	 * then the following will occur:
 	 * <ul>
 	 * <li>If the given context has not already been assigned an {@linkplain
-	 * ConfigurableApplicationContext#setId id}, one will be assigned to it</li>
+	 * org.springframework.context.ConfigurableApplicationContext#setId id}, one will be assigned to it</li>
 	 * <li>{@code ServletContext} and {@code ServletConfig} objects will be delegated to
 	 * the application context</li>
 	 * <li>{@link #customizeContext} will be called</li>
-	 * <li>Any {@link ApplicationContextInitializer}s specified through the
-	 * "contextInitializerClasses" init-param will be applied.</li>
-	 * <li>{@link ConfigurableApplicationContext#refresh refresh()} will be called</li>
+	 * <li>Any {@link org.springframework.context.ApplicationContextInitializer ApplicationContextInitializer}s
+	 * specified through the "contextInitializerClasses" init-param will be applied.</li>
+	 * <li>{@link org.springframework.context.ConfigurableApplicationContext#refresh refresh()} will be called</li>
 	 * </ul>
 	 * If the context has already been refreshed or does not implement
 	 * {@code ConfigurableWebApplicationContext}, none of the above will occur under the
@@ -89,7 +90,7 @@ public ContextLoaderListener() {
 	 * <p>See {@link org.springframework.web.WebApplicationInitializer} for usage examples.
 	 * <p>In any case, the given application context will be registered into the
 	 * ServletContext under the attribute name {@link
-	 * WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE} and the Spring
+	 * WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE} and the Spring
 	 * application context will be closed when the {@link #contextDestroyed} lifecycle
 	 * method is invoked on this listener.
 	 * @param context the application context to manage
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
index 24b35ea76318..ecc269ae265f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
@@ -136,7 +136,7 @@ public void setConfigLocations(String[] locations) {
 	 * <p>Calls to {@link #register} are idempotent; adding the same
 	 * annotated class more than once has no additional effect.
 	 * @param annotatedClasses one or more annotated classes,
-	 * e.g. {@link Configuration @Configuration} classes
+	 * e.g. {@link org.springframework.context.annotation.Configuration @Configuration} classes
 	 * @see #scan(String...)
 	 * @see #loadBeanDefinitions(DefaultListableBeanFactory)
 	 * @see #setConfigLocation(String)
@@ -178,8 +178,8 @@ public void scan(String... basePackages) {
 	 * annotation.
 	 * @see #register(Class...)
 	 * @see #scan(String...)
-	 * @see #setConfigLocation()
-	 * @see #setConfigLocations()
+	 * @see #setConfigLocation(String)
+	 * @see #setConfigLocations(String[])
 	 * @see AnnotatedBeanDefinitionReader
 	 * @see ClassPathBeanDefinitionScanner
 	 */
@@ -264,7 +264,7 @@ protected BeanNameGenerator getBeanNameGenerator() {
 
 	/**
 	 * Set the {@link ScopeMetadataResolver} to use for detected bean classes.
-	 * <p>The default is an {@link AnnotationScopeMetadataResolver}.
+	 * <p>The default is an {@link org.springframework.context.annotation.AnnotationScopeMetadataResolver}.
 	 */
 	public void setScopeMetadataResolver(ScopeMetadataResolver scopeMetadataResolver) {
 		this.scopeMetadataResolver = scopeMetadataResolver;
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
index c57c33703e8f..98029b9a6ba5 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
@@ -963,7 +963,6 @@ protected ActionRequest checkMultipart(ActionRequest request) throws MultipartEx
 	 * Return the HandlerExecutionChain for this request.
 	 * Try all handler mappings in order.
 	 * @param request current portlet request
-	 * @param cache whether to cache the HandlerExecutionChain in a request attribute
 	 * @return the HandlerExceutionChain, or null if no handler could be found
 	 */
 	protected HandlerExecutionChain getHandler(PortletRequest request) throws Exception {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
index 459a03c7644d..56b04da88fff 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
@@ -91,7 +91,7 @@ public AbstractRefreshablePortletApplicationContext() {
 	 * {@inheritDoc}
 	 * <p>The parent {@linkplain #getEnvironment() environment} is
 	 * delegated to this (child) context if the parent is a
-	 * {@link ConfigurableApplicationContext} implementation.
+	 * {@link org.springframework.context.ConfigurableApplicationContext} implementation.
 	 * <p>The parent {@linkplain #getServletContext() servlet context} is
 	 * delegated to this (child) context if the parent is a {@link WebApplicationContext}
 	 * implementation.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
index bdd5f6846c6b..4f3e0178b957 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
@@ -54,7 +54,7 @@ public class PortletContextScope implements Scope, DisposableBean {
 
 	/**
 	 * Create a new Scope wrapper for the given PortletContext.
-	 * @param PortletContext the PortletContext to wrap
+	 * @param portletContext the PortletContext to wrap
 	 */
 	public PortletContextScope(PortletContext portletContext) {
 		Assert.notNull(portletContext, "PortletContext must not be null");
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
index 7ffc76336579..7452f6b34cde 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
@@ -88,7 +88,7 @@ protected void initPropertySources() {
 	 * {@inheritDoc}
 	 * <p>The parent {@linkplain #getEnvironment() environment} is
 	 * delegated to this (child) context if the parent is a
-	 * {@link ConfigurableApplicationContext} implementation.
+	 * {@link org.springframework.context.ConfigurableApplicationContext} implementation.
 	 * <p>The parent {@linkplain #getServletContext() servlet context} is
 	 * delegated to this (child) context if the parent is a {@link WebApplicationContext}
 	 * implementation.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
index f347a027fba4..b9c9718a6e23 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
@@ -55,7 +55,6 @@ public PortletRequestMethodNotSupportedException(String method, String[] support
 
 	/**
 	 * Create a new PortletRequestMethodNotSupportedException.
-	 * @param method the unsupported HTTP request method
 	 * @param supportedMethods the actually supported HTTP methods
 	 */
 	public PortletRequestMethodNotSupportedException(String[] supportedMethods) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index f44b130484fc..143e5d8d3c1c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -20,6 +20,7 @@
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Collections;
+
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -327,7 +328,7 @@ public String getNamespace() {
 	 * Specify the set of fully-qualified {@link ApplicationContextInitializer} class
 	 * names, per the optional "contextInitializerClasses" servlet init-param.
 	 * @see #configureAndRefreshWebApplicationContext(ConfigurableWebApplicationContext)
-	 * @see #applyInitializers(ConfigurableWebApplicationContext)
+	 * @see #applyInitializers(ConfigurableApplicationContext)
 	 */
 	public void setContextInitializerClasses(String contextInitializerClasses) {
 		this.contextInitializerClasses = contextInitializerClasses;
@@ -337,7 +338,7 @@ public void setContextInitializerClasses(String contextInitializerClasses) {
 	 * Specify which {@link ApplicationContextInitializer} instances should be used
 	 * to initialize the application context used by this {@code FrameworkServlet}.
 	 * @see #configureAndRefreshWebApplicationContext(ConfigurableWebApplicationContext)
-	 * @see #applyInitializers(ConfigurableWebApplicationContext)
+	 * @see #applyInitializers(ConfigurableApplicationContext)
 	 */
 	public void setContextInitializers(ApplicationContextInitializer<ConfigurableApplicationContext>... contextInitializers) {
 		for (ApplicationContextInitializer<ConfigurableApplicationContext> initializer : contextInitializers) {
@@ -688,12 +689,12 @@ protected void applyInitializers(ConfigurableApplicationContext wac) {
 	 * <p>The default implementation is empty. <code>refresh()</code> will
 	 * be called automatically after this method returns.
 	 * <p>Note that this method is designed to allow subclasses to modify the application
-	 * context, while {@link #initializeWebApplicationContext} is designed to allow
+	 * context, while {@link #initWebApplicationContext} is designed to allow
 	 * end-users to modify the context through the use of
 	 * {@link ApplicationContextInitializer}s.
 	 * @param wac the configured WebApplicationContext (not refreshed yet)
 	 * @see #createWebApplicationContext
-	 * @see #initializeWebApplicationContext
+	 * @see #initWebApplicationContext
 	 * @see ConfigurableWebApplicationContext#refresh()
 	 */
 	protected void postProcessWebApplicationContext(ConfigurableWebApplicationContext wac) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
index d20beb1dc272..7d039a15b0fc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/DispatcherServletWebRequest.java
@@ -47,7 +47,7 @@ public DispatcherServletWebRequest(HttpServletRequest request) {
 	/**
 	 * Create a new DispatcherServletWebRequest instance for the given request and response.
 	 * @param request current HTTP request
-	 * @param request current HTTP response
+	 * @param response current HTTP response
 	 */
 	public DispatcherServletWebRequest(HttpServletRequest request, HttpServletResponse response) {
 		super(request, response);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index bcd6d2f28e03..413615e654cc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -443,7 +443,7 @@ protected ModelAndView invokeHandlerMethod(HttpServletRequest request, HttpServl
 	/**
 	 * This method always returns -1 since an annotated controller can have many methods,
 	 * each requiring separate lastModified calculations. Instead, an
-	 * @{@link RequestMapping}-annotated method can calculate the lastModified value, call
+	 * {@link RequestMapping}-annotated method can calculate the lastModified value, call
 	 * {@link org.springframework.web.context.request.WebRequest#checkNotModified(long)}
 	 * to check it, and return {@code null} if that returns {@code true}.
 	 * @see org.springframework.web.context.request.WebRequest#checkNotModified(long)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
index d97f60ed6ccb..1ba1e5de0768 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
@@ -43,7 +43,7 @@ public interface RequestCondition<T> {
 	 * {@link RequestMapping} conditions. 
 	 * 
 	 * @param other the condition to combine with.
-	 * @returns a request condition instance that is the result of combining 
+	 * @return a request condition instance that is the result of combining 
 	 * 	the two condition instances.
 	 */
 	T combine(T other);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
index a98b2db2b55d..1b05cd8f29af 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
@@ -57,7 +57,7 @@ protected Set<String> getMappingPathPatterns(RequestMappingInfo info) {
 	 * Check if the given RequestMappingInfo matches the current request and 
 	 * return a (potentially new) instance with conditions that match the 
 	 * current request -- for example with a subset of URL patterns.
-	 * @returns an info in case of a match; or {@code null} otherwise. 
+	 * @return an info in case of a match; or {@code null} otherwise. 
 	 */
 	@Override
 	protected RequestMappingInfo getMatchingMapping(RequestMappingInfo info, HttpServletRequest request) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
index 8301ce7c4df5..194c318f8f34 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -129,7 +129,7 @@ protected RequestCondition<?> getCustomMethodCondition(Method method) {
 	 * The custom {@link RequestCondition} can be of any type so long as the 
 	 * same condition type is returned from all calls to this method in order
 	 * to ensure custom request conditions can be combined and compared. 
-	 * @param method the handler method for which to create the condition
+	 * @param handlerType the handler type for which to create the condition
 	 * @return the condition, or {@code null}
 	 */
 	protected RequestCondition<?> getCustomTypeCondition(Class<?> handlerType) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
index e2865dc166a9..ce4113c70b5d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
@@ -62,7 +62,7 @@ public ServletModelAttributeMethodProcessor(boolean annotationNotRequired) {
 	 * request parameter if the name matches to the model attribute name and
 	 * if there is an appropriate type conversion strategy. If none of these
 	 * are true delegate back to the base class.
-	 * @see #createAttributeFromUriValue
+	 * @see #createAttributeFromRequestValue(String, String, MethodParameter, WebDataBinderFactory, NativeWebRequest)
 	 */
 	@Override
 	protected final Object createAttribute(String attributeName, 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
index 1fd85e717d03..e31262c43770 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
@@ -30,7 +30,8 @@
 /**
  * An {@link HttpRequestHandler} for serving static files using the Servlet container's "default" Servlet.
  *
- * <p>This handler is intended to be used with a "/*" mapping when the {@link DispatcherServlet}
+ * <p>This handler is intended to be used with a "/*" mapping when the
+ * {@link org.springframework.web.servlet.DispatcherServlet DispatcherServlet}
  * is mapped to "/", thus  overriding the Servlet container's default handling of static resources.
  * The mapping to this handler should generally be ordered as the last in the chain so that it will
  * only execute when no other more specific mappings (i.e., to controllers) can be matched.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
index 97aa563b90a7..c746c35009ab 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
@@ -148,7 +148,7 @@ public RequestContext(HttpServletRequest request, ServletContext servletContext)
 	 * @param model the model attributes for the current view (can be <code>null</code>, using the request attributes
 	 * for Errors retrieval)
 	 * @see org.springframework.web.servlet.DispatcherServlet
-	 * @see #RequestContext(javax.servlet.http.HttpServletRequest, javax.servlet.ServletContext, Map)
+	 * @see #RequestContext(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext, Map)
 	 */
 	public RequestContext(HttpServletRequest request, Map<String, Object> model) {
 		initContext(request, null, null, model);
@@ -404,7 +404,7 @@ public String getContextUrl(String relativeUrl) {
 	 * <code>{bar=baz,spam=nuts}</code> and the result will be <code>[contextpath]/foo/baz?spam=nuts</code>.
 	 * 
 	 * @param relativeUrl the relative URL part
-	 * @param a map of parameters to insert as placeholders in the url
+	 * @param params a map of parameters to insert as placeholders in the url
 	 * @return a URL that points back to the server with an absolute path (also URL-encoded accordingly)
 	 */
 	public String getContextUrl(String relativeUrl, Map<String, ?> params) {