diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
index 4629eb40b2..57d4877bf5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
@@ -40,8 +40,8 @@ import org.springframework.beans.BeansException;
  * {@code BeanFactory} from which it gets the real object, to which it
  * delegates, then proper Dependency Injection has been achieved.
  *
- * <p>As another example, in a complex Java EE app with multiple layers, with each
- * layer having its own {@code ApplicationContext} definition (in a
+ * <p>As another example, in a complex Java EE app with multiple layers, with
+ * each layer having its own {@code ApplicationContext} definition (in a
  * hierarchy), a class like {@code SingletonBeanFactoryLocator} may be used
  * to demand load these contexts.
  *
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
index b731b78146..2bb1b146ae 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
@@ -53,9 +53,9 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI
 	 * Set a home interface that this invoker will narrow to before performing
 	 * the parameterless SLSB {@code create()} call that returns the actual
 	 * SLSB proxy.
-	 * <p>Default is none, which will work on all Java EE servers that are not based
-	 * on CORBA. A plain {@code javax.ejb.EJBHome} interface is known to be
-	 * sufficient to make a WebSphere 5.0 Remote SLSB work. On other servers,
+	 * <p>Default is none, which will work on all Java EE servers that are not
+	 * based on CORBA. A plain {@code javax.ejb.EJBHome} interface is known to
+	 * be sufficient to make a WebSphere 5.0 Remote SLSB work. On other servers,
 	 * the specific home interface for the target SLSB might be necessary.
 	 */
 	public void setHomeInterface(Class<?> homeInterface) {
diff --git a/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
index c3405d38a3..56fc6e802b 100644
--- a/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
@@ -35,7 +35,8 @@ import org.springframework.util.ClassUtils;
  * configure JNDI appropriately, so that {@code new InitialContext()}
  * will expose the required objects. Also usable for standalone applications,
  * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
- * able to use traditional Java EE data access code outside of a Java EE container.
+ * able to use traditional Java EE data access code outside of a Java EE
+ * container.
  *
  * <p>There are various choices for DataSource implementations:
  * <ul>
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 7574e41d1a..9c96648cd3 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -37,7 +37,8 @@ import org.springframework.util.ReflectionUtils;
  * configure JNDI appropriately, so that {@code new InitialContext()}
  * will expose the required objects. Also usable for standalone applications,
  * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
- * able to use traditional Java EE data access code outside of a Java EE container.
+ * able to use traditional Java EE data access code outside of a Java EE
+ * container.
  *
  * <p>There are various choices for DataSource implementations:
  * <ul>