--- a/jdk/src/share/classes/javax/management/AttributeList.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/AttributeList.java	Tue Nov 12 14:03:28 2013 -0500
@@ -178,8 +178,8 @@
     /**
      * Inserts the attribute specified as an element at the position specified.
      * Elements with an index greater than or equal to the current position are
-     * shifted up. If the index is out of range (index < 0 || index >
-     * size()) a RuntimeOperationsException should be raised, wrapping the
+     * shifted up. If the index is out of range {@literal (index < 0 || index >
+     * size())} a RuntimeOperationsException should be raised, wrapping the
      * java.lang.IndexOutOfBoundsException thrown.
      *
      * @param object  The <CODE>Attribute</CODE> object to be inserted.
@@ -199,7 +199,7 @@
     /**
      * Sets the element at the position specified to be the attribute specified.
      * The previous element at that position is discarded. If the index is
-     * out of range (index < 0 || index > size() a RuntimeOperationsException
+     * out of range {@literal (index < 0 || index > size())} a RuntimeOperationsException
      * should be raised, wrapping the java.lang.IndexOutOfBoundsException thrown.
      *
      * @param object  The value to which the attribute element should be set.
@@ -234,7 +234,7 @@
      * Inserts all of the elements in the <CODE>AttributeList</CODE> specified
      * into this list, starting at the specified position, in the order in which
      * they are returned by the Iterator of the {@code AttributeList} specified.
-     * If the index is out of range (index < 0 || index > size() a
+     * If the index is out of range {@literal (index < 0 || index > size())} a
      * RuntimeOperationsException should be raised, wrapping the
      * java.lang.IndexOutOfBoundsException thrown.
      *

--- a/jdk/src/share/classes/javax/management/BooleanValueExp.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/BooleanValueExp.java	Tue Nov 12 14:03:28 2013 -0500
@@ -44,12 +44,12 @@
     private boolean val = false;
 
 
-    /** Creates a new BooleanValueExp representing the boolean literal <val>.*/
+    /** Creates a new BooleanValueExp representing the boolean literal {@code val}.*/
     BooleanValueExp(boolean val) {
         this.val = val;
     }
 
-    /**Creates a new BooleanValueExp representing the Boolean object <val>.*/
+    /**Creates a new BooleanValueExp representing the Boolean object {@code val}.*/
     BooleanValueExp(Boolean val) {
         this.val = val.booleanValue();
     }

--- a/jdk/src/share/classes/javax/management/Descriptor.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/Descriptor.java	Tue Nov 12 14:03:28 2013 -0500
@@ -96,7 +96,7 @@
  * of the mapped Java type, called <em>opendata</em>(J) in the <a
  * href="MXBean.html#mapping-rules">MXBean type mapping rules</a>.</p>
  *
- * <table border="1" cellpadding="5">
+ * <table border="1" cellpadding="5" summary="Descriptor Fields">
  *
  * <tr><th>Name</th><th>Type</th><th>Used in</th><th>Meaning</th></tr>
  *
@@ -330,7 +330,7 @@
  * interest outside Model MBeans, for example.  But only Model MBeans have
  * a predefined behavior for these fields.</p>
  *
- * <table border="1" cellpadding="5">
+ * <table border="1" cellpadding="5" summary="ModelMBean Fields">
  *
  * <tr><th>Name</th><th>Type</th><th>Used in</th><th>Meaning</th></tr>
  *

--- a/jdk/src/share/classes/javax/management/DescriptorKey.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/DescriptorKey.java	Tue Nov 12 14:03:28 2013 -0500
@@ -94,7 +94,7 @@
  * <p>then the resulting {@code Descriptor} will contain the following
  * fields:</p>
  *
- * <table border="2">
+ * <table border="2" summary="Descriptor Fields">
  * <tr><th>Name</th><th>Value</th></tr>
  * <tr><td>units</td><td>"bytes"</td></tr>
  * <tr><td>descriptionResourceKey</td><td>"bytes.key"</td></tr>
@@ -143,7 +143,7 @@
  * or an array of annotations.  The value of the field is derived from
  * the value of the annotation element as follows:</p>
  *
- * <table border="2">
+ * <table border="2" summary="Descriptor Field Types">
  * <tr><th>Annotation element</th><th>Descriptor field</th></tr>
  * <tr><td>Primitive value ({@code 5}, {@code false}, etc)</td>
  *     <td>Wrapped value ({@code Integer.valueOf(5)},

--- a/jdk/src/share/classes/javax/management/ImmutableDescriptor.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/ImmutableDescriptor.java	Tue Nov 12 14:03:28 2013 -0500
@@ -344,7 +344,7 @@
      * the given object is also a Descriptor, and if the two Descriptors have
      * the same field names (possibly differing in case) and the same
      * associated values.  The respective values for a field in the two
-     * Descriptors are equal if the following conditions hold:</p>
+     * Descriptors are equal if the following conditions hold:
      *
      * <ul>
      * <li>If one value is null then the other must be too.</li>

--- a/jdk/src/share/classes/javax/management/JMX.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/JMX.java	Tue Nov 12 14:03:28 2013 -0500
@@ -217,8 +217,7 @@
     }
 
     /**
-     * <p>Make a proxy for an MXBean in a local or remote
-     * MBean Server.</p>
+     * Make a proxy for an MXBean in a local or remote MBean Server.
      *
      * <p>If you have an MBean Server {@code mbs} containing an
      * MXBean with {@link ObjectName} {@code name}, and if the
@@ -253,7 +252,7 @@
      * <li><p>{@code proxy.setSimpleAttribute("whatever")} will result
      * in a call to {@code mbs.}{@link
      * MBeanServerConnection#setAttribute setAttribute}<code>(name,
-     * new Attribute("SimpleAttribute", "whatever"))</code>.<p>
+     * new Attribute("SimpleAttribute", "whatever"))</code>.</p>
      *
      *     <p>Because {@code String} is a <em>simple type</em>, in the
      *     sense of {@link javax.management.openmbean.SimpleType}, it

--- a/jdk/src/share/classes/javax/management/MBeanFeatureInfo.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/MBeanFeatureInfo.java	Tue Nov 12 14:03:28 2013 -0500
@@ -162,7 +162,7 @@
      * Serializes an {@link MBeanFeatureInfo} to an {@link ObjectOutputStream}.
      * @serialData
      * For compatibility reasons, an object of this class is serialized as follows.
-     * <ul>
+     * <p>
      * The method {@link ObjectOutputStream#defaultWriteObject defaultWriteObject()}
      * is called first to serialize the object except the field {@code descriptor}
      * which is declared as transient. The field {@code descriptor} is serialized
@@ -180,7 +180,7 @@
      * {@link ObjectOutputStream#writeObject writeObject(Object obj)} is called
      * to serialize directly the field {@code descriptor}.
      *     </ul>
-     * </ul>
+     *
      * @since 1.6
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
@@ -206,7 +206,7 @@
      * Deserializes an {@link MBeanFeatureInfo} from an {@link ObjectInputStream}.
      * @serialData
      * For compatibility reasons, an object of this class is deserialized as follows.
-     * <ul>
+     * <p>
      * The method {@link ObjectInputStream#defaultReadObject defaultReadObject()}
      * is called first to deserialize the object except the field
      * {@code descriptor}, which is not serialized in the default way. Then the method
@@ -228,7 +228,7 @@
      *       to {@link ImmutableDescriptor#EMPTY_DESCRIPTOR EMPTY_DESCRIPTOR}</li>
      *    <li>Any other value. A {@link StreamCorruptedException} is thrown.</li>
      *    </ul>
-     * </ul>
+     *
      * @since 1.6
      */
     private void readObject(ObjectInputStream in)

--- a/jdk/src/share/classes/javax/management/MBeanInfo.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/MBeanInfo.java	Tue Nov 12 14:03:28 2013 -0500
@@ -619,7 +619,7 @@
      * Serializes an {@link MBeanInfo} to an {@link ObjectOutputStream}.
      * @serialData
      * For compatibility reasons, an object of this class is serialized as follows.
-     * <ul>
+     * <p>
      * The method {@link ObjectOutputStream#defaultWriteObject defaultWriteObject()}
      * is called first to serialize the object except the field {@code descriptor}
      * which is declared as transient. The field {@code descriptor} is serialized
@@ -637,7 +637,7 @@
      *        {@link ObjectOutputStream#writeObject writeObject(Object obj)} is called
      *        to serialize the field {@code descriptor} directly.
      *     </ul>
-     * </ul>
+     *
      * @since 1.6
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
@@ -661,7 +661,7 @@
      * Deserializes an {@link MBeanInfo} from an {@link ObjectInputStream}.
      * @serialData
      * For compatibility reasons, an object of this class is deserialized as follows.
-     * <ul>
+     * <p>
      * The method {@link ObjectInputStream#defaultReadObject defaultReadObject()}
      * is called first to deserialize the object except the field
      * {@code descriptor}, which is not serialized in the default way. Then the method
@@ -683,7 +683,7 @@
      *       {@link ImmutableDescriptor#EMPTY_DESCRIPTOR EMPTY_DESCRIPTOR}.</li>
      *    <li>Any other value. A {@link StreamCorruptedException} is thrown.</li>
      *    </ul>
-     * </ul>
+     *
      * @since 1.6
      */
 

--- a/jdk/src/share/classes/javax/management/MBeanServer.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/MBeanServer.java	Tue Nov 12 14:03:28 2013 -0500
@@ -244,7 +244,6 @@
  * the caller's permissions must imply {@link
  * MBeanPermission#MBeanPermission(String,String,ObjectName,String)
  * MBeanPermission(className, null, name, "unregisterMBean")}.</p>
- * </p>
  *
  * </ul>
  *

--- a/jdk/src/share/classes/javax/management/MBeanServerConnection.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/MBeanServerConnection.java	Tue Nov 12 14:03:28 2013 -0500
@@ -627,7 +627,7 @@
      * for that attribute, although this is not guaranteed to work.  (For
      * example, the values of two attributes may have been rejected because
      * they were inconsistent with each other.  Setting one of them alone might
-     * be allowed.)<p>
+     * be allowed.)
      *
      * <p>Here is an example of calling this method and checking that it
      * succeeded in setting all the requested attributes:</p>

--- a/jdk/src/share/classes/javax/management/MBeanServerNotification.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/MBeanServerNotification.java	Tue Nov 12 14:03:28 2013 -0500
@@ -86,7 +86,7 @@
  *     be set to an array of ObjectNames containing the names of all MBeans
  *     being registered or unregistered.</li>
  * </ul>
- * </p>
+ *
  * <p>
  * MBeans which emit these group registration/unregistration notifications will
  * declare them in their {@link MBeanInfo#getNotifications()

--- a/jdk/src/share/classes/javax/management/MXBean.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/MXBean.java	Tue Nov 12 14:03:28 2013 -0500
@@ -79,7 +79,7 @@
     public interface MisleadingMXBean {}
     </pre>
 
-    <h3 id="MXBean-spec">MXBean specification</a></h3>
+    <h3 id="MXBean-spec">MXBean specification</h3>
 
     <p>The MXBean concept provides a simple way to code an MBean
       that only references a predefined set of types, the ones defined
@@ -93,7 +93,7 @@
       Standard MBean concept.  Here is how a managed object might be
       represented as a Standard MBean, and as an MXBean:</p>
 
-    <table border="1" cellpadding="5">
+    <table border="1" cellpadding="5" summary="Standard Bean vs. MXBean">
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
       </tr>
@@ -133,7 +133,7 @@
 
     <p>So, we might define <code>MemoryUsage</code> like this:</p>
 
-    <table border="1" cellpadding="5">
+    <table border="1" cellpadding="5" summary="Standard Bean vs. MXBean">
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
       </tr>
@@ -195,7 +195,7 @@
     <p>This becomes clearer if we compare what the clients of the two
       models might look like:</p>
 
-    <table border="1" cellpadding="5">
+    <table border="1" cellpadding="5" summary="Standard Bean vs. MXBean">
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
       </tr>
@@ -232,7 +232,7 @@
       managed objects when you know the model beforehand, regardless
       of whether you are using Standard MBeans or MXBeans:</p>
 
-    <table border="1" cellpadding="5">
+    <table border="1" cellpadding="5" summary="Standard Bean vs. MXBean">
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
       </tr>
@@ -265,7 +265,7 @@
     <p>Implementing the MemoryPool object works similarly for both
       Standard MBeans and MXBeans.</p>
 
-    <table border="1" cellpadding="5">
+    <table border="1" cellpadding="5" summary="Standard Bean vs. MXBean">
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
       </tr>
@@ -292,7 +292,7 @@
     <p>Registering the MBean in the MBean Server works in the same way
       in both cases:</p>
 
-    <table border="1" cellpadding="5">
+    <table border="1" cellpadding="5" summary="Standard Bean vs. MXBean">
       <tr>
         <th>Standard MBean</th><th>MXBean</th>
       </tr>
@@ -478,13 +478,13 @@
 
     <p>The following table summarizes the type mapping rules.</p>
 
-    <table border="1" cellpadding="5">
+    <table border="1" cellpadding="5" summary="Type Mapping Rules">
       <tr>
         <th>Java type <em>J</em></th>
         <th><em>opentype(J)</em></th>
         <th><em>opendata(J)</em></th>
       </tr>
-      <tbody cellvalign="top">
+      <tbody valign="top">
         <tr>
           <td>{@code int}, {@code boolean}, etc<br>
             (the 8 primitive Java types)</td>
@@ -785,7 +785,7 @@
     </blockquote>
 
     then the item in the {@code CompositeType} is called {@code name}
-    and has type {@code SimpleType.BOOLEAN}.</p>
+    and has type {@code SimpleType.BOOLEAN}.
 
     <p>Notice that the first character (or code point) is converted to
       lower case.  This follows the Java Beans convention, which for

--- a/jdk/src/share/classes/javax/management/NumericValueExp.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/NumericValueExp.java	Tue Nov 12 14:03:28 2013 -0500
@@ -112,7 +112,7 @@
     public NumericValueExp() {
     }
 
-    /** Creates a new NumericValue representing the numeric literal <val>.*/
+    /** Creates a new NumericValue representing the numeric literal @{code val}.*/
     NumericValueExp(Number val)
     {
       this.val = val;

--- a/jdk/src/share/classes/javax/management/ObjectName.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/ObjectName.java	Tue Nov 12 14:03:28 2013 -0500
@@ -195,7 +195,7 @@
  * represents an ObjectName with two keys.  The name of each key
  * contains six characters, of which the first and last are spaces.
  * The value associated with the key <code>"&nbsp;key1&nbsp;"</code>
- * also begins and ends with a space.</p>
+ * also begins and ends with a space.
  *
  * <p>In addition to the restrictions on characters spelt out above,
  * no part of an ObjectName may contain a newline character
@@ -665,7 +665,7 @@
      * Construct an ObjectName from a domain and a Hashtable.
      *
      * @param domain Domain of the ObjectName.
-     * @param props  Map containing couples <i>key</i> -> <i>value</i>.
+     * @param props  Map containing couples <i>key</i> {@literal ->} <i>value</i>.
      *
      * @exception MalformedObjectNameException The <code>domain</code>
      * contains an illegal character, or one of the keys or values in
@@ -1549,7 +1549,7 @@
      * <li>a comma and an
      * asterisk (<code>,*</code>) for an ObjectName that is a property
      * list pattern with at least one key.
-     * </ul></p>
+     * </ul>
      *
      * @return The canonical form of the name.
      */

--- a/jdk/src/share/classes/javax/management/PersistentMBean.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/PersistentMBean.java	Tue Nov 12 14:03:28 2013 -0500
@@ -70,17 +70,19 @@
      * <P>
      * Persistence policy from the MBean and attribute descriptor is used to guide execution
      * of this method. The MBean should be stored if 'persistPolicy' field is:
-     * <PRE>  != "never"
+     * <PRE>{@literal  != "never"
      *   = "always"
      *   = "onTimer" and now > 'lastPersistTime' + 'persistPeriod'
      *   = "NoMoreOftenThan" and now > 'lastPersistTime' + 'persistPeriod'
      *   = "onUnregister"
-     * <P>
+     * }</PRE>
+     * <p>
      * Do not store the MBean if 'persistPolicy' field is:
+     * <PRE>{@literal
      *    = "never"
      *    = "onUpdate"
      *    = "onTimer" && now < 'lastPersistTime' + 'persistPeriod'
-     * <P></PRE>
+     * }</PRE>
      *
      * @exception MBeanException Wraps another exception or persistence is not supported
      * @exception RuntimeOperationsException Wraps exceptions from the persistence mechanism

--- a/jdk/src/share/classes/javax/management/Query.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/Query.java	Tue Nov 12 14:03:28 2013 -0500
@@ -127,9 +127,9 @@
       * @param q2 Another query expression.
       *
       * @return  The conjunction of the two arguments.  The returned object
-      * will be serialized as an instance of the non-public class {@link
+      * will be serialized as an instance of the non-public class
       * <a href="../../serialized-form.html#javax.management.AndQueryExp">
-      * javax.management.AndQueryExp</a>}.
+      * javax.management.AndQueryExp</a>.
       */
      public static QueryExp and(QueryExp q1, QueryExp q2)  {
          return new AndQueryExp(q1, q2);
@@ -143,9 +143,9 @@
       * @param q2 Another query expression.
       *
       * @return  The disjunction of the two arguments.  The returned object
-      * will be serialized as an instance of the non-public class {@link
+      * will be serialized as an instance of the non-public class
       * <a href="../../serialized-form.html#javax.management.OrQueryExp">
-      * javax.management.OrQueryExp</a>}.
+      * javax.management.OrQueryExp</a>.
       */
      public static QueryExp or(QueryExp q1, QueryExp q2)  {
          return new OrQueryExp(q1, q2);
@@ -160,9 +160,9 @@
       *
       * @return A "greater than" constraint on the arguments.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
-      * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+      * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
       * to {@link #GT}.
       */
      public static QueryExp gt(ValueExp v1, ValueExp v2)  {
@@ -178,9 +178,9 @@
       *
       * @return A "greater than or equal to" constraint on the
       * arguments.  The returned object will be serialized as an
-      * instance of the non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
-      * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+      * instance of the non-public class
+      * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+      * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
       * to {@link #GE}.
       */
      public static QueryExp geq(ValueExp v1, ValueExp v2)  {
@@ -196,9 +196,9 @@
       *
       * @return A "less than or equal to" constraint on the arguments.
       * The returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
-      * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+      * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
       * to {@link #LE}.
       */
      public static QueryExp leq(ValueExp v1, ValueExp v2)  {
@@ -214,9 +214,9 @@
       *
       * @return A "less than" constraint on the arguments.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
-      * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+      * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
       * to {@link #LT}.
       */
      public static QueryExp lt(ValueExp v1, ValueExp v2)  {
@@ -232,9 +232,9 @@
       *
       * @return A "equal to" constraint on the arguments.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
-      * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+      * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
       * to {@link #EQ}.
       */
      public static QueryExp eq(ValueExp v1, ValueExp v2)  {
@@ -251,9 +251,9 @@
       *
       * @return The constraint that v1 lies between v2 and v3.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BetweenQueryExp">
-      * javax.management.BetweenQueryExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.BetweenQueryExp">
+      * javax.management.BetweenQueryExp</a>.
       */
      public static QueryExp between(ValueExp v1, ValueExp v2, ValueExp v3) {
          return new BetweenQueryExp(v1, v2, v3);
@@ -279,9 +279,9 @@
       *
       * @return A query expression that represents the matching
       * constraint on the string argument.  The returned object will
-      * be serialized as an instance of the non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.MatchQueryExp">
-      * javax.management.MatchQueryExp</a>}.
+      * be serialized as an instance of the non-public class
+      * <a href="../../serialized-form.html#javax.management.MatchQueryExp">
+      * javax.management.MatchQueryExp</a>.
       */
      public static QueryExp match(AttributeValueExp a, StringValueExp s)  {
          return new MatchQueryExp(a, s);
@@ -319,9 +319,9 @@
       *
       * @return An attribute expression for the attribute named name.
       * The returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.QualifiedAttributeValueExp">
-      * javax.management.QualifiedAttributeValueExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.QualifiedAttributeValueExp">
+      * javax.management.QualifiedAttributeValueExp</a>.
       */
      public static AttributeValueExp attr(String className, String name)  {
          return new QualifiedAttributeValueExp(className, name);
@@ -338,9 +338,8 @@
       *
       * @return A class attribute expression.  The returned object
       * will be serialized as an instance of the non-public class
-      * {@link <a
-      * href="../../serialized-form.html#javax.management.ClassAttributeValueExp">
-      * javax.management.ClassAttributeValueExp</a>}.
+      * <a href="../../serialized-form.html#javax.management.ClassAttributeValueExp">
+      * javax.management.ClassAttributeValueExp</a>.
       */
      public static AttributeValueExp classattr()  {
          return new ClassAttributeValueExp();
@@ -352,9 +351,9 @@
       * @param queryExp The constraint to negate.
       *
       * @return A negated constraint.  The returned object will be
-      * serialized as an instance of the non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.NotQueryExp">
-      * javax.management.NotQueryExp</a>}.
+      * serialized as an instance of the non-public class
+      * <a href="../../serialized-form.html#javax.management.NotQueryExp">
+      * javax.management.NotQueryExp</a>.
       */
      public static QueryExp not(QueryExp queryExp)  {
          return new NotQueryExp(queryExp);
@@ -368,9 +367,9 @@
       *
       * @return A QueryExp that represents the constraint.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.InQueryExp">
-      * javax.management.InQueryExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.InQueryExp">
+      * javax.management.InQueryExp</a>.
       */
      public static QueryExp in(ValueExp val, ValueExp valueList[])  {
          return new InQueryExp(val, valueList);
@@ -395,9 +394,9 @@
       *
       * @return A ValueExp object containing the argument.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.NumericValueExp">
-      * javax.management.NumericValueExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+      * javax.management.NumericValueExp</a>.
       */
      public static ValueExp value(Number val)  {
          return new NumericValueExp(val);
@@ -411,9 +410,9 @@
       *
       * @return A ValueExp object containing the argument.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.NumericValueExp">
-      * javax.management.NumericValueExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+      * javax.management.NumericValueExp</a>.
       */
      public static ValueExp value(int val)  {
          return new NumericValueExp((long) val);
@@ -427,9 +426,9 @@
       *
       * @return A ValueExp object containing the argument.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.NumericValueExp">
-      * javax.management.NumericValueExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+      * javax.management.NumericValueExp</a>.
       */
      public static ValueExp value(long val)  {
          return new NumericValueExp(val);
@@ -443,9 +442,9 @@
       *
       * @return A ValueExp object containing the argument.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.NumericValueExp">
-      * javax.management.NumericValueExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+      * javax.management.NumericValueExp</a>.
       */
      public static ValueExp value(float val)  {
          return new NumericValueExp((double) val);
@@ -459,9 +458,9 @@
       *
       * @return  A ValueExp object containing the argument.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.NumericValueExp">
-      * javax.management.NumericValueExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+      * javax.management.NumericValueExp</a>.
       */
      public static ValueExp value(double val)  {
          return new NumericValueExp(val);
@@ -475,9 +474,9 @@
       *
       * @return A ValueExp object containing the argument.  The
       * returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BooleanValueExp">
-      * javax.management.BooleanValueExp</a>}.
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.BooleanValueExp">
+      * javax.management.BooleanValueExp</a>.
       */
      public static ValueExp value(boolean val)  {
          return new BooleanValueExp(val);
@@ -492,9 +491,9 @@
       *
       * @return A ValueExp representing the sum or concatenation of
       * the two arguments.  The returned object will be serialized as
-      * an instance of the non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryOpValueExp">
-      * javax.management.BinaryOpValueExp</a>} with an {@code op} equal to
+      * an instance of the non-public class
+      * <a href="../../serialized-form.html#javax.management.BinaryOpValueExp">
+      * javax.management.BinaryOpValueExp</a> with an {@code op} equal to
       * {@link #PLUS}.
       */
      public static ValueExp plus(ValueExp value1, ValueExp value2) {
@@ -510,9 +509,9 @@
       *
       * @return A ValueExp representing the product.  The returned
       * object will be serialized as an instance of the non-public
-      * class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryOpValueExp">
-      * javax.management.BinaryOpValueExp</a>} with an {@code op} equal to
+      * class
+      * <a href="../../serialized-form.html#javax.management.BinaryOpValueExp">
+      * javax.management.BinaryOpValueExp</a> with an {@code op} equal to
       * {@link #TIMES}.
       */
      public static ValueExp times(ValueExp value1,ValueExp value2) {
@@ -528,9 +527,9 @@
       *
       * @return A ValueExp representing the difference between two
       * arguments.  The returned object will be serialized as an
-      * instance of the non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryOpValueExp">
-      * javax.management.BinaryOpValueExp</a>} with an {@code op} equal to
+      * instance of the non-public class
+      * <a href="../../serialized-form.html#javax.management.BinaryOpValueExp">
+      * javax.management.BinaryOpValueExp</a> with an {@code op} equal to
       * {@link #MINUS}.
       */
      public static ValueExp minus(ValueExp value1, ValueExp value2) {
@@ -546,9 +545,9 @@
       *
       * @return A ValueExp representing the quotient of two arguments.
       * The returned object will be serialized as an instance of the
-      * non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.BinaryOpValueExp">
-      * javax.management.BinaryOpValueExp</a>} with an {@code op} equal to
+      * non-public class
+      * <a href="../../serialized-form.html#javax.management.BinaryOpValueExp">
+      * javax.management.BinaryOpValueExp</a> with an {@code op} equal to
       * {@link #DIV}.
       */
      public static ValueExp div(ValueExp value1, ValueExp value2) {
@@ -566,9 +565,9 @@
       *
       * @return The constraint that a matches s.  The returned object
       * will be serialized as an instance of the non-public class
-      * {@link <a
-      * href="../../serialized-form.html#javax.management.MatchQueryExp">
-      * javax.management.MatchQueryExp</a>}.
+      *
+      * <a href="../../serialized-form.html#javax.management.MatchQueryExp">
+      * javax.management.MatchQueryExp</a>.
       */
      public static QueryExp initialSubString(AttributeValueExp a, StringValueExp s)  {
          return new MatchQueryExp(a,
@@ -585,9 +584,9 @@
       *
       * @return The constraint that a matches s.  The returned object
       * will be serialized as an instance of the non-public class
-      * {@link <a
-      * href="../../serialized-form.html#javax.management.MatchQueryExp">
-      * javax.management.MatchQueryExp</a>}.
+      *
+      * <a href="../../serialized-form.html#javax.management.MatchQueryExp">
+      * javax.management.MatchQueryExp</a>.
       */
      public static QueryExp anySubString(AttributeValueExp a, StringValueExp s) {
          return new MatchQueryExp(a,
@@ -605,9 +604,9 @@
       *
       * @return The constraint that a matches s.  The returned object
       * will be serialized as an instance of the non-public class
-      * {@link <a
-      * href="../../serialized-form.html#javax.management.MatchQueryExp">
-      * javax.management.MatchQueryExp</a>}.
+      *
+      * <a href="../../serialized-form.html#javax.management.MatchQueryExp">
+      * javax.management.MatchQueryExp</a>.
       */
      public static QueryExp finalSubString(AttributeValueExp a, StringValueExp s) {
          return new MatchQueryExp(a,
@@ -630,9 +629,9 @@
       *        of the class of which selected MBeans should be instances.
       * @return a query expression that represents an inheritance
       * constraint on an MBean class.  The returned object will be
-      * serialized as an instance of the non-public class {@link <a
-      * href="../../serialized-form.html#javax.management.InstanceOfQueryExp">
-      * javax.management.InstanceOfQueryExp</a>}.
+      * serialized as an instance of the non-public class
+      * <a href="../../serialized-form.html#javax.management.InstanceOfQueryExp">
+      * javax.management.InstanceOfQueryExp</a>.
       * @since 1.6
       */
      public static QueryExp isInstanceOf(StringValueExp classNameValue) {

--- a/jdk/src/share/classes/javax/management/loading/MLet.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/loading/MLet.java	Tue Nov 12 14:03:28 2013 -0500
@@ -145,17 +145,17 @@
  * This optional attribute specifies a list of one or more parameters for the
  * MBean to be instantiated. This list describes the parameters to be passed the MBean's constructor.
  * Use the following syntax to specify each item in
- * <VAR>arglist</VAR>:</DD>
+ * <VAR>arglist</VAR>:
  * <DL>
- * <P>
  * <DT>&lt;<CODE>ARG TYPE=</CODE><VAR>argumentType</VAR> <CODE>VALUE=</CODE><VAR>value</VAR>&gt;</DT>
- * <P>
- * <DD>where:</DD>
+ * <DD>where:
  * <UL>
  * <LI><VAR>argumentType</VAR> is the type of the argument that will be passed as parameter to the MBean's constructor.</UL>
+ * </DD>
  * </DL>
  * <P>The arguments' type in the argument list should be a Java primitive type or a Java basic type
  * (<CODE>java.lang.Boolean, java.lang.Byte, java.lang.Short, java.lang.Long, java.lang.Integer, java.lang.Float, java.lang.Double, java.lang.String</CODE>).
+ * </DD>
  * </DL>
  *
  * When an m-let text file is loaded, an

--- a/jdk/src/share/classes/javax/management/loading/MLetParser.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/loading/MLetParser.java	Tue Nov 12 14:03:28 2013 -0500
@@ -149,7 +149,7 @@
     }
 
     /**
-     * Scan an html file for <mlet> tags
+     * Scan an html file for {@literal <mlet>} tags.
      */
     public List<MLetContent> parse(URL url) throws IOException {
         String mth = "parse";

--- a/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java	Tue Nov 12 14:03:28 2013 -0500
@@ -799,7 +799,7 @@
      * the given object is also a Descriptor, and if the two Descriptors have
      * the same field names (possibly differing in case) and the same
      * associated values.  The respective values for a field in the two
-     * Descriptors are equal if the following conditions hold:</p>
+     * Descriptors are equal if the following conditions hold:
      *
      * <ul>
      * <li>If one value is null then the other must be too.</li>
@@ -871,7 +871,6 @@
      * done on the <i>"export"</i> field.
      * <P>
      * Otherwise this implementation returns false if:
-     * <P>
      * <UL>
      * <LI> name and descriptorType fieldNames are not defined, or
      * null, or empty, or not String
@@ -879,14 +878,14 @@
      * are null or not String
      * <LI> persistPeriod, currencyTimeLimit, lastUpdatedTimeStamp,
      * lastReturnedTimeStamp if defined, are null, or not a Numeric
-     * String or not a Numeric Value >= -1
+     * String or not a Numeric Value {@literal >= -1}
      * <LI> log fieldName, if defined, is null, or not a Boolean or
      * not a String with value "t", "f", "true", "false". These String
      * values must not be case sensitive.
      * <LI> visibility fieldName, if defined, is null, or not a
-     * Numeric String or a not Numeric Value >= 1 and &lt;= 4
+     * Numeric String or a not Numeric Value {@literal >= 1 and <= 4}
      * <LI> severity fieldName, if defined, is null, or not a Numeric
-     * String or not a Numeric Value >= 0 and &lt;= 6<br>
+     * String or not a Numeric Value {@literal >= 0 and <= 6}<br>
      * <LI> persistPolicy fieldName, if defined, is null, or not one of
      * the following strings:<br>
      *   "OnUpdate", "OnTimer", "NoMoreOftenThan", "OnUnregister", "Always",
@@ -1270,8 +1269,8 @@
     }
 
     /**
-     * Returns <pv>a human readable string representing the
-     * descriptor</pv>.  The string will be in the format of
+     * Returns a human readable string representing the
+     * descriptor.  The string will be in the format of
      * "fieldName=fieldValue,fieldName2=fieldValue2,..."<br>
      *
      * If there are no fields in the descriptor, then an empty String

--- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java	Tue Nov 12 14:03:28 2013 -0500
@@ -57,7 +57,7 @@
  * Note that when the Type in this table is Number, a String that is the decimal
  * representation of a Long can also be used.</P>
  *
- * <table border="1" cellpadding="5">
+ * <table border="1" cellpadding="5" summary="ModelMBeanAttributeInfo Fields">
  * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
  * <tr><td>name</td><td>String</td>
  *     <td>Attribute name.</td></tr>

--- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java	Tue Nov 12 14:03:28 2013 -0500
@@ -58,7 +58,7 @@
  * Note that when the Type in this table is Number, a String that is the decimal
  * representation of a Long can also be used.</P>
  *
- * <table border="1" cellpadding="5">
+ * <table border="1" cellpadding="5" summary="ModelMBeanConstructorInfo Fields">
  * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
  * <tr><td>name</td><td>String</td>
  *     <td>Constructor name.</td></tr>

--- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java	Tue Nov 12 14:03:28 2013 -0500
@@ -165,7 +165,7 @@
      * following.  Note that when the Type in this table is Number, a String
      * that is the decimal representation of a Long can also be used.</P>
      *
-     * <table border="1" cellpadding="5">
+     * <table border="1" cellpadding="5" summary="ModelMBean Fields">
      * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
      * <tr><td>name</td><td>String</td>
      *     <td>MBean name.</td></tr>

--- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java	Tue Nov 12 14:03:28 2013 -0500
@@ -127,7 +127,6 @@
          * <P>
          * @param oldValue The original value for the Attribute
          * @param newValue The current value for the Attribute
-         *<P>
          * <PRE>
          * The constructed attributeChangeNotification will be:
          *   type        "jmx.attribute.change"

--- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java	Tue Nov 12 14:03:28 2013 -0500
@@ -56,7 +56,7 @@
  * Note that when the Type in this table is Number, a String that is the decimal
  * representation of a Long can also be used.</P>
  *
- * <table border="1" cellpadding="5">
+ * <table border="1" cellpadding="5" summary="ModelMBeanNotificationInfo Fields">
  * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
  * <tr><td>name</td><td>String</td>
  *     <td>Notification name.</td></tr>

--- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java	Tue Nov 12 14:03:28 2013 -0500
@@ -59,7 +59,7 @@
  * Note that when the Type in this table is Number, a String that is the decimal
  * representation of a Long can also be used.</P>
  *
- * <table border="1" cellpadding="5">
+ * <table border="1" cellpadding="5" summary="ModelMBeanOperationInfo Fields">
  * <tr><th>Name</th><th>Type</th><th>Meaning</th></tr>
  * <tr><td>name</td><td>String</td>
  *     <td>Operation name.</td></tr>

--- a/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java	Tue Nov 12 14:03:28 2013 -0500
@@ -421,19 +421,19 @@
      * is used to guide execution of this method. The MBean should be
      * stored if 'persistPolicy' field is:</p>
      *
-     * <PRE>  != "never"
+     * <PRE>{@literal  != "never"
      *   = "always"
      *   = "onTimer" and now > 'lastPersistTime' + 'persistPeriod'
      *   = "NoMoreOftenThan" and now > 'lastPersistTime' + 'persistPeriod'
      *   = "onUnregister"
-     * </PRE>
+     * }</PRE>
      *
      * <p>Do not store the MBean if 'persistPolicy' field is:</p>
-     * <PRE>
+     * <PRE>{@literal
      *    = "never"
      *    = "onUpdate"
      *    = "onTimer" && now < 'lastPersistTime' + 'persistPeriod'
-     * </PRE>
+     * }</PRE>
      *
      * @exception MBeanException Wraps another exception, or
      * persistence is not supported
@@ -469,11 +469,14 @@
      *   <li><b>&gt;0</b> Represents the number of seconds that the
      *         'value' field is valid.
      *         The 'value' field is no longer valid when
-     *         'lastUpdatedTimeStamp' + 'currencyTimeLimit' &gt; Now.</li>
+     *         'lastUpdatedTimeStamp' + 'currencyTimeLimit' &gt; Now.
+     *       <ul>
+     *       <li>When 'value' is valid, 'valid' is returned.</li>
+     *       <li>When 'value' is no longer valid then null is returned and
+     *           'value' and 'lastUpdatedTimeStamp' fields are cleared.</li>
+     *       </ul>
+     *   </li>
      * </ul>
-     * <li>When 'value' is valid, 'valid' is returned.</li>
-     * <li>When 'value' is no longer valid then null is returned and
-     *     'value' and 'lastUpdatedTimeStamp' fields are cleared.</li>
      *
      **/
     private Object resolveForCacheValue(Descriptor descr)
@@ -1842,17 +1845,17 @@
      * <Li> != "never"</Li>
      * <Li> = "always"</Li>
      * <Li> = "onUpdate"</Li>
-     * <Li> = "onTimer" and now &gt; 'lastPersistTime' + 'persistPeriod'</Li>
-     * <Li> = "NoMoreOftenThan" and now &gt; 'lastPersistTime' +
-     *         'persistPeriod'</Li>
+     * <Li> {@literal = "onTimer" and now > 'lastPersistTime' + 'persistPeriod'}</Li>
+     * <Li> {@literal = "NoMoreOftenThan" and now > 'lastPersistTime' +
+     *         'persistPeriod'}</Li>
      * </UL>
      * Do not store the MBean if 'persistPolicy' field is:
      * <UL>
      * <Li> = "never"</Li>
-     * <Li> = "onTimer" && now &lt; 'lastPersistTime' + 'persistPeriod'</Li>
+     * <Li> = {@literal = "onTimer" && now < 'lastPersistTime' + 'persistPeriod'}</Li>
      * <Li> = "onUnregister"</Li>
-     * <Li> = "NoMoreOftenThan" and now &lt; 'lastPersistTime' +
-     *        'persistPeriod'</Li>
+     * <Li> = {@literal = "NoMoreOftenThan" and now < 'lastPersistTime' +
+     *        'persistPeriod'}</Li>
      * </UL>
      *
      * <p>The ModelMBeanInfo of the Model MBean is stored in a file.

--- a/jdk/src/share/classes/javax/management/monitor/Monitor.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/monitor/Monitor.java	Tue Nov 12 14:03:28 2013 -0500
@@ -1609,7 +1609,7 @@
      * the thread instantiating this DaemonThreadFactory. Each new
      * thread is created as a daemon thread with priority
      * Thread.NORM_PRIORITY. New threads have names accessible via
-     * Thread.getName() of "JMX Monitor <pool-name> Pool [Thread-M]",
+     * Thread.getName() of "{@literal JMX Monitor <pool-name> Pool [Thread-M]}",
      * where M is the sequence number of the thread created by this
      * factory.
      */

--- a/jdk/src/share/classes/javax/management/openmbean/ArrayType.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/openmbean/ArrayType.java	Tue Nov 12 14:03:28 2013 -0500
@@ -33,7 +33,7 @@
  * all <i>open data</i> values which are n-dimensional arrays of <i>open data</i> values.
  * <p>
  * Examples of valid {@code ArrayType} instances are:
- * <pre>
+ * <pre>{@code
  * // 2-dimension array of java.lang.String
  * ArrayType<String[][]> a1 = new ArrayType<String[][]>(2, SimpleType.STRING);
  *
@@ -90,7 +90,7 @@
  *
  * // 3-dimension array of java.lang.String
  * ArrayType<String[][][]> a19 = new ArrayType<String[][][]>(1, a18);
- * </pre>
+ * }</pre>
  *
  *
  * @since 1.5
@@ -241,23 +241,23 @@
      * </ul>
      * <p>
      * As an example, the following piece of code:
-     * <pre>
+     * <pre>{@code
      * ArrayType<String[][][]> t = new ArrayType<String[][][]>(3, SimpleType.STRING);
      * System.out.println("array class name       = " + t.getClassName());
      * System.out.println("element class name     = " + t.getElementOpenType().getClassName());
      * System.out.println("array type name        = " + t.getTypeName());
      * System.out.println("array type description = " + t.getDescription());
-     * </pre>
+     * }</pre>
      * would produce the following output:
-     * <pre>
+     * <pre>{@code
      * array class name       = [[[Ljava.lang.String;
      * element class name     = java.lang.String
      * array type name        = [[[Ljava.lang.String;
      * array type description = 3-dimension array of java.lang.String
-     * </pre>
+     * }</pre>
      * And the following piece of code which is equivalent to the one listed
      * above would also produce the same output:
-     * <pre>
+     * <pre>{@code
      * ArrayType<String[]> t1 = new ArrayType<String[]>(1, SimpleType.STRING);
      * ArrayType<String[][]> t2 = new ArrayType<String[][]>(1, t1);
      * ArrayType<String[][][]> t3 = new ArrayType<String[][][]>(1, t2);
@@ -265,7 +265,7 @@
      * System.out.println("element class name     = " + t3.getElementOpenType().getClassName());
      * System.out.println("array type name        = " + t3.getTypeName());
      * System.out.println("array type description = " + t3.getDescription());
-     * </pre>
+     * }</pre>
      *
      * @param  dimension  the dimension of arrays described by this <tt>ArrayType</tt> instance;
      *                    must be greater than or equal to 1.
@@ -334,20 +334,20 @@
      * </ul>
      * <p>
      * As an example, the following piece of code:
-     * <pre>
+     * <pre>{@code
      * ArrayType<int[]> t = new ArrayType<int[]>(SimpleType.INTEGER, true);
      * System.out.println("array class name       = " + t.getClassName());
      * System.out.println("element class name     = " + t.getElementOpenType().getClassName());
      * System.out.println("array type name        = " + t.getTypeName());
      * System.out.println("array type description = " + t.getDescription());
-     * </pre>
+     * }</pre>
      * would produce the following output:
-     * <pre>
+     * <pre>{@code
      * array class name       = [I
      * element class name     = java.lang.Integer
      * array type name        = [I
      * array type description = 1-dimension array of int
-     * </pre>
+     * }</pre>
      *
      * @param elementType the {@code SimpleType} of the element values
      *                    contained in the arrays described by this
@@ -533,7 +533,7 @@
      * <li>if this <code>ArrayType</code> instance describes an array of
      * classes implementing the {@code TabularData} interface or the
      * {@code CompositeData} interface, <var>obj</var> is assignable to
-     * such a declared array, and each element contained in <var>obj</var>
+     * such a declared array, and each element contained in {<var>obj</var>
      * is either null or a valid value for the element's open type specified
      * by this <code>ArrayType</code> instance.</li>
      * </ul>
@@ -776,7 +776,7 @@
      * object or two equal but not identical objects.
      * <p>
      * As an example, the following piece of code:
-     * <pre>
+     * <pre>{@code
      * ArrayType<String[]> t1 = ArrayType.getArrayType(SimpleType.STRING);
      * ArrayType<String[][]> t2 = ArrayType.getArrayType(t1);
      * ArrayType<String[][][]> t3 = ArrayType.getArrayType(t2);
@@ -784,14 +784,14 @@
      * System.out.println("element class name     = " + t3.getElementOpenType().getClassName());
      * System.out.println("array type name        = " + t3.getTypeName());
      * System.out.println("array type description = " + t3.getDescription());
-     * </pre>
+     * }</pre>
      * would produce the following output:
-     * <pre>
+     * <pre>{@code
      * array class name       = [[[Ljava.lang.String;
      * element class name     = java.lang.String
      * array type name        = [[[Ljava.lang.String;
      * array type description = 3-dimension array of java.lang.String
-     * </pre>
+     * }</pre>
      *
      * @param  elementType  the <i>open type</i> of element values contained
      *                      in the arrays described by this <tt>ArrayType</tt>
@@ -819,20 +819,20 @@
      * same object or two equal but not identical objects.
      * <p>
      * As an example, the following piece of code:
-     * <pre>
+     * <pre>{@code
      * ArrayType<int[][][]> t = ArrayType.getPrimitiveArrayType(int[][][].class);
      * System.out.println("array class name       = " + t.getClassName());
      * System.out.println("element class name     = " + t.getElementOpenType().getClassName());
      * System.out.println("array type name        = " + t.getTypeName());
      * System.out.println("array type description = " + t.getDescription());
-     * </pre>
+     * }</pre>
      * would produce the following output:
-     * <pre>
+     * <pre>{@code
      * array class name       = [[[I
      * element class name     = java.lang.Integer
      * array type name        = [[[I
      * array type description = 3-dimension array of int
-     * </pre>
+     * }</pre>
      *
      * @param arrayClass a primitive array class such as {@code int[].class},
      *                   {@code boolean[][].class}, etc. The {@link

--- a/jdk/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java	Tue Nov 12 14:03:28 2013 -0500
@@ -80,7 +80,7 @@
    </pre>
    </blockquote>
 
-   A call to {@code nn.getNumber()} will then return <b>5</b>.</p>
+   A call to {@code nn.getNumber()} will then return <b>5</b>.
 
    <p>If the first letter of the property defined by a getter is a
    capital, then this handler will look first for an item in the

--- a/jdk/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/openmbean/CompositeType.java	Tue Nov 12 14:03:28 2013 -0500
@@ -40,7 +40,7 @@
 
 /**
  * The <code>CompositeType</code> class is the <i>open type</i> class
- * whose instances describe the types of {@link CompositeData <code>CompositeData</code>} values.
+ * whose instances describe the types of {@link CompositeData CompositeData} values.
  *
  *
  * @since 1.5

--- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java	Tue Nov 12 14:03:28 2013 -0500
@@ -138,8 +138,8 @@
      *
      * <p>The {@code descriptor} can contain entries that will define
      * the values returned by certain methods of this class, as
-     * explained in the {@link <a href="package-summary.html#constraints">
-     * package description</a>}.
+     * explained in the <a href="package-summary.html#constraints">
+     * package description</a>.
      *
      * @param name  cannot be a null or empty string.
      *
@@ -162,8 +162,7 @@
      * @throws IllegalArgumentException if {@code name} or {@code
      * description} are null or empty string, or {@code openType} is
      * null, or the descriptor entries are invalid as described in the
-     * {@link <a href="package-summary.html#constraints">package
-     * description</a>}.
+     * <a href="package-summary.html#constraints">package description</a>.
      *
      * @since 1.6
      */

--- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java	Tue Nov 12 14:03:28 2013 -0500
@@ -111,16 +111,16 @@
     }
 
     /**
-     * <p>Constructs an {@code OpenMBeanParameterInfoSupport} instance,
+     * Constructs an {@code OpenMBeanParameterInfoSupport} instance,
      * which describes the parameter used in one or more operations or
      * constructors of a class of open MBeans, with the specified
      * {@code name}, {@code openType}, {@code description},
-     * and {@code descriptor}.</p>
+     * and {@code descriptor}.
      *
      * <p>The {@code descriptor} can contain entries that will define
      * the values returned by certain methods of this class, as
-     * explained in the {@link <a href="package-summary.html#constraints">
-     * package description</a>}.
+     * explained in the <a href="package-summary.html#constraints">
+     * package description</a>.
      *
      * @param name  cannot be a null or empty string.
      *
@@ -134,8 +134,8 @@
      * @throws IllegalArgumentException if {@code name} or {@code
      * description} are null or empty string, or {@code openType} is
      * null, or the descriptor entries are invalid as described in the
-     * {@link <a href="package-summary.html#constraints">package
-     * description</a>}.
+     * <a href="package-summary.html#constraints">package
+     * description</a>.
      *
      * @since 1.6
      */

--- a/jdk/src/share/classes/javax/management/openmbean/SimpleType.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/openmbean/SimpleType.java	Tue Nov 12 14:03:28 2013 -0500
@@ -45,8 +45,8 @@
 /**
  * The <code>SimpleType</code> class is the <i>open type</i> class whose instances describe
  * all <i>open data</i> values which are neither arrays,
- * nor {@link CompositeData <code>CompositeData</code>} values,
- * nor {@link TabularData <code>TabularData</code>} values.
+ * nor {@link CompositeData CompositeData} values,
+ * nor {@link TabularData TabularData} values.
  * It predefines all its possible instances as static fields, and has no public constructor.
  * <p>
  * Given a <code>SimpleType</code> instance describing values whose Java class name is <i>className</i>,

--- a/jdk/src/share/classes/javax/management/openmbean/TabularType.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/openmbean/TabularType.java	Tue Nov 12 14:03:28 2013 -0500
@@ -40,7 +40,7 @@
 
 /**
  * The <code>TabularType</code> class is the <i> open type</i> class
- * whose instances describe the types of {@link TabularData <code>TabularData</code>} values.
+ * whose instances describe the types of {@link TabularData TabularData} values.
  *
  * @since 1.5
  */
@@ -89,8 +89,8 @@
      *                     cannot be null or empty. Each element should be an item name defined in <var>rowType</var>
      *                     (no null or empty string allowed).
      *                     It is important to note that the <b>order</b> of the item names in <var>indexNames</var>
-     *                     is used by the methods {@link TabularData#get(java.lang.Object[]) <code>get</code>} and
-     *                     {@link TabularData#remove(java.lang.Object[]) <code>remove</code>} of class
+     *                     is used by the methods {@link TabularData#get(java.lang.Object[]) get} and
+     *                     {@link TabularData#remove(java.lang.Object[]) remove} of class
      *                     <code>TabularData</code> to match their array of values parameter to items.
      * <br>&nbsp;
      * @throws IllegalArgumentException  if <var>rowType</var> is null,

--- a/jdk/src/share/classes/javax/management/relation/Relation.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/relation/Relation.java	Tue Nov 12 14:03:28 2013 -0500
@@ -236,7 +236,7 @@
      * Retrieves MBeans referenced in the various roles of the relation.
      *
      * @return a HashMap mapping:
-     * <P> ObjectName -> ArrayList of String (role names)
+     * <P> ObjectName {@literal ->} ArrayList of String (role names)
      */
     public Map<ObjectName,List<String>> getReferencedMBeans();
 

--- a/jdk/src/share/classes/javax/management/relation/RelationService.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/relation/RelationService.java	Tue Nov 12 14:03:28 2013 -0500
@@ -2306,8 +2306,7 @@
      * @param relationId  relation id
      *
      * @return a HashMap mapping:
-     * <P> ObjectName -> ArrayList of String (role
-     * names)
+     * <P> ObjectName {@literal ->} ArrayList of String (role names)
      *
      * @exception IllegalArgumentException  if null parameter
      * @exception RelationNotFoundException  if no relation for given

--- a/jdk/src/share/classes/javax/management/relation/RelationServiceMBean.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/relation/RelationServiceMBean.java	Tue Nov 12 14:03:28 2013 -0500
@@ -770,7 +770,7 @@
      * @param relationId  relation id
      *
      * @return a HashMap mapping:
-     * <P> ObjectName -> ArrayList of String (role
+     * <P> ObjectName {@literal ->} ArrayList of String (role
      * names)
      *
      * @exception IllegalArgumentException  if null parameter

--- a/jdk/src/share/classes/javax/management/relation/RelationSupport.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/relation/RelationSupport.java	Tue Nov 12 14:03:28 2013 -0500
@@ -590,7 +590,7 @@
      * Retrieves MBeans referenced in the various roles of the relation.
      *
      * @return a HashMap mapping:
-     * <P> ObjectName -> ArrayList of String (role names)
+     * <P> ObjectName {@literal ->} ArrayList of String (role names)
      */
     public Map<ObjectName,List<String>> getReferencedMBeans() {
 

--- a/jdk/src/share/classes/javax/management/remote/JMXConnectionNotification.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/remote/JMXConnectionNotification.java	Tue Nov 12 14:03:28 2013 -0500
@@ -40,7 +40,7 @@
  *
  * <p>The notification type is one of the following:</p>
  *
- * <table>
+ * <table summary="JMXConnectionNotification Types">
  *
  * <tr>
  * <th align=left>Type</th>

--- a/jdk/src/share/classes/javax/management/remote/JMXConnector.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/remote/JMXConnector.java	Tue Nov 12 14:03:28 2013 -0500
@@ -76,7 +76,7 @@
      * <p>If <code>connect</code> has already been called successfully
      * on this object, calling it again has no effect.  If, however,
      * {@link #close} was called after <code>connect</code>, the new
-     * <code>connect</code> will throw an <code>IOException</code>.<p>
+     * <code>connect</code> will throw an <code>IOException</code>.
      *
      * <p>Otherwise, either <code>connect</code> has never been called
      * on this object, or it has been called but produced an

--- a/jdk/src/share/classes/javax/management/remote/JMXConnectorProvider.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/remote/JMXConnectorProvider.java	Tue Nov 12 14:03:28 2013 -0500
@@ -50,7 +50,7 @@
      * @param environment a read-only Map containing named attributes
      * to determine how the connection is made.  Keys in this map must
      * be Strings.  The appropriate type of each associated value
-     * depends on the attribute.</p>
+     * depends on the attribute.
      *
      * @return a <code>JMXConnector</code> representing the new
      * connector client.  Each successful call to this method produces

--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java	Tue Nov 12 14:03:28 2013 -0500
@@ -1613,7 +1613,7 @@
 
     /**
      * Construct a new IOException with a nested exception.
-     * The nested exception is set only if JDK >= 1.4
+     * The nested exception is set only if JDK {@literal >= 1.4}
      */
     private static IOException newIOException(String message,
                                               Throwable cause) {

--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java	Tue Nov 12 14:03:28 2013 -0500
@@ -1688,17 +1688,17 @@
      * this method will attempt to connect the stub to an ORB as
      * follows:
      * <ul>
-     * <p>This method looks in the provided <var>environment</var> for
+     * <li>This method looks in the provided <var>environment</var> for
      * the "java.naming.corba.orb" property. If it is found, the
      * referenced object (an {@link org.omg.CORBA.ORB ORB}) is used to
      * connect the stub. Otherwise, a new org.omg.CORBA.ORB is created
      * by calling {@link
      * org.omg.CORBA.ORB#init(String[], Properties)
-     * org.omg.CORBA.ORB.init((String[])null,(Properties)null)}
-     * <p>The new created ORB is kept in a static
+     * org.omg.CORBA.ORB.init((String[])null,(Properties)null)}</li>
+     * <li>The new created ORB is kept in a static
      * {@link WeakReference} and can be reused for connecting other
      * stubs. However, no reference is ever kept on the ORB provided
-     * in the <var>environment</var> map, if any.
+     * in the <var>environment</var> map, if any.</li>
      * </ul>
      * @param rmiServer A RMI Server Stub.
      * @param environment An environment map, possibly containing an ORB.

--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java	Tue Nov 12 14:03:28 2013 -0500
@@ -820,7 +820,7 @@
 
     /**
      * Construct a new IOException with a nested exception.
-     * The nested exception is set only if JDK >= 1.4
+     * The nested exception is set only if JDK {@literal >= 1.4}
      */
     private static IOException newIOException(String message,
                                               Throwable cause) {

--- a/jdk/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java	Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java	Tue Nov 12 14:03:28 2013 -0500
@@ -117,7 +117,7 @@
      * server.</p>
      *
      * @return the default <code>ClassLoader</code> used by this
-     * connector server.</p>
+     * connector server.
      *
      * @see #setDefaultClassLoader
      */