--- a/jdk/make/gensrc/GensrcCharsetCoder.gmk	Thu Apr 27 12:38:21 2017 +0100
+++ b/jdk/make/gensrc/GensrcCharsetCoder.gmk	Thu Apr 27 09:47:40 2017 -0700
@@ -54,7 +54,7 @@
 	    -DOtherCoder='Encoder' \
 	    -DreplTypeName='string' \
 	    -DdefaultRepl='"\\uFFFD"' \
-	    -DdefaultReplName='<tt>"\&#92;uFFFD"<\/tt>' \
+	    -DdefaultReplName='<code>"\&#92;uFFFD"<\/code>' \
 	    -DreplType='String' \
 	    -DreplFQType='java.lang.String' \
 	    -DreplLength='length()' \
@@ -89,7 +89,7 @@
 	    -DOtherCoder='Decoder' \
 	    -DreplTypeName='byte array' \
 	    -DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \
-	    -DdefaultReplName='<tt>{<\/tt>\&nbsp;<tt>(byte)'"'"\\?"'"'<\/tt>\&nbsp;<tt>}<\/tt>' \
+	    -DdefaultReplName='<code>{<\/code>\&nbsp;<code>(byte)'"'"\\?"'"'<\/code>\&nbsp;<code>}<\/code>' \
 	    -DreplType='byte[]' \
 	    -DreplFQType='byte[]' \
 	    -DreplLength='length' \

--- a/jdk/src/java.base/share/classes/java/io/DataInput.java	Thu Apr 27 12:38:21 2017 +0100
+++ b/jdk/src/java.base/share/classes/java/io/DataInput.java	Thu Apr 27 09:47:40 2017 -0700
@@ -72,8 +72,8 @@
  *     </tr>
  *     <tr>
  *       <th id="byte1_a">Byte 1</th>
- *       <td><center>0</center>
- *       <td colspan="7"><center>bits 6-0</center>
+ *       <td style="text-align:center">0
+ *       <td colspan="7" style="text-align:center">bits 6-0
  *     </tr>
  *     <tr>
  *       <th colspan="9"><span style="font-weight:normal">
@@ -87,16 +87,16 @@
  *     </tr>
  *     <tr>
  *       <th id="byte1_b">Byte 1</th>
- *       <td><center>1</center>
- *       <td><center>1</center>
- *       <td><center>0</center>
- *       <td colspan="5"><center>bits 10-6</center>
+ *       <td style="text-align:center">1
+ *       <td style="text-align:center">1
+ *       <td style="text-align:center">0
+ *       <td colspan="5" style="text-align:center">bits 10-6
  *     </tr>
  *     <tr>
  *       <th id="byte2_a">Byte 2</th>
- *       <td><center>1</center>
- *       <td><center>0</center>
- *       <td colspan="6"><center>bits 5-0</center>
+ *       <td style="text-align:center">1
+ *       <td style="text-align:center">0
+ *       <td colspan="6" style="text-align:center">bits 5-0
  *     </tr>
  *     <tr>
  *       <th colspan="9"><span style="font-weight:normal">
@@ -109,23 +109,23 @@
  *     </tr>
  *     <tr>
  *       <th id="byte1_c">Byte 1</th>
- *       <td><center>1</center>
- *       <td><center>1</center>
- *       <td><center>1</center>
- *       <td><center>0</center>
- *       <td colspan="4"><center>bits 15-12</center>
+ *       <td style="text-align:center">1
+ *       <td style="text-align:center">1
+ *       <td style="text-align:center">1
+ *       <td style="text-align:center">0
+ *       <td colspan="4" style="text-align:center">bits 15-12
  *     </tr>
  *     <tr>
  *       <th id="byte2_b">Byte 2</th>
- *       <td><center>1</center>
- *       <td><center>0</center>
- *       <td colspan="6"><center>bits 11-6</center>
+ *       <td style="text-align:center">1
+ *       <td style="text-align:center">0
+ *       <td colspan="6" style="text-align:center">bits 11-6
  *     </tr>
  *     <tr>
  *       <th id="byte3">Byte 3</th>
- *       <td><center>1</center>
- *       <td><center>0</center>
- *       <td colspan="6"><center>bits 5-0</center>
+ *       <td style="text-align:center">1
+ *       <td style="text-align:center">0
+ *       <td colspan="6" style="text-align:center">bits 5-0
  *     </tr>
  *   </table>
  * </blockquote>

--- a/jdk/src/java.base/share/classes/java/net/URLConnection.java	Thu Apr 27 12:38:21 2017 +0100
+++ b/jdk/src/java.base/share/classes/java/net/URLConnection.java	Thu Apr 27 09:47:40 2017 -0700
@@ -54,7 +54,7 @@
  * read from and to write to the resource referenced by the URL. In
  * general, creating a connection to a URL is a multistep process:
  *
- * <center><table border=2 summary="Describes the process of creating a connection to a URL: openConnection() and connect() over time.">
+ * <div style="text-align:center"><table style="margin:0 auto" border=2 summary="Describes the process of creating a connection to a URL: openConnection() and connect() over time.">
  * <tr><th>{@code openConnection()}</th>
  *     <th>{@code connect()}</th></tr>
  * <tr><td>Manipulate parameters that affect the connection to the remote
@@ -63,7 +63,7 @@
  *         contents.</td></tr>
  * </table>
  * ----------------------------&gt;
- * <br>time</center>
+ * <br>time</div>
  *
  * <ol>
  * <li>The connection object is created by invoking the

--- a/jdk/src/java.base/share/classes/java/util/ServiceLoader.java	Thu Apr 27 12:38:21 2017 +0100
+++ b/jdk/src/java.base/share/classes/java/util/ServiceLoader.java	Thu Apr 27 09:47:40 2017 -0700
@@ -125,13 +125,13 @@
  *
  * <p> A service provider that is packaged as a JAR file for the class path is
  * identified by placing a <i>provider-configuration file</i> in the resource
- * directory <tt>META-INF/services</tt>. The file's name is the fully-qualified
+ * directory {@code META-INF/services}. The file's name is the fully-qualified
  * <a href="../lang/ClassLoader.html#name">binary name</a> of the service's
  * type. The file contains a list of fully-qualified binary names of concrete
  * provider classes, one per line.  Space and tab characters surrounding each
  * name, as well as blank lines, are ignored.  The comment character is
- * <tt>'#'</tt> (<tt>'&#92;u0023'</tt>,
- * <font style="font-size:smaller;">NUMBER SIGN</font>); on
+ * {@code '#'} (<code>'&#92;u0023'</code>,
+ * <span style="font-size:smaller;">NUMBER SIGN</span>); on
  * each line all characters following the first comment character are ignored.
  * The file must be encoded in UTF-8.
  * If a particular concrete provider class is named in more than one
@@ -257,7 +257,7 @@
  * method in this class will cause a {@link NullPointerException} to be thrown.
  *
  * <h2> Example </h2>
- * <p> Suppose we have a service type <tt>com.example.CodecSet</tt> which is
+ * <p> Suppose we have a service type {@code com.example.CodecSet} which is
  * intended to represent sets of encoder/decoder pairs for some protocol.  In
  * this case it is an abstract class with two abstract methods:
  *
@@ -265,11 +265,11 @@
  * public abstract Encoder getEncoder(String encodingName);
  * public abstract Decoder getDecoder(String encodingName);</pre></blockquote>
  *
- * Each method returns an appropriate object or <tt>null</tt> if the provider
+ * Each method returns an appropriate object or {@code null} if the provider
  * does not support the given encoding.  Typical providers support more than
  * one encoding.
  *
- * <p> The <tt>CodecSet</tt> class creates and saves a single service instance
+ * <p> The {@code CodecSet} class creates and saves a single service instance
  * at initialization:
  *
  * <pre>{@code
@@ -1402,7 +1402,7 @@
      *
      * @param  loader
      *         The class loader to be used to load provider-configuration files
-     *         and provider classes, or <tt>null</tt> if the system class
+     *         and provider classes, or {@code null} if the system class
      *         loader (or, failing that, the bootstrap class loader) is to be
      *         used
      *

--- a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java	Thu Apr 27 12:38:21 2017 +0100
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java	Thu Apr 27 09:47:40 2017 -0700
@@ -40,7 +40,7 @@
  * <p> Every implementation of the Java platform is required to support the
  * following standard {@code TrustManagerFactory} algorithm:
  * <ul>
- * <li><tt>PKIX</tt></li>
+ * <li>{@code PKIX}</li>
  * </ul>
  * This algorithm is described in the <a href=
  * "{@docRoot}/../technotes/guides/security/StandardNames.html#TrustManagerFactory">