diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
index 954377c0e2e..2b09c8a30d0 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
@@ -121,8 +121,8 @@ public final class AspectJExpressionPointcutTests {
 
 	/**
 	 * This and target are equivalent. Really instanceof pointcuts.
-	 * @throws Exception
 	 * @param which this or target
+	 * @throws Exception
 	 * @throws NoSuchMethodException
 	 * @throws SecurityException
 	 */
@@ -367,4 +367,4 @@ class CallCountingInterceptor implements MethodInterceptor {
 		this.count = 0;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
index 165252eecff..ccc3aa2c692 100644
--- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
+++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
@@ -106,7 +106,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 		 * Validate the call and provide the expected return value
 		 * @param lastSig
 		 * @param args
-		 * @return
+		 * @return the return value
 		 */
 		public Object respond(String lastSig, Object[] args) {
 			Call call = nextCall();
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index be2cfdf2979..f01cc9b303f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -630,8 +630,8 @@ public class BeanFactoryGenericsTests {
 	 * public static <T> T createMock(Class<T> toMock)
 	 * }</pre>
 	 *
+	 * See SPR-9493
 	 * @since 3.2
-	 * @see SPR-9493
 	 */
 	@Test
 	public void parameterizedFactoryMethod() {
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
index da11f8e521d..d9efd0760d1 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
@@ -81,16 +81,16 @@ public abstract class AbstractStatelessSessionBean extends AbstractSessionBean {
 
 
 	/**
-	 * @see javax.ejb.SessionBean#ejbActivate(). This method always throws an exception, as
-	 * it should not be invoked by the EJB container.
+	 * This method always throws an exception, as it should not be invoked by the EJB container.
+	 * @see javax.ejb.SessionBean#ejbActivate()
 	 */
 	public void ejbActivate() throws EJBException {
 		throw new IllegalStateException("ejbActivate must not be invoked on a stateless session bean");
 	}
 
 	/**
-	 * @see javax.ejb.SessionBean#ejbPassivate(). This method always throws an exception, as
-	 * it should not be invoked by the EJB container.
+	 * This method always throws an exception, as it should not be invoked by the EJB container.
+	 * @see javax.ejb.SessionBean#ejbPassivate()
 	 */
 	public void ejbPassivate() throws EJBException {
 		throw new IllegalStateException("ejbPassivate must not be invoked on a stateless session bean");
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
index 478a68aafdd..185075670f9 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
@@ -41,7 +41,7 @@ import test.mixin.Lockable;
 /**
  * Tests for auto proxy creation by advisor recognition.
  *
- * @see org.springframework.aop.framework.autoproxy.AdvisorAutoProxyCreatorIntegrationTests;
+ * @see org.springframework.aop.framework.autoproxy.AdvisorAutoProxyCreatorIntegrationTests
  *
  * @author Rod Johnson
  * @author Dave Syer
diff --git a/spring-core/src/main/java/org/springframework/core/env/Environment.java b/spring-core/src/main/java/org/springframework/core/env/Environment.java
index a0347acd5a7..aee71bf709f 100644
--- a/spring-core/src/main/java/org/springframework/core/env/Environment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/Environment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,8 +102,8 @@ public interface Environment extends PropertyResolver {
 	 * explicit active profiles, whether one or more of the given profiles is included in
 	 * the set of default profiles. If a profile begins with '!' the logic is inverted,
 	 * i.e. the method will return true if the given profile is <em>not</em> active. For
-	 * example, {@code env.acceptsProfiles("p1", "!p2")} will return true if profile 'p1'
-	 * is active or 'p2' is not active.
+	 * example, <pre>env.acceptsProfiles("p1", "!p2")</pre> will return true if profile
+	 * 'p1' is active or 'p2' is not active.
 	 * @throws IllegalArgumentException if called with zero arguments
 	 * @throws IllegalArgumentException if any profile is null, empty or whitespace-only
 	 * @see #getActiveProfiles
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
index b33aa545ffe..863f91ba0e2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
@@ -36,7 +36,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
  * float, Float, double, Double, BigDecimal, <code>java.util.Date</code>, etc.
  *
  * <p>The mapper can be configured to use the primitives default value when mapping null values
- * by setting the {@link #setPrimitivesDefaultedForNullValue 'primitivesDefaultedForNullValue'}
+ * by setting the '{@link #setPrimitivesDefaultedForNullValue primitivesDefaultedForNullValue}'
  * flag to 'true'.
  *
  * <p>To facilitate mapping between columns and fields that don't have matching names,
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
index e5dd4b0712d..4645558cd4e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
@@ -251,7 +251,7 @@ public class DatabasePopulatorTests {
 	}
 
 	/**
-	 * @see SPR-9457
+	 * See SPR-9457
 	 */
 	@Test
 	public void usesBoundConnectionIfAvailable() throws SQLException {
@@ -269,7 +269,7 @@ public class DatabasePopulatorTests {
 	}
 
 	/**
-	 * @see SPR-9781
+	 * See SPR-9781
 	 */
 	@Test(timeout = 1000)
 	public void executesHugeScriptInReasonableTime() throws SQLException {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
index d266fe365da..46c680b5ade 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
@@ -1,9 +1,7 @@
-
 /**
- * MVC infrastructure for annotation-based handler method processing,
- * building on the <code>org.springframework.web.method.annotation</code> package.
- * Entry points are {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping}
+ * MVC infrastructure for annotation-based handler method processing, building on the
+ * {@code org.springframework.web.method.annotation} package. Entry points are
+ * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping}
  * and {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter}.
  */
 package org.springframework.web.servlet.mvc.method.annotation;
-