diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
index 3eb526fd6f2..735def66547 100644
--- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
@@ -1,5 +1,6 @@
+
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -21,11 +22,11 @@ import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 
 /**
- * {@link AutowireCandidateResolver} implementation to use when Java version
- * is less than 1.5 and therefore no annotation support is available. This
- * implementation checks the bean definition only.
+ * {@link AutowireCandidateResolver} implementation to use when no annotation
+ * support is available. This implementation checks the bean definition only.
  *
  * @author Mark Fisher
+ * @author Juergen Hoeller
  * @since 2.5
  * @see BeanDefinition#isAutowireCandidate()
  */
diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java b/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
index 83cf10d169f..a9d3fc26705 100644
--- a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
+++ b/org.springframework.orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -60,10 +60,9 @@ public interface EntityManagerFactoryInfo {
 
 	/**
 	 * Return the name of the persistence unit used to create this 
-	 * EntityManagerFactory, or <code>null</code> if
-	 * it is an unnamed default. If <code>getPersistenceUnitInfo()</code>
-	 * returns non-null, the return type of <code>getPersistenceUnitName()</code>
-	 * must be equal to the value returned by
+	 * EntityManagerFactory, or <code>null</code> if it is an unnamed default.
+	 * <p>If <code>getPersistenceUnitInfo()</code> returns non-null, the result of
+	 * <code>getPersistenceUnitName()</code> must be equal to the value returned by
 	 * <code>PersistenceUnitInfo.getPersistenceUnitName()</code>.
 	 * @see #getPersistenceUnitInfo()
 	 * @see javax.persistence.spi.PersistenceUnitInfo#getPersistenceUnitName()