--- a/jdk/src/java.base/share/classes/java/lang/Math.java	Fri Apr 28 06:45:21 2017 +0800
+++ b/jdk/src/java.base/share/classes/java/lang/Math.java	Thu Apr 27 17:43:13 2017 -0700
@@ -1277,7 +1277,7 @@
     }
 
     /**
-     * Returns the floor modulus of the {@code long} and {@int} arguments.
+     * Returns the floor modulus of the {@code long} and {@code int} arguments.
      * <p>
      * The floor modulus is {@code x - (floorDiv(x, y) * y)},
      * has the same sign as the divisor {@code y}, and

--- a/jdk/src/java.base/share/classes/java/lang/StrictMath.java	Fri Apr 28 06:45:21 2017 +0800
+++ b/jdk/src/java.base/share/classes/java/lang/StrictMath.java	Thu Apr 27 17:43:13 2017 -0700
@@ -975,7 +975,7 @@
     }
 
     /**
-     * Returns the floor modulus of the {@code long} and {@int} arguments.
+     * Returns the floor modulus of the {@code long} and {@code int} arguments.
      * <p>
      * The floor modulus is {@code x - (floorDiv(x, y) * y)},
      * has the same sign as the divisor {@code y}, and

--- a/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template	Fri Apr 28 06:45:21 2017 +0800
+++ b/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template	Thu Apr 27 17:43:13 2017 -0700
@@ -93,7 +93,7 @@
  *
 #if[byte]
  *
- * <a name="direct"></a>
+ * <a id="direct"></a>
  * <h2> Direct <i>vs.</i> non-direct buffers </h2>
  *
  * <p> A byte buffer is either <i>direct</i> or <i>non-direct</i>.  Given a
@@ -128,7 +128,7 @@
  * that explicit buffer management can be done in performance-critical code.
  *
  *
- * <a name="bin"></a>
+ * <a id="bin"></a>
  * <h2> Access to binary data </h2>
  *
  * <p> This class defines methods for reading and writing values of all other
@@ -155,7 +155,7 @@
  * parameters of the absolute <i>get</i> and <i>put</i> methods are in terms of
  * bytes rather than of the type being read or written.
  *
- * <a name="views"></a>
+ * <a id="views"></a>
  *
  * <p> For access to homogeneous binary data, that is, sequences of values of
  * the same type, this class defines methods that can create <i>views</i> of a

--- a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template	Fri Apr 28 06:45:21 2017 +0800
+++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template	Thu Apr 27 17:43:13 2017 -0700
@@ -41,7 +41,7 @@
  * An engine that can transform a sequence of $itypesPhrase$ into a sequence of
  * $otypesPhrase$.
  *
- * <a name="steps"></a>
+ * <a id="steps"></a>
  *
  * <p> The input $itype$ sequence is provided in a $itype$ buffer or a series
  * of such buffers.  The output $otype$ sequence is written to a $otype$ buffer
@@ -76,14 +76,14 @@
  * examine this object and fill the input buffer, flush the output buffer, or
  * attempt to recover from $a$ $coding$ error, as appropriate, and try again.
  *
- * <a name="ce"></a>
+ * <a id="ce"></a>
  *
  * <p> There are two general types of $coding$ errors.  If the input $itype$
  * sequence is $notLegal$ then the input is considered <i>malformed</i>.  If
  * the input $itype$ sequence is legal but cannot be mapped to a valid
  * $outSequence$ then an <i>unmappable character</i> has been encountered.
  *
- * <a name="cae"></a>
+ * <a id="cae"></a>
  *
  * <p> How $a$ $coding$ error is handled depends upon the action requested for
  * that type of error, which is described by an instance of the {@link

--- a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java	Fri Apr 28 06:45:21 2017 +0800
+++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java	Thu Apr 27 17:43:13 2017 -0700
@@ -147,7 +147,7 @@
  * implementation to see if any other charsets are supported.  The behavior
  * of such optional charsets may differ between implementations.
  *
- * <blockquote><table width="80%" summary="Description of standard charsets">
+ * <blockquote><table style="width:80%" summary="Description of standard charsets">
  * <tr><th style="text-align:left">Charset</th><th style="text-align:left">Description</th></tr>
  * <tr><td style="vertical-align:top">{@code US-ASCII}</td>
  *     <td>Seven-bit ASCII, a.k.a. {@code ISO646-US},

--- a/jdk/src/java.base/share/classes/java/util/Formatter.java	Fri Apr 28 06:45:21 2017 +0800
+++ b/jdk/src/java.base/share/classes/java/util/Formatter.java	Thu Apr 27 17:43:13 2017 -0700
@@ -1159,7 +1159,7 @@
  * <tr><td style="vertical-align:top"> {@code 'e'}
  *     <td style="vertical-align:top"> <code>'&#92;u0065'</code>
  *     <td> Requires the output to be formatted using <a
- *     name="scientific">computerized scientific notation</a>.  The <a
+ *     id="scientific">computerized scientific notation</a>.  The <a
  *     href="#L10nAlgorithm">localization algorithm</a> is applied.
  *
  *     <p> The formatting of the magnitude <i>m</i> depends upon its value.
@@ -1393,7 +1393,7 @@
  * <tr><td style="vertical-align:top"> {@code 'e'}
  *     <td style="vertical-align:top"> <code>'&#92;u0065'</code>
  *     <td> Requires the output to be formatted using <a
- *     name="bscientific">computerized scientific notation</a>.  The <a
+ *     id="bscientific">computerized scientific notation</a>.  The <a
  *     href="#L10nAlgorithm">localization algorithm</a> is applied.
  *
  *     <p> The formatting of the magnitude <i>m</i> depends upon its value.

--- a/jdk/src/java.base/share/classes/java/util/ResourceBundle.java	Fri Apr 28 06:45:21 2017 +0800
+++ b/jdk/src/java.base/share/classes/java/util/ResourceBundle.java	Thu Apr 27 17:43:13 2017 -0700
@@ -1080,7 +1080,7 @@
      * <p><code>getBundle</code> uses the base name, the specified locale, and
      * the default locale (obtained from {@link java.util.Locale#getDefault()
      * Locale.getDefault}) to generate a sequence of <a
-     * name="candidates"><em>candidate bundle names</em></a>.  If the specified
+     * id="candidates"><em>candidate bundle names</em></a>.  If the specified
      * locale's language, script, country, and variant are all empty strings,
      * then the base name is the only candidate bundle name.  Otherwise, a list
      * of candidate locales is generated from the attribute values of the