diff --git a/jdk/src/share/classes/javax/naming/event/package.html b/jdk/src/share/classes/javax/naming/event/package.html
index f23dbe887cd..3affa9cbdf9 100644
--- a/jdk/src/share/classes/javax/naming/event/package.html
+++ b/jdk/src/share/classes/javax/naming/event/package.html
@@ -112,7 +112,6 @@ fired to notify the listener. The listener's
 <tt>namingExceptionThrown()</tt> method is invoked, as shown in the 
 sample code above,
 and the listener is automatically deregistered.
-<p>
 
 <h2>Package Specification</h2>
 
diff --git a/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java b/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java
index 4ab5a347f66..8d754d02b85 100644
--- a/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java
+++ b/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java
@@ -114,7 +114,7 @@ public abstract class ControlFactory {
       * <p>
       * Note that a control factory
       * must be public and must have a public constructor that accepts no arguments.
-      * <p>
+      *
       * @param ctl The non-null control object containing the OID and BER data.
       * @param ctx The possibly null context in which the control is being created.
       * If null, no such information is available.
diff --git a/jdk/src/share/classes/javax/naming/ldap/LdapContext.java b/jdk/src/share/classes/javax/naming/ldap/LdapContext.java
index ef92b1c49ba..05db4a8648b 100644
--- a/jdk/src/share/classes/javax/naming/ldap/LdapContext.java
+++ b/jdk/src/share/classes/javax/naming/ldap/LdapContext.java
@@ -319,7 +319,7 @@ public interface LdapContext extends DirContext {
      * clear the response controls. You can call it many times (and get
      * back the same controls) until the next context method that may return
      * controls is invoked.
-     *<p>
+     *
      * @return A possibly null array of controls. If null, the previous
      * method invoked on this context did not produce any controls.
      * @exception NamingException If an error occurred while getting the response
diff --git a/jdk/src/share/classes/javax/naming/ldap/Rdn.java b/jdk/src/share/classes/javax/naming/ldap/Rdn.java
index a78fda3af4e..d688e11baf8 100644
--- a/jdk/src/share/classes/javax/naming/ldap/Rdn.java
+++ b/jdk/src/share/classes/javax/naming/ldap/Rdn.java
@@ -352,7 +352,7 @@ public class Rdn implements Serializable, Comparable<Object> {
      * </ul>
      * <p>
      * If obj is null or not an instance of Rdn, false is returned.
-     * <p>
+     *
      * @param obj object to be compared for equality with this Rdn.
      * @return true if the specified object is equal to this Rdn.
      * @see #hashCode()
diff --git a/jdk/src/share/classes/javax/naming/ldap/package.html b/jdk/src/share/classes/javax/naming/ldap/package.html
index 79e550628e1..bce9469b6db 100644
--- a/jdk/src/share/classes/javax/naming/ldap/package.html
+++ b/jdk/src/share/classes/javax/naming/ldap/package.html
@@ -255,8 +255,6 @@ public class VendorXControlFactory extends ControlFactory {
 }
 </pre></blockquote>
 
-<p>
-
 <h2>Package Specification</h2>
 
 The JNDI API Specification and related documents can be found in the
diff --git a/jdk/src/share/classes/javax/naming/package.html b/jdk/src/share/classes/javax/naming/package.html
index 8011d089f10..6946ec40166 100644
--- a/jdk/src/share/classes/javax/naming/package.html
+++ b/jdk/src/share/classes/javax/naming/package.html
@@ -81,7 +81,6 @@ them, comparing components, and so on.
 The overloads that accept string names are likely to be more useful
 for simple applications, such as those that simply read in a name
 and look up the corresponding object.
-<p>
 
 <h4>Bindings</h4>
 
diff --git a/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java b/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java
index 523175c862a..a0b979e385b 100644
--- a/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java
+++ b/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java
@@ -120,7 +120,6 @@ public class DirectoryManager extends NamingManager {
       *</ul>
       * Service providers that implement the <tt>DirContext</tt> interface
       * should use this method, not <tt>NamingManager.getObjectInstance()</tt>.
-      *<p>
       *
       * @param refInfo The possibly null object for which to create an object.
       * @param name The name of this object relative to <code>nameCtx</code>.
diff --git a/jdk/src/share/classes/javax/naming/spi/NamingManager.java b/jdk/src/share/classes/javax/naming/spi/NamingManager.java
index 19b8bb50443..c6a99ec4c3e 100644
--- a/jdk/src/share/classes/javax/naming/spi/NamingManager.java
+++ b/jdk/src/share/classes/javax/naming/spi/NamingManager.java
@@ -92,7 +92,7 @@ public class NamingManager {
      * The builder can only be installed if the executing thread is allowed
      * (by the security manager's checkSetFactory() method) to do so.
      * Once installed, the builder cannot be replaced.
-     *<p>
+     *
      * @param builder The factory builder to install. If null, no builder
      *                  is installed.
      * @exception SecurityException builder cannot be installed
diff --git a/jdk/src/share/classes/javax/naming/spi/ObjectFactory.java b/jdk/src/share/classes/javax/naming/spi/ObjectFactory.java
index 9f598c9bfe8..a02528cec9f 100644
--- a/jdk/src/share/classes/javax/naming/spi/ObjectFactory.java
+++ b/jdk/src/share/classes/javax/naming/spi/ObjectFactory.java
@@ -149,7 +149,6 @@ public interface ObjectFactory {
  * If a factory uses <code>nameCtx</code> it should synchronize its use
  * against concurrent access, since context implementations are not
  * guaranteed to be thread-safe.
- * <p>
  *
  * @param obj The possibly null object containing location or reference
  *              information that can be used in creating an object.