diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
index b572074ae44..607b3047d4c 100644
--- a/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
+++ b/org.springframework.transaction/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -39,10 +39,6 @@ import org.springframework.util.ClassUtils;
  * This class may also serve as base class for a custom TransactionAttributeSource,
  * or get customized through {@link TransactionAnnotationParser} strategies.
  *
- * <p>This is a direct alternative to
- * {@link org.springframework.transaction.interceptor.AttributesTransactionAttributeSource},
- * which is able to read in source-level attributes via Commons Attributes.
- *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
  * @since 1.2
@@ -151,15 +147,4 @@ public class AnnotationTransactionAttributeSource extends AbstractFallbackTransa
 		return this.publicMethodsOnly;
 	}
 
-
-	@Override
-	public boolean equals(Object other) {
-		return (this == other || other instanceof AnnotationTransactionAttributeSource);
-	}
-
-	@Override
-	public int hashCode() {
-		return AnnotationTransactionAttributeSource.class.hashCode();
-	}
-
 }
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewResolver.java
index d9b4ff0be73..650c6a6e5f2 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewResolver.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/ViewResolver.java
@@ -1,12 +1,12 @@
 /*
- * Copyright 2002-2005 the original author or authors.
- * 
+ * Copyright 2002-2009 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.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,11 +34,11 @@ import java.util.Locale;
  * @see org.springframework.web.servlet.view.XmlViewResolver
  */
 public interface ViewResolver {
-		
+
 	/** 
 	 * Resolve the given view by name.
 	 * <p>Note: To allow for ViewResolver chaining, a ViewResolver should
-	 * return <code>null</code>  if a view with the given name is not defined in it.
+	 * return <code>null</code> if a view with the given name is not defined in it.
 	 * However, this is not required: Some ViewResolvers will always attempt
 	 * to build View objects with the given name, unable to return <code>null</code> 
 	 * (rather throwing an exception when View creation failed).
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
index 4d48f93ba6b..fcf77b49980 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
@@ -48,6 +48,7 @@ import org.springframework.web.context.ServletContextAware;
  * <a href="http://tiles.apache.org">http://tiles.apache.org</a>
  * for more information about Tiles, which basically is a templating
  * mechanism for JSP-based web applications.
+ * <b>Note: Spring 3.0 requires Tiles 2.1.2 or above.</b>
  *
  * <p>The TilesConfigurer simply configures a TilesContainer using a set of files
  * containing definitions, to be accessed by {@link TilesView} instances. This is a
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java
index 56d295862dc..c1442c127b3 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java
@@ -42,6 +42,7 @@ import org.springframework.web.util.WebUtils;
  *
  * <p>This class builds on Tiles2, which requires JSP 2.0.
  * JSTL support is integrated out of the box due to JSTL's inclusion in JSP 2.0.
+ * <b>Note: Spring 3.0 requires Tiles 2.1.2 or above.</b>
  *
  * <p>Depends on a TilesContainer which must be available in
  * the ServletContext. This container is typically set up via a